Fix duplicate sls ids
Octavia case is affected as some resources created under
octavia_identity.
Related-PROD: PROD-25137
Change-Id: If79ae1b1ee4d885f3bb5e83000e21c60bccde0b5
diff --git a/neutron/client/resources/init.sls b/neutron/client/resources/init.sls
index 8920064..090ebb7 100644
--- a/neutron/client/resources/init.sls
+++ b/neutron/client/resources/init.sls
@@ -11,7 +11,7 @@
{%- for identity_name, identity in client.get('server', {}).iteritems() %}
-wait_for_neutron_agents_legacy:
+wait_for_neutron_agents_legacy_{{ identity_name }}:
module.run:
- name: neutronng.wait_for_api_ready
- retries: 90
@@ -33,7 +33,7 @@
{%- if identity.endpoint_type is defined %}
- endpoint_type: {{ identity.endpoint_type }}
- require:
- - neutronng: wait_for_neutron_agents_legacy
+ - wait_for_neutron_agents_legacy_{{ identity_name }}
{%- endif %}
{%- endfor %}
diff --git a/neutron/client/resources/v2.sls b/neutron/client/resources/v2.sls
index b5798cd..d1bfd87 100644
--- a/neutron/client/resources/v2.sls
+++ b/neutron/client/resources/v2.sls
@@ -3,7 +3,7 @@
{%- for identity_name, identity in client.get('resources', {}).get('v2', {}).iteritems() %}
-wait_for_neutron_agents_v2:
+wait_for_neutron_agents_v2_{{ identity_name }}:
module.run:
- name: neutronv2.wait_for_api_ready
- retries: 90
@@ -42,7 +42,7 @@
- is_default: {{ network.is_default }}
{%- endif %}
- require:
- - wait_for_neutron_agents_v2
+ - wait_for_neutron_agents_v2_{{ identity_name }}
{%- if network.subnet is defined %}
{%- for subnet_name, subnet in network.subnet.iteritems() %}