Sync stacklight-upgrade pipeline with master
Change-Id: I000f4e6864b04ee9203f34b4e752b177811355e3
Related-PROD: PROD-34049
diff --git a/stacklight-upgrade.groovy b/stacklight-upgrade.groovy
index 60b8fa5..9b2d760 100644
--- a/stacklight-upgrade.groovy
+++ b/stacklight-upgrade.groovy
@@ -70,10 +70,10 @@
common.errorMsg('[ERROR] Elasticsearch VIP port could not be retrieved')
}
- pillar = salt.getPillar(master, "I@elasticsearch:client ${extra_tgt}", 'elasticsearch:client:server:scheme')
+ pillar = salt.getReturnValues(salt.getPillar(master, "I@elasticsearch:client", 'elasticsearch:client:server:scheme'))
def elasticsearch_scheme
- if (!pillar['return'].isEmpty()) {
- elasticsearch_scheme = pillar['return'][0].values()[0]
+ if(pillar) {
+ elasticsearch_scheme = pillar
common.infoMsg("[INFO] Using elasticsearch scheme: ${elasticsearch_scheme}")
} else {
common.infoMsg('[INFO] No pillar with Elasticsearch server scheme, using scheme: http')