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

salt/master/api.yml

diff --git a/salt/master/api.yml b/salt/master/api.yml
index b5ede2f..4ed3112 100644
--- a/salt/master/api.yml
+++ b/salt/master/api.yml
@@ -1,3 +1,9 @@
+classes:
+# Enabled ssl api by default
+- system.salt.minion.cert.salt_api
+- system.nginx.server.single
+- system.nginx.server.proxy.ssl
+- system.nginx.server.proxy.salt_api
 parameters:
   _param:
     salt_master_api_port: 6969
@@ -11,7 +17,7 @@
     api:
       enabled: true
       bind:
-        address: 0.0.0.0
+        address: ${_param:salt_master_api_bind_address}
         port: ${_param:salt_master_api_port}
     master:
       command_timeout: 600