X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=config%2Finstallers%2Ffuel%2Fnet_macros.j2;h=c0a5d3298d271a30863cd9bf762017776c0f64d2;hb=0a5938bca8b4c6b8f328bdbb1f9da35fd8da002c;hp=ad26a79cb20a620b5b4c54c555697723d059df07;hpb=ba145df1e68b41af007f648ff3fb9c6f500e27cd;p=pharos.git diff --git a/config/installers/fuel/net_macros.j2 b/config/installers/fuel/net_macros.j2 index ad26a79c..c0a5d329 100644 --- a/config/installers/fuel/net_macros.j2 +++ b/config/installers/fuel/net_macros.j2 @@ -5,24 +5,24 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -{%- macro linux_network_interfaces_nic(nics) -%} +{%- macro linux_network_interfaces_nic(nics, proto = 'manual') -%} {%- for nic in nics %} {{ nic }}: enabled: true type: eth - proto: manual + proto: {{ proto }} mtu: ${_param:interface_mtu} name: {{ nic }} noifupdown: true {%- endfor %} {%- endmacro -%} -{%- macro linux_network_interfaces_vlan(vlans) -%} +{%- macro linux_network_interfaces_vlan(vlans, proto = 'manual') -%} {%- for vlan in vlans %} {%- if vlan | int > 0 %} {{ vlans[vlan] }}.{{ vlan }}: enabled: true - proto: manual + proto: {{ proto }} mtu: ${_param:interface_mtu} type: vlan name: {{ vlans[vlan] }}.{{ vlan }}