Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[j2 parsing] Adopt new generate_config features
[fuel.git]
/
mcp
/
reclass
/
classes
/
cluster
/
mcp-pike-ovs-ha
/
openstack
/
compute_pdf.yml.j2
diff --git
a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
index
4e0f7d1
..
a3a8672
100644
(file)
--- a/
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
+++ b/
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
@@
-27,7
+27,7
@@
parameters:
{%- endfor %}
{%- for vlan in vlans %}
{%- endfor %}
{%- for vlan in vlans %}
- {%- if vlan
and vlan != 'native'
%}
+ {%- if vlan
| int > 0
%}
{{ vlans[vlan] }}.{{ vlan }}:
enabled: true
proto: manual
{{ vlans[vlan] }}.{{ vlan }}:
enabled: true
proto: manual
@@
-45,4
+45,4
@@
parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
- - {{ nm.cmp001.nic_private }}{% if nm.vlan_private
and nm.vlan_private != 'native'
%}.{{ nm.vlan_private }}{% endif %}
+ - {{ nm.cmp001.nic_private }}{% if nm.vlan_private
| int > 0
%}.{{ nm.vlan_private }}{% endif %}