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/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index c24adf7..f909934 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -22,6 +22,8 @@
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
members:
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index 0bf079f..addca8c 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -13,6 +13,8 @@
password: ${_param:keystone_ceilometer_password}
protocol: ${_param:internal_protocol}
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/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 8f9c996..d5eeab7 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -24,6 +24,8 @@
message_queue:
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
+ 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/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index 36f2f08..61ceca9 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -9,6 +9,8 @@
ssl:
enabled: ${_param:ceilometer_agent_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}