From f51498909097304b756619b5c58700958748f0b9 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Wed, 15 Dec 2021 20:23:00 +1000 Subject: [PATCH] Fix indentation issue with 2-bonds-vlans config This change moves the VLAN interfaces under the bond interface and addresses the bug raised here: https://bugzilla.redhat.com/show_bug.cgi?id=2032518 Resolves: #rhbz2032518 Change-Id: I715f6a809d83dd9dca6a5cbfed407136bc72d6b6 --- .../2-linux-bonds-vlans/role.role.j2.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/network/config/2-linux-bonds-vlans/role.role.j2.yaml b/network/config/2-linux-bonds-vlans/role.role.j2.yaml index b7f5055251..dd506cdcfb 100644 --- a/network/config/2-linux-bonds-vlans/role.role.j2.yaml +++ b/network/config/2-linux-bonds-vlans/role.role.j2.yaml @@ -214,17 +214,17 @@ resources: mtu: get_attr: [MinViableMtuBondData, value] {%- for network in networks if network.name.startswith('Tenant') and network.name in _role_networks and network.enabled|default(true) %} - - type: vlan - device: bond-data - mtu: - get_param: {{network.name}}Mtu - vlan_id: - get_param: {{network.name}}NetworkVlanID - addresses: - - ip_netmask: - get_param: {{network.name}}IpSubnet - routes: - get_param: {{network.name}}InterfaceRoutes + - type: vlan + device: bond-data + mtu: + get_param: {{network.name}}Mtu + vlan_id: + get_param: {{network.name}}NetworkVlanID + addresses: + - ip_netmask: + get_param: {{network.name}}IpSubnet + routes: + get_param: {{network.name}}InterfaceRoutes {%- endfor %} {%- else %} - type: ovs_user_bridge