commit 947500aa320e5d6ba26fa5fe18f4bd260015fd9d
author Ales Komarek <akomarek@mirantis.com> Tue Jul 04 16:10:22 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 04 16:10:24 2017 +0000
tree c62f9109b90cdb8cc3a041051529f368fcf3e8ec
parent 616f637854dc45e6ce2cf3c6ed289151a4c5d7b9
parent 9111f0c442c51d01a65c07f0261bec010016118a

Merge "Fix Heat ports in HAProxy/Nginx"

haproxy/proxy/listen/openstack/heat.yml

diff --git a/haproxy/proxy/listen/openstack/heat.yml b/haproxy/proxy/listen/openstack/heat.yml
index 440a018..2e6b918 100644
--- a/haproxy/proxy/listen/openstack/heat.yml
+++ b/haproxy/proxy/listen/openstack/heat.yml
@@ -7,19 +7,19 @@
           service_name: heat
           binds:
           - address: ${_param:cluster_vip_address}
-            port: 8000
+            port: 8003
           servers:
           - name: ctl01
             host: ${_param:cluster_node01_address}
-            port: 8000
+            port: 8003
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
           - name: ctl02
             host: ${_param:cluster_node02_address}
-            port: 8000
+            port: 8003
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
           - name: ctl03
             host: ${_param:cluster_node03_address}
-            port: 8000
+            port: 8003
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
         heat_api:
           type: openstack-service
@@ -45,17 +45,17 @@
           service_name: heat
           binds:
           - address: ${_param:cluster_vip_address}
-            port: 8003
+            port: 8000
           servers:
           - name: ctl01
             host: ${_param:cluster_node01_address}
-            port: 8003
+            port: 8000
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
           - name: ctl02
             host: ${_param:cluster_node02_address}
-            port: 8003
+            port: 8000
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
           - name: ctl03
             host: ${_param:cluster_node03_address}
-            port: 8003
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+            port: 8000
+            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3

nginx/server/proxy/openstack_api.yml

diff --git a/nginx/server/proxy/openstack_api.yml b/nginx/server/proxy/openstack_api.yml
index fc4f54c..2b84993 100644
--- a/nginx/server/proxy/openstack_api.yml
+++ b/nginx/server/proxy/openstack_api.yml
@@ -91,11 +91,11 @@
           name: openstack_api_heat_cfn
           proxy:
             host: ${_param:heat_service_host}
-            port: 8000
+            port: 8003
             protocol: http
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
-            port: 8000
+            port: 8003
           ssl: ${_param:nginx_proxy_ssl}
         nginx_proxy_openstack_api_heat_cfn:
           enabled: true
@@ -103,11 +103,11 @@
           name: openstack_api_heat_cloudwatch
           proxy:
             host: ${_param:heat_service_host}
-            port: 8003
+            port: 8000
             protocol: http
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
-            port: 8003
+            port: 8000
           ssl: ${_param:nginx_proxy_ssl}
         nginx_proxy_openstack_api_heat:
           enabled: true