Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Smooth down telemetry services
[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
f1b369c
..
de0177a
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
@@
-42,6
+42,9
@@
parameters:
{%- if nm.cmp001.nic_admin in nics %}
{%- do nics.pop(nm.cmp001.nic_admin) %}
{%- endif %}
{%- if nm.cmp001.nic_admin in nics %}
{%- do nics.pop(nm.cmp001.nic_admin) %}
{%- endif %}
+{%- if ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) in nics %}
+ {%- do nics.pop(nm.cmp001.nic_public) %}
+{%- endif %}
{{ ma.linux_network_interfaces_nic(nics) }}
{{ ma.linux_network_interfaces_nic(nics) }}
@@
-67,9
+70,8
@@
parameters:
gateway: ${_param:opnfv_net_public_gw}
name_servers: {{ nm.dns_public }}
noifupdown: true
gateway: ${_param:opnfv_net_public_gw}
name_servers: {{ nm.dns_public }}
noifupdown: true
-
ovs_port_{{ nm.cmp001.nic_public
}}:
+
{{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public)
}}:
enabled: true
enabled: true
- name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
proto: manual
ovs_port_type: OVSPort
type: ovs_port
proto: manual
ovs_port_type: OVSPort
type: ovs_port