commit 3f552c6abe2fd0d7bc6f6a0d65fcb5f2e5bf297e
author Marek Celoud <mceloud@mirantis.com> Fri May 19 18:17:02 2017 +0200
committer Marek Celoud <mceloud@mirantis.com> Fri May 19 19:19:35 2017 +0000
tree 68e9b19084f415949b7b164e37202618e4b1a3f4
parent 698c6123b3b9a87b0cddf06eee1c26d5e3bada86

run linux.system.service before basic states

Change-Id: Id29ecbb1b6eb0163c4e26857b6855f1a3c4efacd

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 0119762..fe93907 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -21,6 +21,7 @@
     salt.enforceState(master, 'I@salt:master', ['salt.master', 'reclass'], true)
     salt.runSaltProcessStep(master, 'I@linux:system', 'saltutil.refresh_pillar', [], null, true)
     salt.runSaltProcessStep(master, 'I@linux:system', 'saltutil.sync_all', [], null, true)
+    salt.enforceState(master, '*', 'linux.system.service', true)
     salt.enforceState(master, '*', ['linux.system'], true)
     salt.enforceState(master, '*', ['salt.minion'], true)
     salt.enforceState(master, 'I@linux:system', ['linux', 'openssh', 'salt.minion', 'ntp'], true)
@@ -32,14 +33,15 @@
     salt.runSaltProcessStep(master, 'I@linux:system', 'saltutil.refresh_pillar', [], null, true)
     salt.runSaltProcessStep(master, 'I@linux:system', 'saltutil.sync_all', [], null, true)
 
+    salt.enforceState(master, 'I@salt:control', 'linux.system.service', true)
     salt.enforceState(master, 'I@salt:control', ['salt.minion', 'linux.system', 'linux.network', 'ntp'], true)
     salt.enforceState(master, 'I@salt:control', 'libvirt', true)
     salt.enforceState(master, 'I@salt:control', 'salt.control', true)
 
     sleep(600)
 
-    salt.runSaltProcessStep(master, '* and not kvm*', 'saltutil.refresh_pillar', [], null, true)
-    salt.runSaltProcessStep(master, '* and not kvm*', 'saltutil.sync_all', [], null, true)
+    salt.runSaltProcessStep(master, '*', 'saltutil.refresh_pillar', [], null, true)
+    salt.runSaltProcessStep(master, '*', 'saltutil.sync_all', [], null, true)
 }
 
 def installOpenstackInfra(master) {