commit d22730e2c7e6691ec1d9ad928fa2226caa278b2e
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Dec 04 17:04:17 2018 +0000
committer Gerrit Code Review <mail@domain.com> Tue Dec 04 17:04:17 2018 +0000
tree a5b08d567957cedeea418c96f9b531f8ccdb3ad2
parent a3f8a380f3b18b5aab12f0ec5d17cb74cece6d6b
parent 388f4f0dc9dafbcab4928bfd53e2c2da921153df

Merge "Fix k8s node addresses in k8s certs"

apache/server/site/horizon.yml

diff --git a/apache/server/site/horizon.yml b/apache/server/site/horizon.yml
index 2a3b098..4cf7820 100644
--- a/apache/server/site/horizon.yml
+++ b/apache/server/site/horizon.yml
@@ -3,7 +3,7 @@
     apache_ssl:
       enabled: false
     apache_horizon_ssl: ${_param:apache_ssl}
-    apache_horizon_api_address: ${_param:single_address}
+    apache_horizon_api_address: ${_param:horizon_server_bind_address}
     apache_horizon_api_host: ${linux:network:fqdn}
   apache:
     server:

defaults/init.yml

diff --git a/defaults/init.yml b/defaults/init.yml
index 2a595b4..e98e3ae 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -38,3 +38,4 @@
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
     # Make sure this global variable is defined everywhere, where used it is already set on cluster level
     cluster_public_host: '127.0.0.1'
+    single_address: '127.0.0.1'

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 69ff618..2f6d807 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -59,6 +59,7 @@
     horizon_public_host: ${_param:cluster_public_host}
     horizon_public_port: 443
     horizon_public_protocol: https
+    horizon_server_bind_address: ${_param:single_address}
     # HAproxy
     haproxy_openstack_web_bind_port: ${_param:horizon_public_port}
     #

horizon/server/single.yml

diff --git a/horizon/server/single.yml b/horizon/server/single.yml
index e1ceb2d..73fbcc3 100644
--- a/horizon/server/single.yml
+++ b/horizon/server/single.yml
@@ -11,7 +11,7 @@
     server:
       branding: ${_param:horizon_site_branding}
       bind:
-        address: 0.0.0.0
+        address: ${_param:horizon_server_bind_address}
         port: 8078
       plugin: {}
       session:

nginx/server/proxy/openstack_web.yml

diff --git a/nginx/server/proxy/openstack_web.yml b/nginx/server/proxy/openstack_web.yml
index a9a4894..2de6606 100644
--- a/nginx/server/proxy/openstack_web.yml
+++ b/nginx/server/proxy/openstack_web.yml
@@ -14,7 +14,7 @@
           type: nginx_proxy
           name: openstack_web
           proxy:
-            host: localhost
+            host: ${_param:horizon_server_bind_address}
             # TODO: port must be configurable, as some deployments might have HAproxy over prx nodes
             port: 8078
             size: 10000m