commit b8ea1c89b852a9e5f0b6d12b0a6220ff7e383a5b
author root <root@cfg01.azvyagitnsev-test.local> Thu May 30 08:59:27 2019 +0000
committer azvyagintsev <azvyagintsev@mirantis.com> Tue Jun 04 12:27:20 2019 +0300
tree 950a3f8aa46850699fbc2be464ab03d279dee4dc
parent 0e8728ce86d8e09c9e0d10a1e6b28a3920f15d3f

Enable and use salt_api proxy by default

 * Use nginx as proxy
 * Misc: define defaults for
    salt_master_host
    infra_config_address
    reclass_config_master
    jenkins_salt_api_url
 * Pass certs dir for jenkins docker slaves

Related: PROD-27641(PROD:27641)
Related: PROD-30528(PROD:30528)

Change-Id: I5fac90101131a8d8d4fa7857982f18c855e0771c

defaults/jenkins.yml

diff --git a/defaults/jenkins.yml b/defaults/jenkins.yml
index eddf216..d01bf4e 100644
--- a/defaults/jenkins.yml
+++ b/defaults/jenkins.yml
@@ -3,4 +3,4 @@
     jenkins_master_port: 8081
     jenkins_master_protocol: http
     jenkins_pipelines_branch: "master"
-    jenkins_salt_api_url: "http://${_param:salt_master_host}:${_param:salt_master_api_port}"
+    jenkins_salt_api_url: "https://${_param:salt_master_host}:${_param:nginx_proxy_salt_api_site_port}"