Add metadata for X.509 auth between Manila and RMQ
Change-Id: I35c22c9764b13ff86a26b943b0ffc27f2cfb4f6a
Related-Prod: PROD-22764
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 46f600b..9ea811e 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -3,11 +3,14 @@
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.openstack.manila
- system.salt.minion.cert.mysql.clients.openstack.manila
+- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
_param:
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
manila_cluster_vip_address: ${_param:cluster_vip_address}
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
manila:
common:
@@ -19,6 +22,13 @@
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
host: ${_param:openstack_message_queue_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_manila_ssl_ca_file}
+ key_file: ${_param:rabbitmq_manila_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_manila_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
database:
engine: mysql
host: ${_param:openstack_database_address}
diff --git a/manila/common/single.yml b/manila/common/single.yml
index e806cde..f984ab7 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -1,10 +1,13 @@
classes:
- service.manila.common.single
- system.salt.minion.cert.mysql.clients.openstack.manila
+- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
_param:
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
manila:
common:
@@ -16,6 +19,13 @@
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
host: ${_param:single_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_manila_ssl_ca_file}
+ key_file: ${_param:rabbitmq_manila_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_manila_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
database:
engine: mysql
host: ${_param:single_address}
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/manila.yml b/salt/minion/cert/rabbitmq/clients/openstack/manila.yml
new file mode 100644
index 0000000..345b697
--- /dev/null
+++ b/salt/minion/cert/rabbitmq/clients/openstack/manila.yml
@@ -0,0 +1,22 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ rabbitmq_manila_client_ssl_key_file: /etc/manila/ssl/rabbitmq/client-key.pem
+ rabbitmq_manila_client_ssl_cert_file: /etc/manila/ssl/rabbitmq/client-cert.pem
+ rabbitmq_manila_ssl_ca_file: /etc/manila/ssl/rabbitmq/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ rabbitmq-manila-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: rabbitmq-manila-client
+ signing_policy: cert_client
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:rabbitmq_manila_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_manila_client_ssl_cert_file}
+ ca_file: ${_param:rabbitmq_manila_ssl_ca_file}
+ user: manila
+ group: manila
+ mode: 640