test(dependencies): add ssl certs dependencies so nginx does not fail

diff --git a/kitchen.yml b/kitchen.yml
index d0f50c53132687fa0de24f4258a3f34a2df8082a..e47ea24f13819a476b739e43402fe619231e6d12 100644 (file)
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -236,7 +236,7 @@ suites:
           source: https://github.com/saltstack-formulas/postgres-formula.git
         - name: nginx
           repo: git
           source: https://github.com/saltstack-formulas/postgres-formula.git
         - name: nginx
           repo: git

-          source: https://github.com/netmanagers/nginx-formula.git
+          source: https://github.com/saltstack-formulas/nginx-formula.git

       state_top:
         base:
           '*':
       state_top:
         base:
           '*':


@@ -297,7 +297,7 @@ suites:
           path: test/salt/states/examples
         - name: nginx
           repo: git
           path: test/salt/states/examples
         - name: nginx
           repo: git

-          source: https://github.com/netmanagers/nginx-formula.git
+          source: https://github.com/saltstack-formulas/nginx-formula.git

       state_top:
         base:
           '*':
       state_top:
         base:
           '*':

diff --git a/test/salt/states/examples/single_host/host_entries.sls b/test/salt/states/examples/single_host/host_entries.sls
index 855757e62857e37af31d8138c8717dec7b7402b5..177ad184867e20c43ccac9cbc9acd73dae3552aa 100644 (file)
--- a/test/salt/states/examples/single_host/host_entries.sls
+++ b/test/salt/states/examples/single_host/host_entries.sls
@@ -3,6 +3,9 @@
 {%- from "arvados/map.jinja" import arvados with context %}
 {%- set tpldir = curr_tpldir %}
 
 {%- from "arvados/map.jinja" import arvados with context %}
 {%- set tpldir = curr_tpldir %}
 

+include:
+  - nginx.config
+

 arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
   host.present:
     - ip: {{ grains.get('ipv4')[0] }}
 arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
   host.present:
     - ip: {{ grains.get('ipv4')[0] }}


@@ -26,3 +29,5 @@ arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
       - {{ entry }}.internal
       - {{ entry }}.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
       {%- endfor %}
       - {{ entry }}.internal
       - {{ entry }}.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
       {%- endfor %}

+    - require_in:
+      - file: nginx_config

diff --git a/test/salt/states/examples/single_host/snakeoil_certs.sls b/test/salt/states/examples/single_host/snakeoil_certs.sls
index f6e69b83f0b88a94f7509ecd1302485d7af9fb68..6f4e9326fabce5b248640a85400266445c1c2f01 100644 (file)
--- a/test/salt/states/examples/single_host/snakeoil_certs.sls
+++ b/test/salt/states/examples/single_host/snakeoil_certs.sls
@@ -4,6 +4,8 @@
 {%- set tpldir = curr_tpldir %}
 
 include:
 {%- set tpldir = curr_tpldir %}
 
 include:

+  - nginx.passenger
+  - nginx.config

   - nginx.service
 
 {%- set arvados_ca_cert_file = '/etc/ssl/certs/arvados-snakeoil-ca.pem' %}
   - nginx.service
 
 {%- set arvados_ca_cert_file = '/etc/ssl/certs/arvados-snakeoil-ca.pem' %}


@@ -145,5 +147,8 @@ arvados_test_salt_states_examples_single_host_snakeoil_certs_nginx_snakeoil_file
         ssl_certificate_key {{ arvados_key_file }};
     - watch_in:
       - service: nginx_service
         ssl_certificate_key {{ arvados_key_file }};
     - watch_in:
       - service: nginx_service

-
-
+    - require:
+      - pkg: passenger_install
+      - cmd: arvados_test_salt_states_examples_single_host_snakeoil_certs_certs_permissions_cmd_run
+    - require_in:
+      - file: nginx_config