check for collectd pillar in compute install pipeline
PROD-17369
Change-Id: I7a5aeeceb706459dde987a1c0f4d084580f95a5f
diff --git a/openstack-compute-install.groovy b/openstack-compute-install.groovy
index 3c28552..7d6cf6d 100644
--- a/openstack-compute-install.groovy
+++ b/openstack-compute-install.groovy
@@ -91,8 +91,11 @@
// Restart supervisor-vrouter.
salt.runSaltProcessStep(pepperEnv, targetLiveAll, 'service.restart', ['supervisor-vrouter'], null, true, 300)
- // Apply salt,collectd to update information about current network interfaces.
- salt.enforceState(pepperEnv, targetLiveAll, 'salt,collectd', true)
+ // Apply salt and collectd if is present to update information about current network interfaces.
+ salt.enforceState(pepperEnv, targetLiveAll, 'salt', true)
+ if(!salt.getPillar(pepperEnv, minions[0], "collectd")['return'][0].values()[0].isEmpty()) {
+ salt.enforceState(pepperEnv, targetLiveAll, 'collectd', true)
+ }
}
} catch (Throwable e) {