commit 05030c5ee5e9461cb5c79d2b5789f7a83df02641
author Oleksandr Bryndzii <obryndzii@mirantis.com> Wed Sep 19 11:36:54 2018 +0300
committer Oleksandr Bryndzii <obryndzii@mirantis.com> Fri Sep 21 11:58:55 2018 +0300
tree 848c2e9dfb90995289db0967d8da0f43319a3898
parent 3d1dd6f01a31479800cf364cb38dec85a1f093cf

Add metadata for X.509 auth between Ceilometer and RMQ

Related-Prod: PROD-22756

Change-Id: Ifa70f9d5d675783d50e053b03a54900353fb13fb

ceilometer/agent/cluster.yml

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: