Fix shellcheck SC2086 and auto-discover hypervisor from inventory

- Convert SSH_OPTS from string to bash array, expand with "${SSH_OPTS[@]}"
- Auto-discover hypervisor from TNT inventory (deploy/openshift-clusters/inventory.ini)
  with explicit argument as override
- Add pre-flight check for dev-scripts on the hypervisor
- Make missing config file non-fatal (Patch 0 skips gracefully)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: dhensel-rh

helpers/README.md

@@ -146,14 +146,19 @@ Also fixes `OPENSHIFT_CI` case sensitivity (`"TRUE"` → `"true"`) in the dev-sc
 **Usage:**
 
 ```bash
-# From helpers/ directory
+# From helpers/ directory — auto-discovers hypervisor from TNT inventory
+./patch-devscripts-mac-fencing.sh
+
+# Or specify an explicit hypervisor
 ./patch-devscripts-mac-fencing.sh ec2-user@<hypervisor-ip>
 
 # Then on the hypervisor:
 cd /home/ec2-user/openshift-metal3/dev-scripts
 sudo make agent
 ```
 
+The hypervisor is auto-discovered from `deploy/openshift-clusters/inventory.ini` (the `[metal_machine]` group). An explicit argument overrides auto-discovery.
+
 **Important:** TNT's Ansible role runs `git checkout --force` on dev-scripts before every deployment, wiping these patches. Either run this script after TNT's git checkout (before `make agent`), or deploy directly on the hypervisor.
 
 ### Resource Agents Patching

helpers/patch-devscripts-mac-fencing.sh

@@ -10,8 +10,11 @@ set -euo pipefail
 #   - A running cluster is NOT required — this patches source files
 #     before the cluster is deployed.
 #
-# Usage: ./patch-devscripts-mac-fencing.sh <hypervisor_host>
-# Example: ./patch-devscripts-mac-fencing.sh ec2-user@3.21.82.70
+# Usage: ./patch-devscripts-mac-fencing.sh [hypervisor_host]
+#
+# The hypervisor is auto-discovered from the TNT inventory file
+# (deploy/openshift-clusters/inventory.ini). An explicit argument
+# overrides auto-discovery.
 #
 # IMPORTANT: TNT's Ansible role runs `git checkout --force` on dev-scripts
 # before every deployment, wiping these patches. Either:
@@ -25,21 +28,45 @@ set -euo pipefail
 #   rm -rf ocp/ostest
 #   sudo make agent
 
-HYPERVISOR="${1:?Usage: $0 <hypervisor_host> (e.g. ec2-user@3.21.82.70)}"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+INVENTORY="${SCRIPT_DIR}/../deploy/openshift-clusters/inventory.ini"
+
+if [[ -n "${1:-}" ]]; then
+    HYPERVISOR="$1"
+elif [[ -f "${INVENTORY}" ]]; then
+    HYPERVISOR=$(awk '/^\[metal_machine\]/{found=1; next} found && /^[[:space:]]*$/{next} found && /^#/{next} found && /^\[/{exit} found{print $1; exit}' "${INVENTORY}")
+    if [[ -z "${HYPERVISOR}" ]]; then
+        echo "ERROR: Could not parse hypervisor from ${INVENTORY}"
+        exit 1
+    fi
+    echo "Auto-discovered hypervisor from inventory: ${HYPERVISOR}"
+else
+    echo "ERROR: No hypervisor specified and inventory not found at ${INVENTORY}"
+    echo "Usage: $0 [hypervisor_host]"
+    exit 1
+fi
+
 DEV_SCRIPTS="/home/ec2-user/openshift-metal3/dev-scripts"
-SSH_OPTS="-o StrictHostKeyChecking=no -o ServerAliveInterval=30 -o ServerAliveCountMax=120"
+SSH_OPTS=(-o StrictHostKeyChecking=no -o ServerAliveInterval=30 -o ServerAliveCountMax=120)
 
 echo "==> Patching dev-scripts on ${HYPERVISOR} for MAC-only fencing credentials"
 
