commit 25cc13d63c9d5fa6bc93100ad46f205c9586402d
author Oleksandr Bryndzii <obryndzii@mirantis.com> Wed Sep 12 13:52:23 2018 +0000
committer Oleksandr Bryndzii <obryndzii@mirantis.com> Thu Sep 13 10:21:36 2018 +0000
tree de2d3c16432459c34aabbf0b7e4ded6edd1fb45f
parent 2b385e457439fce9d1f0f3a51191c30bb4b20930

Add cinder x509 metadata

Related-Prod: PROD-22757

Change-Id: Ie53f44daa54e349430cefc1d507f9245e17f1717

cinder/control/cluster.yml

diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 5bc5c75..503537e 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -4,11 +4,14 @@
 - service.keepalived.cluster.single
 - system.haproxy.proxy.listen.openstack.cinder
 - system.salt.minion.cert.mysql.clients.openstack.cinder
+- system.salt.minion.cert.rabbitmq.clients.openstack.cinder
 parameters:
   _param:
     cluster_internal_protocol: 'http'
     openstack_mysql_x509_enabled: False
     galera_ssl_enabled: False
+    openstack_rabbitmq_x509_enabled: False
+    rabbitmq_ssl_enabled: False
   linux:
     system:
       package:
@@ -67,6 +70,13 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
+        x509:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
+          ca_file: ${_param:rabbitmq_cinder_ssl_ca_file}
+          key_file: ${_param:rabbitmq_cinder_client_ssl_key_file}
+          cert_file: ${_param:rabbitmq_cinder_client_ssl_cert_file}
+        ssl:
+          enabled: ${_param:rabbitmq_ssl_enabled}
       cache:
         engine: memcached
         members: