commit e3bb675303a25a00bba5a3183e1cd77d3858b7b2
author Jiri Broulik <jbroulik@mirantis.com> Thu Apr 19 15:01:04 2018 +0000
committer Gerrit Code Review <gerrit2@49259fdfccf8> Thu Apr 19 15:01:04 2018 +0000
tree 866d92af383fbf697668fafd60ceb21f9ebdf5de
parent ac8abc5522ab45078d55fd6120ff77edd7a3d310
parent a9b846652a75443c4af0a2ce71af946a79cdc8f9

Merge "added salt.minion state before linux.system"

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 664871f..47ee7cf 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -29,7 +29,9 @@
     salt.enforceState(master, 'I@salt:master', ['salt.minion'], true, false, null, false, 60, 2)
     salt.enforceState(master, 'I@salt:master', ['salt.minion'])
     salt.fullRefresh(master, "*")
-
+    salt.enforceState(master, '*', ['linux.network.proxy'], true, false, null, false, 60, 2)
+    salt.enforceState(master, '*', ['salt.minion'], true, false, null, false, 60, 2)
+    sleep(5)
     salt.enforceState(master, '*', ['linux.system'])
     if (staticMgmtNet) {
         salt.runSaltProcessStep(master, '*', 'cmd.shell', ["salt-call state.sls linux.network; salt-call service.restart salt-minion"], null, true, 60)
@@ -46,6 +48,9 @@
 
     salt.enforceState(master, 'I@salt:master', ['reclass'], true, false, null, false, 120, 2)
     salt.fullRefresh(master, target)
+    salt.enforceState(master, target, ['linux.network.proxy'], true, false, null, false, 60, 2)
+    salt.enforceState(master, target, ['salt.minion'], true, false, null, false, 60, 2)
+    sleep(5)
     salt.enforceState(master, target, ['linux.system'])
     if (staticMgmtNet) {
         salt.runSaltProcessStep(master, target, 'cmd.shell', ["salt-call state.sls linux.network; salt-call service.restart salt-minion"], null, true, 60)