add possibility to first setup salt-proxy, then repos, then install salt-minion pkg dependencies
Change-Id: I568d83ebe7bb057cb6a3d1be33f6612e45bf38d5
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 694aa4f..02195a7 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -30,8 +30,12 @@
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)
+ try {
+ salt.enforceState(master, '*', ['salt.minion.base'], true, false, null, false, 60, 2)
+ sleep(5)
+ } catch (Throwable e) {
+ common.warningMsg('Salt state salt.minion.base is not present in the Salt-formula yet.')
+ }
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)
@@ -49,8 +53,12 @@
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)
+ try {
+ salt.enforceState(master, target, ['salt.minion.base'], true, false, null, false, 60, 2)
+ sleep(5)
+ } catch (Throwable e) {
+ common.warningMsg('Salt state salt.minion.base is not present in the Salt-formula yet.')
+ }
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)