test(snakeoil_certs): ensure states are not run every time

[arvados-formula.git] / test / salt / states / examples / single_host / snakeoil_certs.sls

diff --git a/test/salt/states/examples/single_host/snakeoil_certs.sls b/test/salt/states/examples/single_host/snakeoil_certs.sls
index f6e69b83f0b88a94f7509ecd1302485d7af9fb68..6ac8f879405efe640c2f42c6f6a559b7a6339130 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:
+  - nginx.passenger
+  - nginx.config
   - nginx.service
 
 {%- set arvados_ca_cert_file = '/etc/ssl/certs/arvados-snakeoil-ca.pem' %}
@@ -129,9 +131,10 @@ arvados_test_salt_states_examples_single_host_snakeoil_certs_ssl_cert_pkg_instal
       - sls: postgres
 
 arvados_test_salt_states_examples_single_host_snakeoil_certs_certs_permissions_cmd_run:
-  cmd.run:
-    - name: |
-        chown root:ssl-cert {{ arvados_key_file }}
+  file.managed:
+    - name: {{ arvados_key_file }}
+    - owner: root
+    - group: ssl-cert
     - require:
       - cmd: arvados_test_salt_states_examples_single_host_snakeoil_certs_arvados_snake_oil_cert_cmd_run
       - pkg: arvados_test_salt_states_examples_single_host_snakeoil_certs_ssl_cert_pkg_installed
@@ -145,5 +148,8 @@ arvados_test_salt_states_examples_single_host_snakeoil_certs_nginx_snakeoil_file
         ssl_certificate_key {{ arvados_key_file }};
     - watch_in:
       - service: nginx_service
-
-
+    - require:
+      - pkg: passenger_install
+      - file: arvados_test_salt_states_examples_single_host_snakeoil_certs_certs_permissions_cmd_run
+    - require_in:
+      - file: nginx_config