Add metadata for X.509 auth between Ceilometer and RMQ
Related-Prod: PROD-22756
Change-Id: Ifa70f9d5d675783d50e053b03a54900353fb13fb
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 9f7b62f..cadbaa9 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -1,8 +1,11 @@
classes:
- service.ceilometer.agent.cluster
+- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
_param:
openstack_rabbitmq_port: 5672
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
ceilometer:
agent:
region: ${_param:openstack_region}
@@ -29,6 +32,13 @@
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
ha_queues: true
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_ceilometer_ssl_ca_file}
+ key_file: ${_param:rabbitmq_ceilometer_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_ceilometer_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
nova:
compute:
notification:
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index cfcb855..3803d12 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -1,11 +1,21 @@
classes:
- service.ceilometer.agent.single
+- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
_param:
openstack_rabbitmq_port: 5672
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
ceilometer:
agent:
- message_queue:
- port: ${_param:openstack_rabbitmq_port}
identity:
protocol: ${_param:internal_protocol}
+ message_queue:
+ port: ${_param:openstack_rabbitmq_port}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_ceilometer_ssl_ca_file}
+ key_file: ${_param:rabbitmq_ceilometer_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_ceilometer_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 99e1090..56ca6cc 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -1,8 +1,11 @@
classes:
- service.ceilometer.agent.cluster.common
+- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
_param:
openstack_rabbitmq_port: 5672
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
ceilometer:
agent:
region: ${_param:openstack_region}
@@ -29,6 +32,13 @@
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
ha_queues: true
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_ceilometer_ssl_ca_file}
+ key_file: ${_param:rabbitmq_ceilometer_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_ceilometer_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
nova:
compute:
notification:
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index a5ce009..a5fcd51 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -1,11 +1,21 @@
classes:
- service.ceilometer.agent.single.common
+- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
_param:
openstack_rabbitmq_port: 5672
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
ceilometer:
agent:
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_ceilometer_ssl_ca_file}
+ key_file: ${_param:rabbitmq_ceilometer_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_ceilometer_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
identity:
protocol: ${_param:internal_protocol}