From 32faafc317169dfe2216995bf4a2afd330749545 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 20 Jun 2018 14:24:16 +0200 Subject: [PATCH] [ha] cmp: Fix duplicate PXE/admin interface IDs Change-Id: I99a8acfbfdddb79493bf3a191835927cef5fd5e3 Signed-off-by: Alexandru Avadanii --- .../classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 | 6 ++++++ 1 file changed, 6 insertions(+) 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) }} -- 2.16.6