commit dd934202e843d4a5c12442855bb165bdcc3f6773
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Jan 10 09:45:26 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Jan 10 09:45:26 2019 +0000
tree ba00824aad11a0461a10ed299036af08c070235c
parent 7076e8a618d4a18c996876d78af8c7e7324cd05e
parent 8090418c1493664fc9c5de006fddce6dd21266e6

Merge "Bump containerd version to 1.2.1"

.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml

diff --git a/.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml b/.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml
index f15497f..9ab92ef 100644
--- a/.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml
+++ b/.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml
@@ -23,7 +23,7 @@
 
           parameters:
             _param:
-              nginx_proxy_gerrit_server_site_host: ${_param:openstack_proxy_address}
+              nginx_proxy_gerrit_server_site_host: ${_param:cluster_public_host}
               nginx_proxy_gerrit_server_site_port: 8080
               gerrit_http_listen_url: proxy-https://*:8080/
               gerrit_public_host: https://${_param:nginx_proxy_gerrit_server_site_host}:${_param:nginx_proxy_gerrit_server_site_port}

murano/server/cluster.yml

diff --git a/murano/server/cluster.yml b/murano/server/cluster.yml
index 6c45f6d..a9b1f6d 100644
--- a/murano/server/cluster.yml
+++ b/murano/server/cluster.yml
@@ -40,7 +40,7 @@
         virtual_host: '/openstack'
       murano_agent_queue:
         engine: rabbitmq
-        host: ${_param:openstack_proxy_address}
+        host: ${_param:cluster_public_host}
         port: 5673
         user: openstack
         password: ${_param:rabbitmq_murano_agent_password}

murano/server/single.yml

diff --git a/murano/server/single.yml b/murano/server/single.yml
index 938263d..8c85019 100644
--- a/murano/server/single.yml
+++ b/murano/server/single.yml
@@ -35,7 +35,7 @@
         virtual_host: '/openstack'
       murano_agent_queue:
         engine: rabbitmq
-        host: ${_param:openstack_proxy_address}
+        host: ${_param:cluster_public_host}
         port: 5673
         user: openstack
         password: ${_param:rabbitmq_murano_agent_password}

nginx/server/proxy/openstack/horizon.yml

diff --git a/nginx/server/proxy/openstack/horizon.yml b/nginx/server/proxy/openstack/horizon.yml
index a44f862..d35ffa2 100644
--- a/nginx/server/proxy/openstack/horizon.yml
+++ b/nginx/server/proxy/openstack/horizon.yml
@@ -2,7 +2,7 @@
   _param:
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
-    nginx_proxy_openstack_horizon_host: ${_param:openstack_proxy_address}
+    nginx_proxy_openstack_horizon_host: ${_param:cluster_public_host}
   nginx:
     server:
       enabled: true