summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-20 14:24:16 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-20 14:24:16 +0200
commit32faafc317169dfe2216995bf4a2afd330749545 (patch)
treee23945e35fc37fe743684ed1c1bf937f30e7ce38 /mcp/reclass
parent7d16945d42ff8744b00d1bd87ab20df914afb06b (diff)
[ha] cmp: Fix duplicate PXE/admin interface IDs
Change-Id: I99a8acfbfdddb79493bf3a191835927cef5fd5e3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j26
1 files changed, 6 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
index 396334c6d..51a6dbd68 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
@@ -36,6 +36,12 @@ parameters:
address: ${_param:pxe_admin_address}
netmask: ${_param:opnfv_net_admin_mask}
mtu: ${_param:interface_mtu}
+ noifupdown: true
+
+{#- 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) }}