To extend the existing two wait_for states with support

for parametric timeouts, timeout value is taken from reclass pillar data. wait_for_deployed.sls wait_for_ready.sls Signed-off-by: ting wu <[email protected]>
salt-formulas · May 31, 2018 · c4434e2 · c4434e2
1 parent bca1f46
commit c4434e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/maas/machines/wait_for_deployed.sls b/maas/machines/wait_for_deployed.sls
@@ -9,5 +9,8 @@ wait_for_machines_deployed:
   - name: maas.wait_for_machine_status
   - kwargs:
         req_status: "Deployed"
+        {%- if region.timeout is defined and region.timeout.deployed is defined %}
+        timeout: {{ region.timeout.deployed }}
+        {%- endif %}
   - require:
     - cmd: maas_login_admin
diff --git a/maas/machines/wait_for_ready.sls b/maas/machines/wait_for_ready.sls
@@ -7,5 +7,9 @@ maas_login_admin:
 wait_for_machines_ready:
   module.run:
   - name: maas.wait_for_machine_status
+  - kwargs:
+        {%- if region.timeout is defined and region.timeout.ready is defined %}
+        timeout: {{ region.timeout.ready }}
+        {%- endif %}
   - require:
     - cmd: maas_login_admin