commit 3d1dd6f01a31479800cf364cb38dec85a1f093cf
author Oleksandr Shyshko <oshyshko@mirantis.com> Thu Sep 20 18:22:04 2018 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Fri Sep 21 09:17:43 2018 +0300
tree 1831c7f0175d3959847a0f8968bec16bb20078d4
parent 055473f6f061fb937a36f219a5111b999fbebf30

Unhard-coded 'message_queue:port:${_param:rabbitmq_port}'

Change-Id: I9c57a01b4e9f3b5cc03a7618ac8b7af1d227ab76

aodh/server/cluster.yml

diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 6d756d1..444050a 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -14,6 +14,7 @@
     galera_ssl_enabled: False
     openstack_rabbitmq_x509_enabled: False
     rabbitmq_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   linux:
     system:
       cron:
@@ -59,7 +60,7 @@
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
         engine: rabbitmq
-        port: 5672
+        port: ${_param:openstack_rabbitmq_port}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'

aodh/server/single.yml

diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index b71198b..2dfdea9 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -11,6 +11,7 @@
     galera_ssl_enabled: False
     openstack_rabbitmq_x509_enabled: False
     rabbitmq_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   linux:
     system:
       cron:
@@ -28,6 +29,7 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       message_queue:
+        port: ${_param:openstack_rabbitmq_port}
         x509:
           enabled: ${_param:openstack_rabbitmq_x509_enabled}
           ca_file: ${_param:rabbitmq_aodh_ssl_ca_file}