commit 961b6117ab26537a4ebdc0ee5e54201b9113ec17
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Oct 10 12:31:26 2017 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> Tue Oct 10 12:31:26 2017 +0000
tree e9f264f158a8d47974a748440c5edc04f8f5693d
parent c983173e50a825a0fd9b72a3b0dc68e9c82f83b9
parent 1539f3cf6da9be83a978eecc012cde5aa770bd59

Merge "Add default salt_api_url to validate pipeline"

jenkins/client/job/validate.yml

diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 7be935b..9ee63c1 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
   jenkins:
     client:
       view:
@@ -22,11 +24,11 @@
             url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
             credentials: "gerrit"
             script: validate-cloud.groovy
-
           param:
             SALT_MASTER_URL:
               type: string
-              default: ""
+              default: "${_param:jenkins_salt_api_url}"
+              description: Full Salt API address [e.g. https://10.10.10.2:6969]
             SALT_MASTER_CREDENTIALS:
               type: string
               default: "salt"