commit c9b3cc8e4b58c297fc2deae44956f47b5dc2799d
author Marek Celoud <mceloud@mirantis.com> Mon May 22 12:50:53 2017 +0000
committer Marek Celoud <mceloud@mirantis.com> Mon May 22 12:51:06 2017 +0000
tree 0f4674a1188bf853ab72fef61cdaf49b791f2977
parent fa1bfcb282ad27e0f1d1a72b90b2f0bd883bfce2

Revert "run linux.system.service before basic states"

This reverts commit 3f552c6abe2fd0d7bc6f6a0d65fcb5f2e5bf297e.

Change-Id: I184ca8858d4eabf4f095a2810699395547dc1d26

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index fe93907..0119762 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -21,7 +21,6 @@
     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)
@@ -33,15 +32,14 @@
     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, '*', 'saltutil.refresh_pillar', [], null, true)
-    salt.runSaltProcessStep(master, '*', 'saltutil.sync_all', [], null, true)
+    salt.runSaltProcessStep(master, '* and not kvm*', 'saltutil.refresh_pillar', [], null, true)
+    salt.runSaltProcessStep(master, '* and not kvm*', 'saltutil.sync_all', [], null, true)
 }
 
 def installOpenstackInfra(master) {