Add neutron x509 metadata
Related-Prod: PROD-22765
Change-Id: I1c86298ffd8689281584f0e48c72ee11857eb256
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 797c378..3814a03 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -5,11 +5,14 @@
- system.haproxy.proxy.listen.openstack.neutron
- system.galera.server.database.neutron
- system.salt.minion.cert.mysql.clients.openstack.neutron
+- system.salt.minion.cert.rabbitmq.clients.openstack.neutron
parameters:
_param:
cluster_internal_protocol: 'http'
openstack_mysql_x509_enabled: False
+ openstack_rabbitmq_x509_enabled: False
galera_ssl_enabled: False
+ rabbitmq_ssl_enabled: False
linux:
system:
package:
@@ -31,6 +34,14 @@
cert_file: ${_param:mysql_neutron_client_ssl_cert_file}
ssl:
enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_neutron_ssl_ca_file}
+ key_file: ${_param:rabbitmq_neutron_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
role: ${_param:openstack_node_role}
identity:
protocol: ${_param:cluster_internal_protocol}
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 094449e..2f1982f 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -1,5 +1,6 @@
classes:
- system.neutron.control.cluster
+- system.salt.minion.cert.rabbitmq.clients.openstack.neutron
parameters:
_param:
neutron_control_dvr: True
@@ -12,6 +13,8 @@
neutron_enable_bgp_vpn: False
neutron_bgp_vpn_driver: bagpipe
cluster_internal_protocol: 'http'
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
neutron:
server:
role: ${_param:openstack_node_role}
@@ -37,3 +40,15 @@
identity:
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
+ message_queue:
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_neutron_ssl_ca_file}
+ key_file: ${_param:rabbitmq_neutron_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index 450ab07..6c266c3 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -1,6 +1,7 @@
classes:
- system.neutron.control.single
- system.galera.server.database.neutron
+- system.salt.minion.cert.rabbitmq.clients.openstack.neutron
parameters:
_param:
neutron_control_dvr: True
@@ -14,6 +15,8 @@
neutron_bgp_vpn_driver: bagpipe
internal_protocol: 'http'
openstack_node_role: primary
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
neutron:
server:
role: ${_param:openstack_node_role}
@@ -42,3 +45,10 @@
message_queue:
members:
- host: ${_param:single_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_neutron_ssl_ca_file}
+ key_file: ${_param:rabbitmq_neutron_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 4988576..b261fe8 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -2,11 +2,14 @@
- service.neutron.control.single
- system.galera.server.database.neutron
- system.salt.minion.cert.mysql.clients.openstack.neutron
+- system.salt.minion.cert.rabbitmq.clients.openstack.neutron
parameters:
_param:
internal_protocol: 'http'
openstack_mysql_x509_enabled: False
+ openstack_rabbitmq_x509_enabled: False
galera_ssl_enabled: False
+ rabbitmq_ssl_enabled: False
linux:
system:
package:
@@ -24,5 +27,13 @@
cert_file: ${_param:mysql_neutron_client_ssl_cert_file}
ssl:
enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_neutron_ssl_ca_file}
+ key_file: ${_param:rabbitmq_neutron_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
identity:
protocol: ${_param:internal_protocol}