Fix cross states ID conflict
In the AIO deployment, all of neutron services located
at single node, so applying whole neutron state leads
to naming conficts:
Detected conflicting IDs, SLS IDs need to be globally unique.
The conflicting ID is 'rabbitmq_ca' and is found in SLS
'base:neutron.server' and SLS 'base:neutron.gateway'
Change-Id: I07a465821299d8ec6cbacf5041cbc40d0b8c121d
Closes-bug: PROD-14869
diff --git a/neutron/compute.sls b/neutron/compute.sls
index bb80f21..6829780 100644
--- a/neutron/compute.sls
+++ b/neutron/compute.sls
@@ -42,7 +42,7 @@
- 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
+ - file: rabbitmq_ca_neutron_compute
{%- endif %}
{% endif %}
@@ -74,7 +74,7 @@
- file: /etc/neutron/fwaas_driver.ini
{% endif %}
{%- if compute.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca
+ - file: rabbitmq_ca_neutron_compute
{%- endif %}
- require:
- pkg: neutron_dvr_packages
@@ -114,12 +114,12 @@
- 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
+ - file: rabbitmq_ca_neutron_compute
{%- endif %}
{%- if compute.message_queue.get('ssl',{}).get('enabled', False) %}
-rabbitmq_ca:
+rabbitmq_ca_neutron_compute:
{%- if compute.message_queue.ssl.cacert is defined %}
file.managed:
- name: {{ compute.message_queue.ssl.cacert_file }}
diff --git a/neutron/gateway.sls b/neutron/gateway.sls
index 96d7e9f..81513d8 100644
--- a/neutron/gateway.sls
+++ b/neutron/gateway.sls
@@ -63,12 +63,12 @@
- file: /etc/neutron/fwaas_driver.ini
{%- endif %}
{%- if gateway.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca
+ - file: rabbitmq_ca_neutron_gateway
{%- endif %}
{%- if gateway.message_queue.get('ssl',{}).get('enabled', False) %}
-rabbitmq_ca:
+rabbitmq_ca_neutron_gateway:
{%- if gateway.message_queue.ssl.cacert is defined %}
file.managed:
- name: {{ gateway.message_queue.ssl.cacert_file }}
diff --git a/neutron/server.sls b/neutron/server.sls
index 3c15b67..79e5aba 100644
--- a/neutron/server.sls
+++ b/neutron/server.sls
@@ -67,7 +67,7 @@
- watch:
- file: /etc/neutron/neutron.conf
{%- if server.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca
+ - file: rabbitmq_ca_neutron_server
{%- endif %}
{%- endif %}
@@ -220,7 +220,7 @@
- watch:
- file: /etc/neutron/neutron.conf
{%- if server.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca
+ - file: rabbitmq_ca_neutron_server
{%- endif %}
{%- if grains.get('virtual_subtype', None) == "Docker" %}
@@ -236,7 +236,7 @@
{%- if server.message_queue.get('ssl',{}).get('enabled', False) %}
-rabbitmq_ca:
+rabbitmq_ca_neutron_server:
{%- if server.message_queue.ssl.cacert is defined %}
file.managed:
- name: {{ server.message_queue.ssl.cacert_file }}