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

neutron/control/cluster.yml

diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index be69bf8..ceaed1d 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -13,6 +13,7 @@
     openstack_rabbitmq_x509_enabled: False
     galera_ssl_enabled: False
     rabbitmq_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
@@ -22,6 +23,7 @@
   neutron:
     server:
       message_queue:
+        port: ${_param:openstack_rabbitmq_port}
         members:
           - host: ${_param:openstack_message_queue_node01_address}
           - host: ${_param:openstack_message_queue_node02_address}

neutron/control/single.yml

diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index b261fe8..27d16e1 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -10,6 +10,7 @@
     openstack_rabbitmq_x509_enabled: False
     galera_ssl_enabled: False
     rabbitmq_ssl_enabled: False
+    openstack_rabbitmq_port: 5672
   linux:
     system:
       package:
@@ -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_neutron_ssl_ca_file}