Merge "Pass docker hostname and domain as different params for testNode function"
diff --git a/src/com/mirantis/mk/Openstack.groovy b/src/com/mirantis/mk/Openstack.groovy
index 39d6ef3..302a53c 100644
--- a/src/com/mirantis/mk/Openstack.groovy
+++ b/src/com/mirantis/mk/Openstack.groovy
@@ -444,12 +444,17 @@
def global_apps = salt.getConfig(env, 'I@salt:master:enabled:true', 'orchestration.upgrade.applications')
def node_apps = salt.getPillar(env, target, '__reclass__:applications')['return'][0].values()[0]
+ def node_pillar = salt.getPillar(env, target)
def node_sorted_apps = []
if ( !global_apps['return'][0].values()[0].isEmpty() ) {
Map<String,Integer> _sorted_apps = [:]
for (k in global_apps['return'][0].values()[0].keySet()) {
if (k in node_apps) {
- _sorted_apps[k] = global_apps['return'][0].values()[0][k].values()[0].toInteger()
+ if (node_pillar['return'][0].values()[k]['upgrade']['enabled'][0] != null) {
+ if (node_pillar['return'][0].values()[k]['upgrade']['enabled'][0].toBoolean()) {
+ _sorted_apps[k] = global_apps['return'][0].values()[0][k].values()[0].toInteger()
+ }
+ }
}
}
node_sorted_apps = common.SortMapByValueAsc(_sorted_apps).keySet()