Run full highstate on compute, do not exclude opencontrail.client
For unknown reason opencontrail.client was excluded when running hightstate
on compute node, at the same time full highstate will be launched in finalize
stage. This patch drops exclude logic when running highstate on compute.
Addition: exclusion in highstates doesn't work in salt 2017.7.7
Change-Id: I369d3584b2d1aa928403714ba1c5343cbbf38a5f
Related-Prod: PROD-23179
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 36f805f..051a462 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -560,7 +560,7 @@
def hightstateTarget = "${compute_compound} and not ${gluster_compound} and not ${salt_ca_compound}"
if (salt.testTarget(master, hightstateTarget)) {
retry(2) {
- salt.enforceHighstateWithExclude(master, hightstateTarget, 'opencontrail.client')
+ salt.enforceHighstate(master, hightstateTarget)
}
} else {
common.infoMsg("No minions matching highstate target found for target ${hightstateTarget}")
@@ -573,7 +573,7 @@
if ( target == cmp_target ) {
// Enforce highstate one by one on salt ca servers which are compute nodes
retry(2) {
- salt.enforceHighstateWithExclude(master, target, 'opencontrail.client')
+ salt.enforceHighstate(master, target)
}
}
}
@@ -586,7 +586,7 @@
if ( target == cmp_target ) {
// Enforce highstate one by one on glusterfs servers which are compute nodes
retry(2) {
- salt.enforceHighstateWithExclude(master, target, 'opencontrail.client')
+ salt.enforceHighstate(master, target)
}
}
}