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

designate/server/cluster/default.yml

diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index 112d953..36da38b 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -10,6 +10,7 @@
     cluster_internal_protocol: 'http'
     openstack_mysql_x509_enabled: False
     galera_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
@@ -59,7 +60,7 @@
           address: ${_param:single_address}
       message_queue:
         engine: rabbitmq
-        port: 5672
+        port: ${_param:openstack_rabbitmq_port}
         members:
         - host: ${_param:openstack_message_queue_node01_address}
         - host: ${_param:openstack_message_queue_node02_address}

designate/server/cluster/simple.yml

diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index 06c6a33..11625cf 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -7,6 +7,7 @@
     cluster_internal_protocol: 'http'
     openstack_mysql_x509_enabled: False
     galera_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
@@ -56,7 +57,7 @@
           address: ${_param:single_address}
       message_queue:
         engine: rabbitmq
-        port: 5672
+        port: ${_param:openstack_rabbitmq_port}
         members:
         - host: ${_param:openstack_message_queue_node01_address}
         - host: ${_param:openstack_message_queue_node02_address}

designate/server/single.yml

diff --git a/designate/server/single.yml b/designate/server/single.yml
index 1bb51cb..11bd1d1 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -7,6 +7,7 @@
     internal_protocol: 'http'
     openstack_mysql_x509_enabled: False
     galera_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
@@ -54,7 +55,7 @@
       message_queue:
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
-        port: 5672
+        port: ${_param:openstack_rabbitmq_port}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'