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/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 3154a37..287987e 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -54,6 +54,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ 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/nova/compute/single.yml b/nova/compute/single.yml
index a6126ef..519ff37 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -49,7 +49,8 @@
enabled: ${_param:nova_service_user_enabled}
message_queue:
engine: rabbitmq
- host: ${_param:control_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
user: openstack
password: ${_param:rabbitmq_openstack_password}
diff --git a/nova/compute_ironic/cluster.yml b/nova/compute_ironic/cluster.yml
index 8b57948..7943453 100644
--- a/nova/compute_ironic/cluster.yml
+++ b/nova/compute_ironic/cluster.yml
@@ -28,6 +28,8 @@
service_user:
enabled: ${_param:nova_service_user_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
engine: rabbitmq
port: 5672
user: openstack
diff --git a/nova/compute_ironic/single.yml b/nova/compute_ironic/single.yml
index bc3ee7c..ab99139 100644
--- a/nova/compute_ironic/single.yml
+++ b/nova/compute_ironic/single.yml
@@ -33,7 +33,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
- host: ${_param:control_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
network:
engine: neutron
region: ${_param:openstack_region}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 7541d28..87363d3 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -73,6 +73,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ 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/nova/control/single.yml b/nova/control/single.yml
index e964f76..10f9a1c 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -37,6 +37,8 @@
barbican:
enabled: ${_param:barbican_integration_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}