commit 615aa9c7f2ce9017b763f0d402fe0fe12282bada
author Tomáš Kukrál <tkukral@mirantis.com> Sat Mar 04 15:29:08 2017 +0100
committer Tomáš Kukrál <tkukral@mirantis.com> Sat Mar 04 15:29:08 2017 +0100
tree 12bb44de8654bdb9f9d68774b1ecc1881aa19913
parent d94273937cf40bdcaec8479e35c1097eb716ad75

use workaroung for salt-api port number

Change-Id: I27b9e2607bf3cfba58c8d3858fe69370506c1514

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index f9924a6..268e9e8 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -98,7 +98,14 @@
                     // get SALT_MASTER_URL
                     saltMasterHost = openstack.getHeatStackOutputParam(openstackCloud, HEAT_STACK_NAME, 'salt_master_ip', openstackEnv)
                     currentBuild.description = "${HEAT_STACK_NAME}: ${saltMasterHost}"
-                    SALT_MASTER_URL = "http://${saltMasterHost}:8088"
+
+                    if (INSTALL.toLowerCase().contains('kvm')) {
+                        saltPort = 8088
+                    } else {
+                        saltPort = 8000
+                    }
+
+                    SALT_MASTER_URL = "http://${saltMasterHost}:saltPort"
                 }
             }