From 3c99bea27b9f11cefee66523ec4d3815bcd7998c Mon Sep 17 00:00:00 2001
From: Carlo Lobrano <c.lobrano@gmail.com>
Date: Thu, 12 Mar 2026 09:52:35 +0100
Subject: [PATCH] NO-JIRA: feat: add ssh-node target for quick SSH access to
 cluster nodes

Add 'make ssh-node' command to simplify SSH access to cluster nodes.

Usage:
  make ssh-node node=master-0               # Interactive SSH session
  make ssh-node node=1                      # SSH to master-1
  make ssh-node node=0 cmd='pcs status'     # Run command and return

Features:
- Supports multiple node name formats (master-0, master_0, node0, 0)
- Handles known_hosts issues from cluster redeploys
- Uses ProxyJump through the hypervisor automatically
---
 deploy/Makefile                               | 15 ++-
 deploy/openshift-clusters/scripts/ssh-node.sh | 92 +++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100755 deploy/openshift-clusters/scripts/ssh-node.sh

diff --git a/deploy/Makefile b/deploy/Makefile
index 1e8e8ec..2d0f7a1 100644
--- a/deploy/Makefile
+++ b/deploy/Makefile
@@ -78,6 +78,17 @@ fencing-kcli:
 
 patch-nodes:
 	@./openshift-clusters/scripts/patch-nodes.sh
+
+ssh-node:
+ifndef node
+	@echo "Usage: make ssh-node node=<0|1> [cmd=\"command\"]"
+	@echo "Examples:"
+	@echo "  make ssh-node node=0"
+	@echo "  make ssh-node node=1 cmd=\"sudo pcs status\""
+	@exit 1
+endif
+	@./openshift-clusters/scripts/ssh-node.sh $(node) $(cmd)
+
 get-tnf-logs:
 	@./openshift-clusters/scripts/get-tnf-logs.sh
 
@@ -117,5 +128,7 @@ help:
 	@echo "  patch-nodes          - Build resource-agents RPM and patch cluster nodes (default version: 4.11)"
 	@echo ""
 	@echo "Cluster Utilities:"
-	@echo "  get-tnf-logs         - Collect pacemaker and etcd logs from cluster nodes"
+	@echo "  ssh-node node=<0|1> [cmd=\"..\"] - SSH into cluster node"
+	@echo "                                    e.g. make ssh-node node=0 cmd=\"sudo pcs status\""
+	@echo "  get-tnf-logs                    - Collect pacemaker and etcd logs from cluster nodes"
 
diff --git a/deploy/openshift-clusters/scripts/ssh-node.sh b/deploy/openshift-clusters/scripts/ssh-node.sh
new file mode 100755
index 0000000..feb6c91
--- /dev/null
+++ b/deploy/openshift-clusters/scripts/ssh-node.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname "$0")
+DEPLOY_DIR="$(cd "${SCRIPT_DIR}/../.." && pwd)"
+INVENTORY_FILE="${DEPLOY_DIR}/openshift-clusters/inventory.ini"
+
+usage() {
+    echo "Usage: $0 <node> [command]"
+    echo ""
+    echo "SSH into a cluster node via the hypervisor jump host."
+    echo "If a command is provided, execute it and return."
+    echo ""
+    echo "Node can be specified as:"
+    echo "  master-0, master_0, node0, 0  -> first master node"
+    echo "  master-1, master_1, node1, 1  -> second master node"
+    echo ""
+    echo "Examples:"
+    echo "  $0 master-0              # Interactive SSH session"
+    echo "  $0 0 uptime              # Run 'uptime' on master-0"
+    echo "  $0 1 'pcs status'        # Run 'pcs status' on master-1"
+    exit 1
+}
+
+if [[ $# -lt 1 ]]; then
+    usage
+fi
+
+NODE_ARG="$1"
+shift
+
+# Check if inventory file exists
+if [[ ! -f "${INVENTORY_FILE}" ]]; then
+    echo "Error: Inventory file not found at ${INVENTORY_FILE}"
+    echo "Run 'make inventory' first."
+    exit 1
+fi
+
+# Normalize node argument to inventory name
+case "${NODE_ARG}" in
+    master-0|master_0|node0|0)
+        NODE_PATTERN="master_0"
+        ;;
+    master-1|master_1|node1|1)
+        NODE_PATTERN="master_1"
+        ;;
+    *)
+        echo "Error: Unknown node '${NODE_ARG}'"
+        usage
+        ;;
+esac
+
+# Extract node IP from inventory
+NODE_IP=$(grep -E "master_0|master_1" "${INVENTORY_FILE}" | grep "${NODE_PATTERN}" | grep -oP "ansible_host='\\K[^']+")
+
+if [[ -z "${NODE_IP}" ]]; then
+    echo "Error: Could not find ${NODE_PATTERN} in inventory"
+    echo "Make sure the cluster is deployed and inventory is updated."
+    exit 1
+fi
+
+# Extract hypervisor info from inventory
+HYPERVISOR=$(grep -E "^[^#]*@" "${INVENTORY_FILE}" | head -1 | awk '{print $1}')
+
+if [[ -z "${HYPERVISOR}" ]]; then
+    echo "Error: Could not find hypervisor in inventory"
+    exit 1
+fi
+
+# Common SSH options to avoid known_hosts issues after redeploys
+SSH_OPTS=(
+    -o StrictHostKeyChecking=no
+    -o UserKnownHostsFile=/dev/null
+    -o LogLevel=ERROR
+)
+
+# ProxyJump with same options for the jump host
+PROXY_CMD="ssh ${SSH_OPTS[*]} -W %h:%p ${HYPERVISOR}"
+
+if [[ $# -gt 0 ]]; then
+    # Run command and return
+    ssh "${SSH_OPTS[@]}" \
+        -o "ProxyCommand=${PROXY_CMD}" \
+        "core@${NODE_IP}" "$@"
+else
+    # Interactive session
+    echo "Connecting to ${NODE_PATTERN} (${NODE_IP}) via ${HYPERVISOR}..."
+    ssh "${SSH_OPTS[@]}" \
+        -o "ProxyCommand=${PROXY_CMD}" \
+        "core@${NODE_IP}"
+fi