Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[reclass] Set banner_company_name: OPNFV"
[fuel.git]
/
mcp
/
reclass
/
classes
/
cluster
/
mcp-common-ha
/
openstack_compute_pdf.yml.j2
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
396334c
..
51a6dbd
100644
(file)
--- 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}
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) }}
{{ ma.linux_network_interfaces_nic(nics) }}