Merge "Add keystone x509 metadata"
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index 24840fe..1a5f4a3 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -6,12 +6,15 @@
- system.linux.system.users.keystone
- system.keystone.server.fernet_rotation.cluster
- system.salt.minion.cert.mysql.clients.openstack.keystone
+- system.salt.minion.cert.rabbitmq.clients.openstack.keystone
parameters:
_param:
keystone_tokens_expiration: 3600
openstack_node_role: primary
openstack_mysql_x509_enabled: False
+ openstack_rabbitmq_x509_enabled: False
galera_ssl_enabled: False
+ rabbitmq_ssl_enabled: False
linux:
system:
package:
@@ -69,6 +72,13 @@
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
ha_queues: true
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_keystone_ssl_ca_file}
+ key_file: ${_param:rabbitmq_keystone_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_keystone_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
auth_methods:
- password
- token
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index d926c0d..03cd75d 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -3,6 +3,7 @@
- system.linux.system.users.keystone
- system.keystone.server.fernet_rotation.single
- system.salt.minion.cert.mysql.clients.openstack.keystone
+- system.salt.minion.cert.rabbitmq.clients.openstack.keystone
parameters:
_param:
keystone_service_token: token
@@ -13,7 +14,9 @@
keystone_tokens_expiration: 3600
openstack_node_role: primary
openstack_mysql_x509_enabled: False
+ openstack_rabbitmq_x509_enabled: False
galera_ssl_enabled: False
+ rabbitmq_ssl_enabled: False
linux:
system:
package:
@@ -65,6 +68,13 @@
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
ha_queues: true
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_keystone_ssl_ca_file}
+ key_file: ${_param:rabbitmq_keystone_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_keystone_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
roles:
- admin
- Member
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/keystone.yml b/salt/minion/cert/rabbitmq/clients/openstack/keystone.yml
new file mode 100644
index 0000000..8261f73
--- /dev/null
+++ b/salt/minion/cert/rabbitmq/clients/openstack/keystone.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ rabbitmq_keystone_client_ssl_key_file: /etc/keystone/ssl/rabbitmq/client-key.pem
+ rabbitmq_keystone_client_ssl_cert_file: /etc/keystone/ssl/rabbitmq/client-cert.pem
+ rabbitmq_keystone_ssl_ca_file: /etc/keystone/ssl/rabbitmq/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ rabbitmq-keystone-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: rabbitmq-keystone-client
+ signing_policy: cert_client
+ alternative_names: >
+ IP:${_param:cluster_local_address},
+ DNS:${_param:cluster_local_address},
+ DNS:${linux:system:name},
+ DNS:${linux:network:fqdn}
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:rabbitmq_keystone_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_keystone_client_ssl_cert_file}
+ ca_file: ${_param:rabbitmq_keystone_ssl_ca_file}
+ user: keystone
+ group: keystone
+ mode: 640