+# Pre-flight: verify dev-scripts is cloned on the hypervisor
+if ! ssh "${SSH_OPTS[@]}" "${HYPERVISOR}" test -d "${DEV_SCRIPTS}/agent"; then
+    echo "ERROR: dev-scripts not found at ${DEV_SCRIPTS} on ${HYPERVISOR}"
+    echo "Run 'make init' or 'make deploy' from deploy/ first."
+    exit 1
+fi
+
 # Patch 0: Ensure AGENT_E2E_TEST_SCENARIO is set in the config file
 echo "--- Patch 0/3: config file (AGENT_E2E_TEST_SCENARIO)"
 # shellcheck disable=SC2087
-ssh ${SSH_OPTS} "${HYPERVISOR}" bash -s "${DEV_SCRIPTS}" <<'PATCH0_EOF'
+ssh "${SSH_OPTS[@]}" "${HYPERVISOR}" bash -s "${DEV_SCRIPTS}" <<'PATCH0_EOF'
 DEV_SCRIPTS="$1"
 CONFIG=$(ls "${DEV_SCRIPTS}"/config_*.sh 2>/dev/null | head -1)
 if [[ -z "$CONFIG" ]]; then
-    echo "  ERROR: No config_*.sh found in ${DEV_SCRIPTS}"
-    exit 1
+    echo "  SKIP: No config_*.sh found yet — will be created by 'make deploy'"
+    exit 0
 fi
 echo "  Config file: $(basename "$CONFIG")"
 
@@ -67,7 +94,7 @@ PATCH0_EOF
 # - Export AGENT_MASTER_MACS_STR (after AGENT_MASTER_HOSTNAMES_STR)
 echo "--- Patch 1/3: agent/05_agent_configure.sh"
 # shellcheck disable=SC2087
-ssh ${SSH_OPTS} "${HYPERVISOR}" bash -s "${DEV_SCRIPTS}" <<'PATCH1_EOF'
+ssh "${SSH_OPTS[@]}" "${HYPERVISOR}" bash -s "${DEV_SCRIPTS}" <<'PATCH1_EOF'
 DEV_SCRIPTS="$1"
 FILE="${DEV_SCRIPTS}/agent/05_agent_configure.sh"
 
@@ -92,7 +119,7 @@ PATCH1_EOF
 # - Add agent_master_macs variable
 echo "--- Patch 2/3: agent/roles/manifests/vars/main.yml"
 # shellcheck disable=SC2087
-ssh ${SSH_OPTS} "${HYPERVISOR}" bash -s "${DEV_SCRIPTS}" <<'PATCH2_EOF'
+ssh "${SSH_OPTS[@]}" "${HYPERVISOR}" bash -s "${DEV_SCRIPTS}" <<'PATCH2_EOF'
 DEV_SCRIPTS="$1"
 FILE="${DEV_SCRIPTS}/agent/roles/manifests/vars/main.yml"
 
@@ -108,7 +135,7 @@ PATCH2_EOF
 # - Replace hostname-based fencing with macaddress-based
 echo "--- Patch 3/3: install-config_baremetal_yaml.j2 (MAC-only fencing)"
 # shellcheck disable=SC2087
-ssh ${SSH_OPTS} "${HYPERVISOR}" bash -s "${DEV_SCRIPTS}" <<'PATCH3_EOF'
+ssh "${SSH_OPTS[@]}" "${HYPERVISOR}" bash -s "${DEV_SCRIPTS}" <<'PATCH3_EOF'
 DEV_SCRIPTS="$1"
 FILE="${DEV_SCRIPTS}/agent/roles/manifests/templates/install-config_baremetal_yaml.j2"
 
@@ -127,7 +154,7 @@ echo ""
 echo "==> All patches applied successfully."
 echo ""
 echo "Next steps:"
-echo "  1. SSH to the hypervisor:  ssh ${SSH_OPTS} ${HYPERVISOR}"
+echo "  1. SSH to the hypervisor:  ssh ${HYPERVISOR}"
 echo "  2. cd ${DEV_SCRIPTS}"
 echo "  3. make clean   (if cluster exists)"
-echo "  4. make agent   (deploy with MAC-only fencing)"
+echo "  4. sudo make agent   (deploy with MAC-only fencing)"