diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/installers/fuel/net_macros.j2 | 8 | ||||
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 2 |
2 files changed, 5 insertions, 5 deletions
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 }} diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 7f53b59c..657bc2c1 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -32,7 +32,7 @@ parameters: power_type: {{ node.remote_management.type }} power_user: {{ node.remote_management.user }} architecture: {{ node.node.arch | dpkg_arch }}/generic - distro_series: xenial + distro_series: bionic hwe_kernel: ${_param:hwe_kernel} {%- if loop.index > nm.cmp001.idx %} disk_layout: |