Skip to content

Commit 5756e9c

Browse files
authored
Fix agent bonding configuration (#1693)
It appears that #1654 broke the bonding configuration in 05_agent_configure.sh. AGENT_NODES_MACS was only adding a singular mac at line 106, not an array. Fixed to add in the bond mac correctly.
1 parent bdd7bc7 commit 5756e9c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

agent/05_agent_configure.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ function configure_node() {
8989

9090
# Get the generated mac addresses
9191
local node_mac=$(sudo virsh dumpxml "$cluster_name" | xmllint --xpath "string(//interface[descendant::source[@bridge = '${BAREMETAL_NETWORK_NAME}']]/mac/@address)" -)
92-
if [[ ! -z "${BOND_PRIMARY_INTERFACE:-}" ]]; then
93-
# For a bond, a random mac is added for the 2nd interface
94-
node_mac+=($(sudo virsh domiflist "${cluster_name}" | grep "${BAREMETAL_NETWORK_NAME}" | grep -v "${node_mac}" | awk '{print $5}'))
95-
fi
9692

9793
if [[ "$node_type" != "extraworker" ]]; then
9894
if [[ "$IP_STACK" = "v4" ]]; then
@@ -104,6 +100,10 @@ function configure_node() {
104100
AGENT_NODES_IPSV6+=("$ipv6")
105101
fi
106102
AGENT_NODES_MACS+=("$node_mac")
103+
if [[ ! -z "${BOND_PRIMARY_INTERFACE:-}" ]]; then
104+
# For a bond, a random mac is added for the 2nd interface
105+
AGENT_NODES_MACS+=($(sudo virsh domiflist "${cluster_name}" | grep "${BAREMETAL_NETWORK_NAME}" | grep -v "${node_mac}" | awk '{print $5}'))
106+
fi
107107
else
108108
if [[ "$IP_STACK" = "v4" ]]; then
109109
AGENT_EXTRA_WORKERS_IPS+=("$node_ip")

0 commit comments

Comments
 (0)