commit b34cb7c5e248f6aa524b794ad211da1613923726
author Dmitry Kalashnik <dkalashnik@mirantis.com> Mon May 27 16:38:03 2019 +0400
committer Dmitry Kalashnik <dkalashnik@mirantis.com> Mon May 27 12:45:19 2019 +0000
tree 3fdce0093e577472ed38e68b399adf436a19628a
parent 73e43a438a0f95c191e7fb38187c5b5d2927c83f

Fix pillar condition for Elasticsearch

Change-Id: Ic94eb0637cd74416013ae5282e876411cb6a3562
PROD-related: PROD-30582

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 035a0a2..ea95aeb 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -878,7 +878,7 @@
     // Check ES health cluster status
     def pillar = salt.getReturnValues(salt.getPillar(master, "I@elasticsearch:client ${extra_tgt}", 'elasticsearch:client:server:host'))
     def elasticsearch_vip
-    if(!pillar.isEmpty()) {
+    if(pillar) {
         elasticsearch_vip = pillar
     } else {
         common.errorMsg('[ERROR] Elasticsearch VIP address could not be retrieved')
@@ -886,7 +886,7 @@
 
     pillar = salt.getReturnValues(salt.getPillar(master, "I@elasticsearch:client ${extra_tgt}", 'elasticsearch:client:server:port'))
     def elasticsearch_port
-    if(!pillar.isEmpty()) {
+    if(pillar) {
         elasticsearch_port = pillar
     } else {
         common.errorMsg('[ERROR] Elasticsearch VIP port could not be retrieved')
@@ -894,7 +894,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 {