TEST

Signed-off-by: Sylvain Laperche <[email protected]>

salt/_states/metalk8s.py

@@ -71,7 +71,7 @@ def static_pod_managed(name,
     )
 
 
-def module_run(name, attemps=1, sleep_time=10, **kwargs):
+def module_run(name, attemps=1, sleep_time=10, until=True, **kwargs):
     """Classic module.run with a retry logic as it's buggy in salt version
     https://github.com/saltstack/salt/issues/44639
     """
@@ -90,7 +90,7 @@ def module_run(name, attemps=1, sleep_time=10, **kwargs):
             ret['comment'] = str(exc)
 
         retry = retry - 1
-        if retry and not ret['result']:
+        if retry and ret['result'] != until:
             time.sleep(sleep_time)
 
     return ret

salt/metalk8s/orchestrate/etcd.sls

@@ -32,6 +32,7 @@ Check etcd cluster health for {{ node }}:
     - metalk8s_etcd.check_etcd_health:
       - minion_id: {{ node }}
     - attemps: 5
+    - until: "cluster is healthy"
     - require:
       - salt: Deploy etcd {{ node }} to {{ dest_version }}
 

salt/metalk8s/salt/minion/running.sls

@@ -20,3 +20,11 @@ Ensure salt-minion running:
     - test.ping: []
     - require:
       - service: Ensure salt-minion running
+
+Ensure startup state finished:
+  metalk8s.module_run:
+    - state.running: []
+    - attempts: 5
+    - until: []
+    - require:
+      - module: Ensure salt-minion running

scripts/bootstrap.sh.in

@@ -203,10 +203,10 @@ configure_salt_minion_local_mode() {
     local -r file_root="$base_dir/salt"
 
     "$SALT_CALL" --file-root="$file_root" \
-        --local --retcode-passthrough saltutil.sync_all
+        --local --retcode-passthrough saltutil.sync_all saltenv=base
     "$SALT_CALL" --file-root="$file_root" \
         --local --retcode-passthrough state.sls metalk8s.salt.minion.local \
-        pillar="{'metalk8s': {'products': '$base_dir'}}"
+        pillar="{'metalk8s': {'products': '$base_dir'}}" saltenv=base
 }
 
 get_salt_container() {