fix(provision): run hosts/snakeoil states before nginx so it does not fail on missing...

refs #17246
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/host_entries.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/host_entries.sls
index eac85452358a6694aa1d9995ea47faaef66f11ed..53a9148cc0a7a832cd87d618d7576270554e30d4 100644 (file)
--- a/tools/salt-install/config_examples/single_host/single_hostname/states/host_entries.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/states/host_entries.sls
@@ -9,7 +9,7 @@
 
 arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
   host.present:
-    - ip: 127.0.0.2
+    - ip: 127.0.1.1
     - names:
       - {{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
       # FIXME! This just works for our testings.
@@ -31,3 +31,6 @@ arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
       - {{ entry }}
       - {{ entry }}.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
       {%- endfor %}
+    - require_in:
+      - file: nginx_config
+      - service: nginx_service

diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls
index 375cc84eb49cc61012d5b9b099616f12ca6d09a8..d88adbc5366ab93a25c44355126865551c052796 100644 (file)
--- a/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/states/snakeoil_certs.sls
@@ -7,9 +7,6 @@
 {%- from "arvados/map.jinja" import arvados with context %}
 {%- set tpldir = curr_tpldir %}
 
-include:
-  - nginx.service
-
 {%- set arvados_ca_cert_file = '/etc/ssl/certs/arvados-snakeoil-ca.pem' %}
 {%- set arvados_ca_key_file = '/etc/ssl/private/arvados-snakeoil-ca.key' %}
 {%- set arvados_cert_file = '/etc/ssl/certs/arvados-snakeoil-cert.pem' %}
@@ -150,6 +147,11 @@ arvados_test_salt_states_examples_single_host_snakeoil_certs_nginx_snakeoil_file
     - contents: |
         ssl_certificate {{ arvados_cert_file }};
         ssl_certificate_key {{ arvados_key_file }};
+    - require:
+      - pkg: nginx_install
+    - require_in:
+      - file: nginx_config
+      - service: nginx_service
     - watch_in:
       - service: nginx_service