commit 99892233c727888f2f88e800ba4ad652acbb5819
author Vasyl Saienko <vsaienko@mirantis.com> Wed Feb 06 13:13:21 2019 +0200
committer Oleksii Butenko <obutenko@mirantis.com> Wed Feb 06 11:39:50 2019 +0000
tree 38d57accae87e3d022fecee3cb429bd0381696a8
parent a0c5a67c130d585d330e6a1de9220bdbe4626c37

Fix picking rabbitmq port for octavia

When ssl enabled rabbit is listening on 5671 port, this patch
updates octavia metadata to pick port from defaults.

Related-PROD: PROD-27153

Change-Id: Ifc7640a551b9f554a5c515b381f2e873e9df3c96

octavia/api/cluster.yml

diff --git a/octavia/api/cluster.yml b/octavia/api/cluster.yml
index 66622e3..31989b0 100644
--- a/octavia/api/cluster.yml
+++ b/octavia/api/cluster.yml
@@ -24,6 +24,7 @@
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
         host: ${_param:openstack_message_queue_address}
+        port: ${_param:openstack_rabbitmq_port}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
           ca_file: ${_param:rabbitmq_octavia_ssl_ca_file}

octavia/api/single.yml

diff --git a/octavia/api/single.yml b/octavia/api/single.yml
index 54e0abb..c42009d 100644
--- a/octavia/api/single.yml
+++ b/octavia/api/single.yml
@@ -23,6 +23,7 @@
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
         host: ${_param:openstack_message_queue_address}
+        port: ${_param:openstack_rabbitmq_port}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
           ca_file: ${_param:rabbitmq_octavia_ssl_ca_file}

octavia/manager/cluster.yml

diff --git a/octavia/manager/cluster.yml b/octavia/manager/cluster.yml
index 0e71b5c..f86dd80 100644
--- a/octavia/manager/cluster.yml
+++ b/octavia/manager/cluster.yml
@@ -25,6 +25,7 @@
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
         host: ${_param:openstack_message_queue_address}
+        port: ${_param:openstack_rabbitmq_port}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
           ca_file: ${_param:rabbitmq_octavia_ssl_ca_file}

octavia/manager/single.yml

diff --git a/octavia/manager/single.yml b/octavia/manager/single.yml
index 73c2ffe..e1e356b 100644
--- a/octavia/manager/single.yml
+++ b/octavia/manager/single.yml
@@ -30,6 +30,7 @@
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
         host: ${_param:openstack_message_queue_address}
+        port: ${_param:openstack_rabbitmq_port}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
           ca_file: ${_param:rabbitmq_octavia_ssl_ca_file}