Skip to content

Commit ceacc18

Browse files
fonta-rhclaude
andcommitted
fix: remove obsolete SKIP_CONFIG_SYNC from doctor.sh
config-folder's sync refactor moved the sync call from common.sh module scope to a Makefile prerequisite. SKIP_CONFIG_SYNC is now a no-op — remove it. Cluster-type sync prerequisites are scoped to the else branch so 'make doctor <type>' doesn't trigger them. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 8cb554e commit ceacc18

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

deploy/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ inventory:
7777

7878
# Sync config/ files to canonical locations before targets that consume them.
7979
create init redeploy-cluster \
80-
fencing-ipi fencing-agent arbiter-ipi arbiter-agent arbiter-kcli fencing-kcli sno-ipi sno-agent fencing-assisted \
8180
baremetal-adopt baremetal-fencing-agent: sync-config
8281

8382
sync-config:
@@ -91,6 +90,7 @@ ifeq (doctor,$(firstword $(MAKECMDGOALS)))
9190
$(VALID_CLUSTER_TYPES):
9291
@:
9392
else
93+
$(VALID_CLUSTER_TYPES): sync-config
9494
fencing-ipi:
9595
@./openshift-clusters/scripts/deploy-cluster.sh --topology fencing --method ipi
9696

@@ -163,7 +163,7 @@ help:
163163
@echo " keep-instance - Tag instance with keep-N retention (default: 2, max: 5)"
164164
@echo " Usage: make keep-instance or make keep-instance DAYS=5"
165165
@echo " sync-config - Sync files from config/ to their canonical locations"
166-
@echo " (runs automatically before deploy and lifecycle targets)"
166+
@echo " (runs automatically before deploy and cluster targets)"
167167
@echo ""
168168
@echo "OpenShift Cluster Deployment:"
169169
@echo " fencing-ipi - Deploy fencing IPI cluster (non-interactive)"

deploy/openshift-clusters/scripts/doctor.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ REPO_ROOT="$(cd "${DEPLOY_DIR}/.." && pwd)"
1919
CONFIG_DIR="${REPO_ROOT}/config"
2020
INSTANCE_ENV="${DEPLOY_DIR}/aws-hypervisor/instance.env"
2121

22-
# SKIP_CONFIG_SYNC: doctor is read-only — suppress the automatic config sync.
23-
# SKIP_INSTANCE_ENV_WARNING: doctor has its own instance.env section with
24-
# better guidance, so suppress the generic warning from common.sh.
25-
export SKIP_CONFIG_SYNC=1
22+
# Suppress the generic instance.env warning from common.sh — doctor has its
23+
# own instance.env section with better guidance.
2624
export SKIP_INSTANCE_ENV_WARNING=1
2725
# shellcheck source=/dev/null
2826
source "${DEPLOY_DIR}/common.sh"

0 commit comments

Comments
 (0)