added salt.minion state before linux.system
when http proxy is enabled salt minion needs to be setup first with proxy before repositories needs to be setup, otherwise some gpg key are not downloaded and deploy pipeline failes
Change-Id: I3f6ab85a127694f24fc598abfcbd613a51625e31
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)