From 3b2857521ac9fcacb233a3bec99d2a576a5167f1 Mon Sep 17 00:00:00 2001
From: Bob Fournier <bfournie@redhat.com>
Date: Fri, 16 Aug 2024 12:25:16 -0400
Subject: [PATCH] Fix agent bonding configuration

It appears that https://github.com/openshift-metal3/dev-scripts/pull/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.
---
 agent/05_agent_configure.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/agent/05_agent_configure.sh b/agent/05_agent_configure.sh
index 3b7717585..34e493fe2 100755
--- a/agent/05_agent_configure.sh
+++ b/agent/05_agent_configure.sh
@@ -89,10 +89,6 @@ function configure_node() {
 
   # Get the generated mac addresses
   local node_mac=$(sudo virsh dumpxml "$cluster_name" | xmllint --xpath "string(//interface[descendant::source[@bridge = '${BAREMETAL_NETWORK_NAME}']]/mac/@address)" -)
-  if [[ ! -z "${BOND_PRIMARY_INTERFACE:-}" ]]; then
-    # For a bond, a random mac is added for the 2nd interface
-    node_mac+=($(sudo virsh domiflist "${cluster_name}" | grep "${BAREMETAL_NETWORK_NAME}" | grep -v "${node_mac}" | awk '{print $5}'))
-  fi
 
   if [[ "$node_type" != "extraworker" ]]; then
     if [[ "$IP_STACK" = "v4" ]]; then
@@ -104,6 +100,10 @@ function configure_node() {
       AGENT_NODES_IPSV6+=("$ipv6")
     fi
     AGENT_NODES_MACS+=("$node_mac")
+    if [[ ! -z "${BOND_PRIMARY_INTERFACE:-}" ]]; then
+      # For a bond, a random mac is added for the 2nd interface
+      AGENT_NODES_MACS+=($(sudo virsh domiflist "${cluster_name}" | grep "${BAREMETAL_NETWORK_NAME}" | grep -v "${node_mac}" | awk '{print $5}'))
+    fi
   else
       if [[ "$IP_STACK" = "v4" ]]; then
       AGENT_EXTRA_WORKERS_IPS+=("$node_ip")