Add metadata for X.509 auth between Barbican and RMQ
Change-Id: I1d874796478333fcd4c8113e2a20d7dea706f727
Related-Prod: PROD-22755
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index dd4804f..7e4c0e4 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -2,11 +2,14 @@
- service.barbican.server.cluster
- system.haproxy.proxy.listen.openstack.barbican
- system.salt.minion.cert.mysql.clients.openstack.barbican
+- system.salt.minion.cert.rabbitmq.clients.openstack.barbican
parameters:
_param:
cluster_internal_protocol: 'http'
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
barbican:
server:
@@ -24,6 +27,13 @@
enabled: ${_param:galera_ssl_enabled}
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_barbican_ssl_ca_file}
+ key_file: ${_param:rabbitmq_barbican_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_barbican_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
linux:
system:
package:
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index 21054e3..befad42 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -1,11 +1,14 @@
classes:
- service.barbican.server.single
- system.salt.minion.cert.mysql.clients.openstack.barbican
+- system.salt.minion.cert.rabbitmq.clients.openstack.barbican
parameters:
_param:
internal_protocol: 'http'
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
barbican:
server:
@@ -22,6 +25,13 @@
protocol: ${_param:internal_protocol}
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_barbican_ssl_ca_file}
+ key_file: ${_param:rabbitmq_barbican_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_barbican_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
linux:
system:
package:
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml b/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml
new file mode 100644
index 0000000..9fa04ef
--- /dev/null
+++ b/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml
@@ -0,0 +1,22 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ rabbitmq_barbican_client_ssl_key_file: /etc/barbican/ssl/rabbitmq/client-key.pem
+ rabbitmq_barbican_client_ssl_cert_file: /etc/barbican/ssl/rabbitmq/client-cert.pem
+ rabbitmq_barbican_ssl_ca_file: /etc/barbican/ssl/rabbitmq/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ rabbitmq-barbican-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: rabbitmq-barbican-client
+ signing_policy: cert_client
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:rabbitmq_barbican_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_barbican_client_ssl_cert_file}
+ ca_file: ${_param:rabbitmq_barbican_ssl_ca_file}
+ user: barbican
+ group: barbican
+ mode: 640