From 1893d3e97ceb1197593de69d6189fc3465677fad Mon Sep 17 00:00:00 2001 From: Bob Fournier Date: Thu, 4 Jun 2026 21:08:07 -0400 Subject: [PATCH] NO-ISSUE: Fix warning with wrap_if_ipv6 Include network.sh so that wrap_if_ipv6 is defined properly. --- agent/common.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/agent/common.sh b/agent/common.sh index a0421a933..767379839 100644 --- a/agent/common.sh +++ b/agent/common.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -euxo pipefail +source "${SCRIPTDIR}/network.sh" + export AGENT_STATIC_IP_NODE0_ONLY=${AGENT_STATIC_IP_NODE0_ONLY:-"false"} export AGENT_NMSTATE_DHCP=${AGENT_NMSTATE_DHCP:-"false"} @@ -49,10 +51,6 @@ export EXTRA_MANIFESTS_PATH="${OCP_DIR}/openshift" # 3. ISCSI, to contain the iPXE file needed for iSCSI booting export BOOT_SERVER_DIR=${WORKING_DIR}/boot-artifacts export PXE_BOOT_FILE=agent.$(uname -m).ipxe -# FIXME: agent/common.sh is sourced without network.sh -# wrap_if_ipv6 and PROVISIONING_HOST_EXTERNAL_IP are undefined -# errors masked by export which returns true -# shellcheck disable=SC2155,SC2086 export BOOT_SERVER_URL=http://$(wrap_if_ipv6 ${PROVISIONING_HOST_EXTERNAL_IP:-}):${AGENT_BOOT_SERVER_PORT} # Configure the instances for PXE booting