commit cf03eb8e3b70e95ed9a23674cc49b9192d308164
author root <root@cfg01.azvyagitnsev-test.local> Thu May 30 08:59:27 2019 +0000
committer Tatyana Leontovich <tleontovich@mirantis.com> Tue Jun 04 16:35:44 2019 +0000
tree 712bdbc7e7d4983462a6aa1509e3c23862fd909f
parent a02e99fb64a158aa9a762b0ab78f9ccef40c6372

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/init.yml

diff --git a/defaults/init.yml b/defaults/init.yml
index bcee4bf..c90c404 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -11,6 +11,7 @@
 - system.defaults.backupninja
 - system.defaults.git
 - system.defaults.glusterfs
+- system.defaults.nginx
 - system.defaults.jenkins
 - system.defaults.maas
 - system.defaults.opencontrail
@@ -55,3 +56,6 @@
     # Cloudwatch api removed from Queens
     openstack_heat_cloudwatch_api_enabled: True
 
+    salt_master_host: '127.0.0.1'
+    infra_config_address: '127.0.0.1'
+    reclass_config_master: '127.0.0.1'