Add elasticsearch scheme var to status check
Change-Id: I5f28756f466313f063031931cbcd7de1c2a63324
PROD-related: PROD-30514
PROD-related: PROD-33868
(cherry-picked from commit b5763f9af1a2a7b8a50dfd8f507b9bcd3304b865)
diff --git a/stacklight-upgrade.groovy b/stacklight-upgrade.groovy
index 78765bb..c7a90db 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.getReturnValues(salt.getPillar(master, "I@elasticsearch:client", 'elasticsearch:client:server:scheme'))
+ pillar = salt.getPillar(master, "I@elasticsearch:client ${extra_tgt}", 'elasticsearch:client:server:scheme')
def elasticsearch_scheme
- if(pillar) {
- elasticsearch_scheme = pillar
+ if (!pillar['return'].isEmpty()) {
+ elasticsearch_scheme = pillar['return'][0].values()[0]
common.infoMsg("[INFO] Using elasticsearch scheme: ${elasticsearch_scheme}")
} else {
common.infoMsg('[INFO] No pillar with Elasticsearch server scheme, using scheme: http')
@@ -82,7 +82,7 @@
common.retry(retries,retries_wait) {
common.infoMsg('Waiting for Elasticsearch to become green..')
- salt.cmdRun(master, "I@elasticsearch:client", "curl -sf ${elasticsearch_vip}:${elasticsearch_port}/_cat/health | awk '{print \$4}' | grep green")
+ salt.cmdRun(master, "I@elasticsearch:client", "curl -sfk ${elasticsearch_scheme}://${elasticsearch_vip}:${elasticsearch_port}/_cat/health | awk '{print \$4}' | grep green")
}
} catch (Exception er) {
errorOccured = true