Updated vhost1.usr and vhost2.usr (network setup changes).

diff --git a/sources/vhost1.usr/01_setupnetworking.sh b/sources/vhost1.usr/01_setupnetworking.sh
index 40eb506601b9d897f112122421183f1d41bb4b9f..72f2f0d0dc23c502690605f2d80a34b990f5a890 100755 (executable)
--- a/sources/vhost1.usr/01_setupnetworking.sh
+++ b/sources/vhost1.usr/01_setupnetworking.sh
@@ -33,6 +33,9 @@ EXTERNAL_BOND_SLAVE_1_DEVICE=eno2
 EXTERNAL_BOND_SLAVE_2_NAME=${EXTERNAL_BOND_NAME}-slave-2
 EXTERNAL_BOND_SLAVE_2_DEVICE=eno4
 
+EXTERNAL_BRIDGE_NAME=bre
+EXTERNAL_BRIDGE_DEVICE=${EXTERNAL_BRIDGE_NAME}-dev
+
 
 nmcli connection delete $INTERNAL_BRIDGE_NAME
 nmcli connection delete $INTERNAL_BOND_NAME
@@ -41,6 +44,7 @@ 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
@@ -69,7 +73,7 @@ nmcli connection add \
     connection.type bond \
     connection.master $INTERNAL_BRIDGE_DEVICE \
     connection.slave-type bridge \
-    bond.options "mode=balance-xor,miimon=100" \
+    bond.options "mode=active-backup,miimon=100" \
     save yes
 
 nmcli connection add \
@@ -100,14 +104,24 @@ nmcli connection add \
     bridge.stp no \
     save yes
 
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $EXTERNAL_BRIDGE_NAME \
+    connection.interface-name $EXTERNAL_BRIDGE_DEVICE \
+    connection.type bridge \
+    ipv4.method "disabled" \
+    ipv6.method "ignore" \
+    bridge.stp no \
+    save yes
+
 nmcli connection add \
     connection.autoconnect yes \
     connection.id $EXTERNAL_BOND_NAME \
     connection.interface-name $EXTERNAL_BOND_DEVICE \
     connection.type bond \
-    bond.options "mode=balance-xor,miimon=100" \
-    ipv4.method "disabled" \
-    ipv6.method "ignore" \
+    connection.master $EXTERNAL_BRIDGE_DEVICE \
+    connection.slave-type bridge \
+    bond.options "mode=active-backup,miimon=100" \
     save yes
 
 nmcli connection add \

diff --git a/sources/vhost2.usr/01_setupnetworking.sh b/sources/vhost2.usr/01_setupnetworking.sh
index 15f8436e69f410b2df41353c59e4e0be848bb3b2..1475c2c82c72df9607d746f5671357b7ccae4154 100755 (executable)
--- a/sources/vhost2.usr/01_setupnetworking.sh
+++ b/sources/vhost2.usr/01_setupnetworking.sh
@@ -33,6 +33,9 @@ EXTERNAL_BOND_SLAVE_1_DEVICE=eno2
 EXTERNAL_BOND_SLAVE_2_NAME=${EXTERNAL_BOND_NAME}-slave-2
 EXTERNAL_BOND_SLAVE_2_DEVICE=eno4
 
+EXTERNAL_BRIDGE_NAME=bre
+EXTERNAL_BRIDGE_DEVICE=${EXTERNAL_BRIDGE_NAME}-dev
+
 
 nmcli connection delete $INTERNAL_BRIDGE_NAME
 nmcli connection delete $INTERNAL_BOND_NAME
@@ -41,6 +44,7 @@ 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
@@ -69,7 +73,7 @@ nmcli connection add \
     connection.type bond \
     connection.master $INTERNAL_BRIDGE_DEVICE \
     connection.slave-type bridge \
-    bond.options "mode=balance-xor,miimon=100" \
+    bond.options "mode=active-backup,miimon=100" \
     save yes
 
 nmcli connection add \
@@ -100,14 +104,24 @@ nmcli connection add \
     bridge.stp no \
     save yes
 
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $EXTERNAL_BRIDGE_NAME \
+    connection.interface-name $EXTERNAL_BRIDGE_DEVICE \
+    connection.type bridge \
+    ipv4.method "disabled" \
+    ipv6.method "ignore" \
+    bridge.stp no \
+    save yes
+
 nmcli connection add \
     connection.autoconnect yes \
     connection.id $EXTERNAL_BOND_NAME \
     connection.interface-name $EXTERNAL_BOND_DEVICE \
     connection.type bond \
-    bond.options "mode=balance-xor,miimon=100" \
-    ipv4.method "disabled" \
-    ipv6.method "ignore" \
+    connection.master $EXTERNAL_BRIDGE_DEVICE \
+    connection.slave-type bridge \
+    bond.options "mode=active-backup,miimon=100" \
     save yes
 
 nmcli connection add \