commit aa4dcdcb5b2ad514882b015492f5eaff6d14c03d
author Dmitry Kalashnik <dkalashnik@mirantis.com> Mon May 27 16:43:04 2019 +0400
committer Dmitry Kalashnik <dkalashnik@mirantis.com> Mon May 27 16:43:04 2019 +0400
tree 5653129d52e0e92afc4248a410a6e9587e069538
parent 4ce983735c2ec43a67dc1d9119aa55d4ebcefb8d

Fix pillar condition for Elasticsearch

Change-Id: I415194f9574163f7808852dce916db2e5eb1c3b3
PROD-related: PROD-30582

stacklight-upgrade.groovy

diff --git a/stacklight-upgrade.groovy b/stacklight-upgrade.groovy
index 7f55c5d..b81ef97 100644
--- a/stacklight-upgrade.groovy
+++ b/stacklight-upgrade.groovy
@@ -54,7 +54,7 @@
 
         def elasticsearch_vip
         def pillar = salt.getReturnValues(salt.getPillar(master, "I@elasticsearch:client", 'elasticsearch:client:server:host'))
-        if(!pillar.isEmpty()) {
+        if(pillar) {
             elasticsearch_vip = pillar
         } else {
             errorOccured = true
@@ -63,7 +63,7 @@
 
         pillar = salt.getReturnValues(salt.getPillar(master, "I@elasticsearch:client", 'elasticsearch:client:server:port'))
         def elasticsearch_port
-        if(!pillar.isEmpty()) {
+        if(pillar) {
             elasticsearch_port = pillar
         } else {
             errorOccured = true
@@ -72,7 +72,7 @@
 
         pillar = salt.getReturnValues(salt.getPillar(master, "I@elasticsearch:client ${extra_tgt}", 'elasticsearch:client:server:scheme'))
         def elasticsearch_scheme
-        if(!pillar.isEmpty()) {
+        if(pillar) {
             elasticsearch_scheme = pillar
             common.infoMsg("[INFO] Using elasticsearch scheme: ${elasticsearch_scheme}")
         } else {