Change way to get jenkins master url
Change-Id: I7dece1cf30c1e1fe56388aae4bb939adc1e98417
Related-prod: PROD:26834
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index cecbfd1..0e2c239 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -781,8 +781,9 @@
}
// Jenkins
- def jenkins_master_url_pillar = salt.getPillar(master, jenkins_compound, '_param:jenkins_master_url')
- jenkins_master_url = salt.getReturnValues(jenkins_master_url_pillar)
+ def jenkins_master_host_pillar = salt.getPillar(master, jenkins_compound, '_param:jenkins_master_host')
+ def jenkins_master_port_pillar = salt.getPillar(master, jenkins_compound, '_param:jenkins_master_port')
+ jenkins_master_url = "http://${salt.getReturnValues(jenkins_master_host_pillar)}:${salt.getReturnValues(jenkins_master_port_pillar)}"
timeout(wait_timeout) {
common.infoMsg('Waiting for Jenkins to come up..')