diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-21 16:56:20 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-21 16:56:20 +0200 |
| commit | 69c8d42f380c1e9b1ca9967dba06741358884845 (patch) | |
| tree | 159732c8b4df487d9aabccf8a3001e47b6811910 /mcp/reclass/classes | |
| parent | 8381fd3bf6e81c0b0f62bb6f382454ab63805ccb (diff) | |
[ha] cmp: Fix duplicate PXE/admin IDs (2)
Certain scenarios build additional interface definitions which
overlap with the ones from common-ha reclass dir.
Extend previous fix to scenario-specific interface definitions
to prevent such duplicates.
Change-Id: I57b175e2f760a22454723266b044845335af4cfe
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes')
3 files changed, 15 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute_pdf.yml.j2 index cc39db11a..f3844ad8c 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute_pdf.yml.j2 @@ -17,6 +17,11 @@ parameters: network: interface: +{#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #} +{%- if nm.cmp001.nic_admin in nics %} + {%- do nics.pop(nm.cmp001.nic_admin) %} +{%- endif %} + {{ ma.linux_network_interfaces_nic(nics) }} {{ ma.linux_network_interfaces_vlan(vlans) }} diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute_pdf.yml.j2 index cc39db11a..f3844ad8c 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute_pdf.yml.j2 @@ -17,6 +17,11 @@ parameters: network: interface: +{#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #} +{%- if nm.cmp001.nic_admin in nics %} + {%- do nics.pop(nm.cmp001.nic_admin) %} +{%- endif %} + {{ ma.linux_network_interfaces_nic(nics) }} {{ ma.linux_network_interfaces_vlan(vlans) }} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 index cc39db11a..f3844ad8c 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 @@ -17,6 +17,11 @@ parameters: network: interface: +{#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #} +{%- if nm.cmp001.nic_admin in nics %} + {%- do nics.pop(nm.cmp001.nic_admin) %} +{%- endif %} + {{ ma.linux_network_interfaces_nic(nics) }} {{ ma.linux_network_interfaces_vlan(vlans) }} |