Revert "Exclude fluentd state in installOpenstackCompute"
This broke nova compute installation. Excluding with highstate doesn't work on some version of salt, the related issue was described https://gerrit.mcp.mirantis.com/#/c/26144/
This reverts commit 865dd0adcd8aae6096e16a6ea3f3911d0e0636ee.
Change-Id: Ib6c8de09160ed4a8130ed7aa5c2cf943c1a44f18
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 0450e81..1941a89 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -509,10 +509,9 @@
def salt_ca_compound = "I@salt:minion:ca:salt_master_ca ${extra_tgt}"
// Enforce highstate asynchronous only on compute nodes which are not glusterfs and not salt ca servers
def hightstateTarget = "${compute_compound} and not ${gluster_compound} and not ${salt_ca_compound}"
- def excludedStates = "fluentd"
if (salt.testTarget(master, hightstateTarget)) {
retry(2) {
- salt.enforceHighstateWithExclude(master, hightstateTarget, excludedStates)
+ salt.enforceHighstate(master, hightstateTarget)
}
} else {
common.infoMsg("No minions matching highstate target found for target ${hightstateTarget}")
@@ -525,7 +524,7 @@
if ( target == cmp_target ) {
// Enforce highstate one by one on salt ca servers which are compute nodes
retry(2) {
- salt.enforceHighstateWithExclude(master, target, excludedStates)
+ salt.enforceHighstate(master, target)
}
}
}
@@ -538,7 +537,7 @@
if ( target == cmp_target ) {
// Enforce highstate one by one on glusterfs servers which are compute nodes
retry(2) {
- salt.enforceHighstateWithExclude(master, target, excludedStates)
+ salt.enforceHighstate(master, target)
}
}
}