From b23b3454aa06270fae2681d5bb4023a0d0a91240 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Tue, 15 Feb 2022 15:33:20 +0100 Subject: [PATCH] Updated vhost1.in and vhost2.in (separated internal host and container networks). --- sources/vhost1.in/01_setupnetworking.sh | 162 ++++++++++++++---------- sources/vhost2.in/01_setupnetworking.sh | 162 ++++++++++++++---------- 2 files changed, 186 insertions(+), 138 deletions(-) diff --git a/sources/vhost1.in/01_setupnetworking.sh b/sources/vhost1.in/01_setupnetworking.sh index a47c8f4..4fcd773 100755 --- a/sources/vhost1.in/01_setupnetworking.sh +++ b/sources/vhost1.in/01_setupnetworking.sh @@ -2,13 +2,13 @@ set -x # network interfaces are: -# eno1: port 1 of sysplanar NetXtreme II, used for internal bond -# eno2: port 2 of sysplanar NetXtreme II, used for external bond -# eno3: port 3 of sysplanar NetXtreme II, used for internal bond -# eno4: port 4 of sysplanar NetXtreme II, used for external bond -# ens2f0: port 0 of PCIe NetXtreme, unused -# ens2f1: port 1 of PCIe NetXtreme, unused -# ens2f2: port 2 of PCIe NetXtreme, unused +# eno1: port 1 of sysplanar NetXtreme II, used for internal host bond +# eno2: port 2 of sysplanar NetXtreme II, used for internal container bond +# eno3: port 3 of sysplanar NetXtreme II, used for external container bond +# eno4: port 4 of sysplanar NetXtreme II, unused +# ens2f0: port 0 of PCIe NetXtreme, used for internal host bond +# ens2f1: port 1 of PCIe NetXtreme, used for internal container bond +# ens2f2: port 2 of PCIe NetXtreme, used for external container bond # ens2f3: port 3 of PCIe NetXtreme, unused # enp0s29f0u2: IMM # enp0s29f7u6: Huawei E3372H-320 LTE USB modem @@ -16,28 +16,35 @@ set -x # ibs4d1: port 2 of Mellanox ConnectX-2, used for mlx2 network -INTERNAL_BOND_NAME=bondi -INTERNAL_BOND_DEVICE=${INTERNAL_BOND_NAME}-dev -INTERNAL_BOND_SLAVE_1_NAME=${INTERNAL_BOND_NAME}-slave-1 -INTERNAL_BOND_SLAVE_1_DEVICE=eno1 -INTERNAL_BOND_SLAVE_2_NAME=${INTERNAL_BOND_NAME}-slave-2 -INTERNAL_BOND_SLAVE_2_DEVICE=eno3 +INTERNAL_HOST_BOND_NAME=bondhi +INTERNAL_HOST_BOND_DEVICE=${INTERNAL_HOST_BOND_NAME}-dev +INTERNAL_HOST_BOND_SLAVE_1_NAME=${INTERNAL_HOST_BOND_NAME}-slave-1 +INTERNAL_HOST_BOND_SLAVE_1_DEVICE=eno1 +INTERNAL_HOST_BOND_SLAVE_2_NAME=${INTERNAL_HOST_BOND_NAME}-slave-2 +INTERNAL_HOST_BOND_SLAVE_2_DEVICE=ens2f0 -INTERNAL_BRIDGE_NAME=bri -INTERNAL_BRIDGE_DEVICE=${INTERNAL_BRIDGE_NAME}-dev +INTERNAL_CONTAINER_BOND_NAME=bondci +INTERNAL_CONTAINER_BOND_DEVICE=${INTERNAL_CONTAINER_BOND_NAME}-dev +INTERNAL_CONTAINER_BOND_SLAVE_1_NAME=${INTERNAL_CONTAINER_BOND_NAME}-slave-1 +INTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE=eno2 +INTERNAL_CONTAINER_BOND_SLAVE_2_NAME=${INTERNAL_CONTAINER_BOND_NAME}-slave-2 +INTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE=ens2f1 -HOST_ONLY_BRIDGE_NAME=brh -HOST_ONLY_BRIDGE_DEVICE=${HOST_ONLY_BRIDGE_NAME}-dev +INTERNAL_CONTAINER_BRIDGE_NAME=brci +INTERNAL_CONTAINER_BRIDGE_DEVICE=${INTERNAL_CONTAINER_BRIDGE_NAME}-dev -EXTERNAL_BOND_NAME=bonde -EXTERNAL_BOND_DEVICE=${EXTERNAL_BOND_NAME}-dev -EXTERNAL_BOND_SLAVE_1_NAME=${EXTERNAL_BOND_NAME}-slave-1 -EXTERNAL_BOND_SLAVE_1_DEVICE=eno2 -EXTERNAL_BOND_SLAVE_2_NAME=${EXTERNAL_BOND_NAME}-slave-2 -EXTERNAL_BOND_SLAVE_2_DEVICE=eno4 +HOST_ONLY_CONTAINER_BRIDGE_NAME=brch +HOST_ONLY_CONTAINER_BRIDGE_DEVICE=${HOST_ONLY_CONTAINER_BRIDGE_NAME}-dev -EXTERNAL_BRIDGE_NAME=bre -EXTERNAL_BRIDGE_DEVICE=${EXTERNAL_BRIDGE_NAME}-dev +EXTERNAL_CONTAINER_BOND_NAME=bondce +EXTERNAL_CONTAINER_BOND_DEVICE=${EXTERNAL_CONTAINER_BOND_NAME}-dev +EXTERNAL_CONTAINER_BOND_SLAVE_1_NAME=${EXTERNAL_CONTAINER_BOND_NAME}-slave-1 +EXTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE=eno3 +EXTERNAL_CONTAINER_BOND_SLAVE_2_NAME=${EXTERNAL_CONTAINER_BOND_NAME}-slave-2 +EXTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE=ens2f2 + +EXTERNAL_CONTAINER_BRIDGE_NAME=brce +EXTERNAL_CONTAINER_BRIDGE_DEVICE=${EXTERNAL_CONTAINER_BRIDGE_NAME}-dev MLX1_CONNECTION_NAME=mlx1 MLX1_CONNECTION_DEVICE=ibs4 @@ -48,32 +55,22 @@ HUAWEI_CONNECTION_NAME=huawei HUAWEI_CONNECTION_DEVICE=enp0s29f7u6 -nmcli connection delete $INTERNAL_BRIDGE_NAME -nmcli connection delete $INTERNAL_BOND_NAME -nmcli connection delete $INTERNAL_BOND_SLAVE_1_NAME -nmcli connection delete $INTERNAL_BOND_SLAVE_1_DEVICE -nmcli connection delete $INTERNAL_BOND_SLAVE_2_NAME -nmcli connection delete $INTERNAL_BOND_SLAVE_2_DEVICE -nmcli connection delete $HOST_ONLY_BRIDGE_NAME -nmcli connection delete $EXTERNAL_BRIDGE_NAME -nmcli connection delete $EXTERNAL_BOND_NAME -nmcli connection delete $EXTERNAL_BOND_SLAVE_1_NAME -nmcli connection delete $EXTERNAL_BOND_SLAVE_1_DEVICE -nmcli connection delete $EXTERNAL_BOND_SLAVE_2_NAME -nmcli connection delete $EXTERNAL_BOND_SLAVE_2_DEVICE -nmcli connection delete $MLX1_CONNECTION_NAME -nmcli connection delete $MLX1_CONNECTION_DEVICE -nmcli connection delete $MLX2_CONNECTION_NAME -nmcli connection delete $MLX2_CONNECTION_DEVICE -nmcli connection delete $HUAWEI_CONNECTION_NAME -nmcli connection delete $HUAWEI_CONNECTION_DEVICE +CONNECTIONS=$(nmcli --terse connection show | wc -l) +while [ $CONNECTIONS -gt 0 ] +do + CONNECTION_LINE=$(nmcli --terse connection show | head -n 1) + CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':') + nmcli connection delete uuid "$CONNECTION_UUID" + CONNECTIONS=$(nmcli --terse connection show | wc -l) +done nmcli connection add \ connection.autoconnect yes \ - connection.id $INTERNAL_BRIDGE_NAME \ - connection.interface-name $INTERNAL_BRIDGE_DEVICE \ - connection.type bridge \ + connection.id $INTERNAL_HOST_BOND_NAME \ + connection.interface-name $INTERNAL_HOST_BOND_DEVICE \ + connection.type bond \ + bond.options "mode=802.3ad,lacp_rate=fast,miimon=100,xmit_hash_policy=layer2+3" \ ipv4.addresses "10.228.93.1/16" \ ipv4.dns "10.228.109.159, 10.228.92.159" \ ipv4.dns-search "in.useribm.hu" \ @@ -81,41 +78,68 @@ nmcli connection add \ ipv4.method "manual" \ ipv4.route-metric "100" \ ipv6.method "auto" \ + save yes + +nmcli connection add \ + connection.autoconnect yes \ + connection.id $INTERNAL_HOST_BOND_SLAVE_1_NAME \ + connection.interface-name $INTERNAL_HOST_BOND_SLAVE_1_DEVICE \ + connection.master $INTERNAL_HOST_BOND_DEVICE \ + connection.slave-type bond \ + connection.type 802-3-ethernet \ + save yes + +nmcli connection add \ + connection.autoconnect yes \ + connection.id $INTERNAL_HOST_BOND_SLAVE_2_NAME \ + connection.interface-name $INTERNAL_HOST_BOND_SLAVE_2_DEVICE \ + connection.master $INTERNAL_HOST_BOND_DEVICE \ + connection.slave-type bond \ + connection.type 802-3-ethernet \ + save yes + +nmcli connection add \ + connection.autoconnect yes \ + connection.id $INTERNAL_CONTAINER_BRIDGE_NAME \ + connection.interface-name $INTERNAL_CONTAINER_BRIDGE_DEVICE \ + connection.type bridge \ + ipv4.method "disabled" \ + ipv6.method "ignore" \ bridge.stp no \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $INTERNAL_BOND_NAME \ - connection.interface-name $INTERNAL_BOND_DEVICE \ + connection.id $INTERNAL_CONTAINER_BOND_NAME \ + connection.interface-name $INTERNAL_CONTAINER_BOND_DEVICE \ connection.type bond \ - connection.master $INTERNAL_BRIDGE_DEVICE \ + connection.master $INTERNAL_CONTAINER_BRIDGE_DEVICE \ connection.slave-type bridge \ bond.options "mode=802.3ad,lacp_rate=fast,miimon=100,xmit_hash_policy=layer2+3" \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $INTERNAL_BOND_SLAVE_1_NAME \ - connection.interface-name $INTERNAL_BOND_SLAVE_1_DEVICE \ - connection.master $INTERNAL_BOND_DEVICE \ + connection.id $INTERNAL_CONTAINER_BOND_SLAVE_1_NAME \ + connection.interface-name $INTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE \ + connection.master $INTERNAL_CONTAINER_BOND_DEVICE \ connection.slave-type bond \ connection.type 802-3-ethernet \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $INTERNAL_BOND_SLAVE_2_NAME \ - connection.interface-name $INTERNAL_BOND_SLAVE_2_DEVICE \ - connection.master $INTERNAL_BOND_DEVICE \ + connection.id $INTERNAL_CONTAINER_BOND_SLAVE_2_NAME \ + connection.interface-name $INTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE \ + connection.master $INTERNAL_CONTAINER_BOND_DEVICE \ connection.slave-type bond \ connection.type 802-3-ethernet \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $HOST_ONLY_BRIDGE_NAME \ - connection.interface-name $HOST_ONLY_BRIDGE_DEVICE \ + connection.id $HOST_ONLY_CONTAINER_BRIDGE_NAME \ + connection.interface-name $HOST_ONLY_CONTAINER_BRIDGE_DEVICE \ connection.type bridge \ ipv4.method "disabled" \ ipv6.method "ignore" \ @@ -124,8 +148,8 @@ nmcli connection add \ nmcli connection add \ connection.autoconnect yes \ - connection.id $EXTERNAL_BRIDGE_NAME \ - connection.interface-name $EXTERNAL_BRIDGE_DEVICE \ + connection.id $EXTERNAL_CONTAINER_BRIDGE_NAME \ + connection.interface-name $EXTERNAL_CONTAINER_BRIDGE_DEVICE \ connection.type bridge \ ipv4.method "disabled" \ ipv6.method "ignore" \ @@ -134,28 +158,28 @@ nmcli connection add \ nmcli connection add \ connection.autoconnect yes \ - connection.id $EXTERNAL_BOND_NAME \ - connection.interface-name $EXTERNAL_BOND_DEVICE \ + connection.id $EXTERNAL_CONTAINER_BOND_NAME \ + connection.interface-name $EXTERNAL_CONTAINER_BOND_DEVICE \ connection.type bond \ - connection.master $EXTERNAL_BRIDGE_DEVICE \ + connection.master $EXTERNAL_CONTAINER_BRIDGE_DEVICE \ connection.slave-type bridge \ bond.options "mode=active-backup,miimon=100" \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $EXTERNAL_BOND_SLAVE_1_NAME \ - connection.interface-name $EXTERNAL_BOND_SLAVE_1_DEVICE \ - connection.master $EXTERNAL_BOND_DEVICE \ + connection.id $EXTERNAL_CONTAINER_BOND_SLAVE_1_NAME \ + connection.interface-name $EXTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE \ + connection.master $EXTERNAL_CONTAINER_BOND_DEVICE \ connection.slave-type bond \ connection.type 802-3-ethernet \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $EXTERNAL_BOND_SLAVE_2_NAME \ - connection.interface-name $EXTERNAL_BOND_SLAVE_2_DEVICE \ - connection.master $EXTERNAL_BOND_DEVICE \ + connection.id $EXTERNAL_CONTAINER_BOND_SLAVE_2_NAME \ + connection.interface-name $EXTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE \ + connection.master $EXTERNAL_CONTAINER_BOND_DEVICE \ connection.slave-type bond \ connection.type 802-3-ethernet \ save yes diff --git a/sources/vhost2.in/01_setupnetworking.sh b/sources/vhost2.in/01_setupnetworking.sh index 3059dba..5dfecd8 100755 --- a/sources/vhost2.in/01_setupnetworking.sh +++ b/sources/vhost2.in/01_setupnetworking.sh @@ -2,13 +2,13 @@ set -x # network interfaces are: -# eno1: port 1 of sysplanar NetXtreme II, used for internal bond -# eno2: port 2 of sysplanar NetXtreme II, used for external bond -# eno3: port 3 of sysplanar NetXtreme II, used for internal bond -# eno4: port 4 of sysplanar NetXtreme II, used for external bond -# ens2f0: port 0 of PCIe NetXtreme, unused -# ens2f1: port 1 of PCIe NetXtreme, unused -# ens2f2: port 2 of PCIe NetXtreme, unused +# eno1: port 1 of sysplanar NetXtreme II, used for internal host bond +# eno2: port 2 of sysplanar NetXtreme II, used for internal container bond +# eno3: port 3 of sysplanar NetXtreme II, used for external container bond +# eno4: port 4 of sysplanar NetXtreme II, unused +# ens2f0: port 0 of PCIe NetXtreme, used for internal host bond +# ens2f1: port 1 of PCIe NetXtreme, used for internal container bond +# ens2f2: port 2 of PCIe NetXtreme, used for external container bond # ens2f3: port 3 of PCIe NetXtreme, unused # enp0s29f0u2: IMM # enp0s29f7u6: Huawei E3372H-320 LTE USB modem @@ -16,28 +16,35 @@ set -x # ibs4d1: port 2 of Mellanox ConnectX-2, used for mlx2 network -INTERNAL_BOND_NAME=bondi -INTERNAL_BOND_DEVICE=${INTERNAL_BOND_NAME}-dev -INTERNAL_BOND_SLAVE_1_NAME=${INTERNAL_BOND_NAME}-slave-1 -INTERNAL_BOND_SLAVE_1_DEVICE=eno1 -INTERNAL_BOND_SLAVE_2_NAME=${INTERNAL_BOND_NAME}-slave-2 -INTERNAL_BOND_SLAVE_2_DEVICE=eno3 +INTERNAL_HOST_BOND_NAME=bondhi +INTERNAL_HOST_BOND_DEVICE=${INTERNAL_HOST_BOND_NAME}-dev +INTERNAL_HOST_BOND_SLAVE_1_NAME=${INTERNAL_HOST_BOND_NAME}-slave-1 +INTERNAL_HOST_BOND_SLAVE_1_DEVICE=eno1 +INTERNAL_HOST_BOND_SLAVE_2_NAME=${INTERNAL_HOST_BOND_NAME}-slave-2 +INTERNAL_HOST_BOND_SLAVE_2_DEVICE=ens2f0 -INTERNAL_BRIDGE_NAME=bri -INTERNAL_BRIDGE_DEVICE=${INTERNAL_BRIDGE_NAME}-dev +INTERNAL_CONTAINER_BOND_NAME=bondci +INTERNAL_CONTAINER_BOND_DEVICE=${INTERNAL_CONTAINER_BOND_NAME}-dev +INTERNAL_CONTAINER_BOND_SLAVE_1_NAME=${INTERNAL_CONTAINER_BOND_NAME}-slave-1 +INTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE=eno2 +INTERNAL_CONTAINER_BOND_SLAVE_2_NAME=${INTERNAL_CONTAINER_BOND_NAME}-slave-2 +INTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE=ens2f1 -HOST_ONLY_BRIDGE_NAME=brh -HOST_ONLY_BRIDGE_DEVICE=${HOST_ONLY_BRIDGE_NAME}-dev +INTERNAL_CONTAINER_BRIDGE_NAME=brci +INTERNAL_CONTAINER_BRIDGE_DEVICE=${INTERNAL_CONTAINER_BRIDGE_NAME}-dev -EXTERNAL_BOND_NAME=bonde -EXTERNAL_BOND_DEVICE=${EXTERNAL_BOND_NAME}-dev -EXTERNAL_BOND_SLAVE_1_NAME=${EXTERNAL_BOND_NAME}-slave-1 -EXTERNAL_BOND_SLAVE_1_DEVICE=eno2 -EXTERNAL_BOND_SLAVE_2_NAME=${EXTERNAL_BOND_NAME}-slave-2 -EXTERNAL_BOND_SLAVE_2_DEVICE=eno4 +HOST_ONLY_CONTAINER_BRIDGE_NAME=brch +HOST_ONLY_CONTAINER_BRIDGE_DEVICE=${HOST_ONLY_CONTAINER_BRIDGE_NAME}-dev -EXTERNAL_BRIDGE_NAME=bre -EXTERNAL_BRIDGE_DEVICE=${EXTERNAL_BRIDGE_NAME}-dev +EXTERNAL_CONTAINER_BOND_NAME=bondce +EXTERNAL_CONTAINER_BOND_DEVICE=${EXTERNAL_CONTAINER_BOND_NAME}-dev +EXTERNAL_CONTAINER_BOND_SLAVE_1_NAME=${EXTERNAL_CONTAINER_BOND_NAME}-slave-1 +EXTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE=eno3 +EXTERNAL_CONTAINER_BOND_SLAVE_2_NAME=${EXTERNAL_CONTAINER_BOND_NAME}-slave-2 +EXTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE=ens2f2 + +EXTERNAL_CONTAINER_BRIDGE_NAME=brce +EXTERNAL_CONTAINER_BRIDGE_DEVICE=${EXTERNAL_CONTAINER_BRIDGE_NAME}-dev MLX1_CONNECTION_NAME=mlx1 MLX1_CONNECTION_DEVICE=ibs4 @@ -48,32 +55,22 @@ HUAWEI_CONNECTION_NAME=huawei HUAWEI_CONNECTION_DEVICE=enp0s29f7u6 -nmcli connection delete $INTERNAL_BRIDGE_NAME -nmcli connection delete $INTERNAL_BOND_NAME -nmcli connection delete $INTERNAL_BOND_SLAVE_1_NAME -nmcli connection delete $INTERNAL_BOND_SLAVE_1_DEVICE -nmcli connection delete $INTERNAL_BOND_SLAVE_2_NAME -nmcli connection delete $INTERNAL_BOND_SLAVE_2_DEVICE -nmcli connection delete $HOST_ONLY_BRIDGE_NAME -nmcli connection delete $EXTERNAL_BRIDGE_NAME -nmcli connection delete $EXTERNAL_BOND_NAME -nmcli connection delete $EXTERNAL_BOND_SLAVE_1_NAME -nmcli connection delete $EXTERNAL_BOND_SLAVE_1_DEVICE -nmcli connection delete $EXTERNAL_BOND_SLAVE_2_NAME -nmcli connection delete $EXTERNAL_BOND_SLAVE_2_DEVICE -nmcli connection delete $MLX1_CONNECTION_NAME -nmcli connection delete $MLX1_CONNECTION_DEVICE -nmcli connection delete $MLX2_CONNECTION_NAME -nmcli connection delete $MLX2_CONNECTION_DEVICE -nmcli connection delete $HUAWEI_CONNECTION_NAME -nmcli connection delete $HUAWEI_CONNECTION_DEVICE +CONNECTIONS=$(nmcli --terse connection show | wc -l) +while [ $CONNECTIONS -gt 0 ] +do + CONNECTION_LINE=$(nmcli --terse connection show | head -n 1) + CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':') + nmcli connection delete uuid "$CONNECTION_UUID" + CONNECTIONS=$(nmcli --terse connection show | wc -l) +done nmcli connection add \ connection.autoconnect yes \ - connection.id $INTERNAL_BRIDGE_NAME \ - connection.interface-name $INTERNAL_BRIDGE_DEVICE \ - connection.type bridge \ + connection.id $INTERNAL_HOST_BOND_NAME \ + connection.interface-name $INTERNAL_HOST_BOND_DEVICE \ + connection.type bond \ + bond.options "mode=802.3ad,lacp_rate=fast,miimon=100,xmit_hash_policy=layer2+3" \ ipv4.addresses "10.228.93.2/16" \ ipv4.dns "10.228.109.159, 10.228.92.159" \ ipv4.dns-search "in.useribm.hu" \ @@ -81,41 +78,68 @@ nmcli connection add \ ipv4.method "manual" \ ipv4.route-metric "100" \ ipv6.method "auto" \ + save yes + +nmcli connection add \ + connection.autoconnect yes \ + connection.id $INTERNAL_HOST_BOND_SLAVE_1_NAME \ + connection.interface-name $INTERNAL_HOST_BOND_SLAVE_1_DEVICE \ + connection.master $INTERNAL_HOST_BOND_DEVICE \ + connection.slave-type bond \ + connection.type 802-3-ethernet \ + save yes + +nmcli connection add \ + connection.autoconnect yes \ + connection.id $INTERNAL_HOST_BOND_SLAVE_2_NAME \ + connection.interface-name $INTERNAL_HOST_BOND_SLAVE_2_DEVICE \ + connection.master $INTERNAL_HOST_BOND_DEVICE \ + connection.slave-type bond \ + connection.type 802-3-ethernet \ + save yes + +nmcli connection add \ + connection.autoconnect yes \ + connection.id $INTERNAL_CONTAINER_BRIDGE_NAME \ + connection.interface-name $INTERNAL_CONTAINER_BRIDGE_DEVICE \ + connection.type bridge \ + ipv4.method "disabled" \ + ipv6.method "ignore" \ bridge.stp no \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $INTERNAL_BOND_NAME \ - connection.interface-name $INTERNAL_BOND_DEVICE \ + connection.id $INTERNAL_CONTAINER_BOND_NAME \ + connection.interface-name $INTERNAL_CONTAINER_BOND_DEVICE \ connection.type bond \ - connection.master $INTERNAL_BRIDGE_DEVICE \ + connection.master $INTERNAL_CONTAINER_BRIDGE_DEVICE \ connection.slave-type bridge \ bond.options "mode=802.3ad,lacp_rate=fast,miimon=100,xmit_hash_policy=layer2+3" \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $INTERNAL_BOND_SLAVE_1_NAME \ - connection.interface-name $INTERNAL_BOND_SLAVE_1_DEVICE \ - connection.master $INTERNAL_BOND_DEVICE \ + connection.id $INTERNAL_CONTAINER_BOND_SLAVE_1_NAME \ + connection.interface-name $INTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE \ + connection.master $INTERNAL_CONTAINER_BOND_DEVICE \ connection.slave-type bond \ connection.type 802-3-ethernet \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $INTERNAL_BOND_SLAVE_2_NAME \ - connection.interface-name $INTERNAL_BOND_SLAVE_2_DEVICE \ - connection.master $INTERNAL_BOND_DEVICE \ + connection.id $INTERNAL_CONTAINER_BOND_SLAVE_2_NAME \ + connection.interface-name $INTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE \ + connection.master $INTERNAL_CONTAINER_BOND_DEVICE \ connection.slave-type bond \ connection.type 802-3-ethernet \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $HOST_ONLY_BRIDGE_NAME \ - connection.interface-name $HOST_ONLY_BRIDGE_DEVICE \ + connection.id $HOST_ONLY_CONTAINER_BRIDGE_NAME \ + connection.interface-name $HOST_ONLY_CONTAINER_BRIDGE_DEVICE \ connection.type bridge \ ipv4.method "disabled" \ ipv6.method "ignore" \ @@ -124,8 +148,8 @@ nmcli connection add \ nmcli connection add \ connection.autoconnect yes \ - connection.id $EXTERNAL_BRIDGE_NAME \ - connection.interface-name $EXTERNAL_BRIDGE_DEVICE \ + connection.id $EXTERNAL_CONTAINER_BRIDGE_NAME \ + connection.interface-name $EXTERNAL_CONTAINER_BRIDGE_DEVICE \ connection.type bridge \ ipv4.method "disabled" \ ipv6.method "ignore" \ @@ -134,28 +158,28 @@ nmcli connection add \ nmcli connection add \ connection.autoconnect yes \ - connection.id $EXTERNAL_BOND_NAME \ - connection.interface-name $EXTERNAL_BOND_DEVICE \ + connection.id $EXTERNAL_CONTAINER_BOND_NAME \ + connection.interface-name $EXTERNAL_CONTAINER_BOND_DEVICE \ connection.type bond \ - connection.master $EXTERNAL_BRIDGE_DEVICE \ + connection.master $EXTERNAL_CONTAINER_BRIDGE_DEVICE \ connection.slave-type bridge \ bond.options "mode=active-backup,miimon=100" \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $EXTERNAL_BOND_SLAVE_1_NAME \ - connection.interface-name $EXTERNAL_BOND_SLAVE_1_DEVICE \ - connection.master $EXTERNAL_BOND_DEVICE \ + connection.id $EXTERNAL_CONTAINER_BOND_SLAVE_1_NAME \ + connection.interface-name $EXTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE \ + connection.master $EXTERNAL_CONTAINER_BOND_DEVICE \ connection.slave-type bond \ connection.type 802-3-ethernet \ save yes nmcli connection add \ connection.autoconnect yes \ - connection.id $EXTERNAL_BOND_SLAVE_2_NAME \ - connection.interface-name $EXTERNAL_BOND_SLAVE_2_DEVICE \ - connection.master $EXTERNAL_BOND_DEVICE \ + connection.id $EXTERNAL_CONTAINER_BOND_SLAVE_2_NAME \ + connection.interface-name $EXTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE \ + connection.master $EXTERNAL_CONTAINER_BOND_DEVICE \ connection.slave-type bond \ connection.type 802-3-ethernet \ save yes -- 2.54.0