Defined `use_vip_address` and `host` fields to `message_queue` section.
Keystone, Glance, Heat, Nova, Neutron, Cinder,
Ironic, Barbican, Aodh, Ceilometer, Designate,
Manila, Murano, Octavia, Sahara
are able to switched to rabbit VIP address.
This changes allows to switch Openstack components
to Rabbitmq VIP address.
Related-Prod: PROD-32458
Change-Id: I0dc0b6ad3ea1fc1ad9b11f70bdabf554eee7e0a8
Depends-On: https://gerrit.mcp.mirantis.com/#/c/89748/
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index cd6c667..c3c5a26 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -26,6 +26,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index db39076..22f57fd 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -24,6 +24,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 69cc3dc..6709403 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -24,6 +24,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ host: ${_param:openstack_message_queue_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 88179a3..a55c8c3 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -23,6 +23,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}