Merge "Add default location for cacert_file"
diff --git a/neutron/files/queens/neutron-generic.conf b/neutron/files/queens/neutron-generic.conf
index 096cb69..4eef1a4 100644
--- a/neutron/files/queens/neutron-generic.conf
+++ b/neutron/files/queens/neutron-generic.conf
@@ -439,6 +439,7 @@
{%- set messaging_engine = _data.engine %}
{%- endif %}
[oslo_messaging_{{ messaging_engine }}]
+{%- if _data.ssl is defined and 'cacert_file' not in _data.get('ssl', {}).keys() %}{% do _data['ssl'].update({'cacert_file': neutron.cacert_file}) %}{% endif %}
{%- include "oslo_templates/files/queens/oslo/messaging/_" + messaging_engine + ".conf" %}
{%- endif %}
diff --git a/neutron/files/queens/neutron-server.conf b/neutron/files/queens/neutron-server.conf
index 4f35a5b..f20ac88 100644
--- a/neutron/files/queens/neutron-server.conf
+++ b/neutron/files/queens/neutron-server.conf
@@ -483,6 +483,7 @@
{%- set messaging_engine = _data.engine %}
{%- endif %}
[oslo_messaging_{{ messaging_engine }}]
+{%- if _data.ssl is defined and 'cacert_file' not in _data.get('ssl', {}).keys() %}{% do _data['ssl'].update({'cacert_file': server.cacert_file}) %}{% endif %}
{%- include "oslo_templates/files/queens/oslo/messaging/_" + messaging_engine + ".conf" %}
{%- endif %}
diff --git a/neutron/gateway.sls b/neutron/gateway.sls
index 0927654..6c5da92 100644
--- a/neutron/gateway.sls
+++ b/neutron/gateway.sls
@@ -82,6 +82,7 @@
values: {{ gateway }}
- require:
- pkg: neutron_gateway_packages
+ - sls: neutron._ssl.rabbitmq
- watch_in:
- service: neutron_gateway_services
{% endfor %}
diff --git a/neutron/ml2_ovs/init.sls b/neutron/ml2_ovs/init.sls
index 87e7e6f..19b5379 100644
--- a/neutron/ml2_ovs/init.sls
+++ b/neutron/ml2_ovs/init.sls
@@ -48,9 +48,6 @@
- file: /etc/neutron/neutron.conf
- file: /etc/neutron/plugins/ml2/openvswitch_agent.ini
- file: /etc/neutron/plugins/ml2/sriov_agent.ini
- {%- if compute.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca_neutron_compute
- {%- endif %}
{% endif %}
@@ -125,9 +122,6 @@
- watch:
- file: /etc/neutron/neutron.conf
- file: /etc/neutron/plugins/ml2/openvswitch_agent.ini
- {%- if compute.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca_neutron_compute
- {%- endif %}
{%- set neutron_compute_services_list = compute.services %}
{%- if compute.backend.sriov is defined %}