Skip to content

Commit 7d5248f

Browse files
committed
Merge Ceph configs into global.yaml after Ceph setup
bootstrap.sh reads global.yaml directly and does not source odf.sh, so quayBackendRGWConfiguration and odfExternalConfig must be in global.yaml for the validate and operators steps to work. Append both configs on the LZ side via a remote script to avoid shell quoting issues with the JSON content.
1 parent 4870c7b commit 7d5248f

1 file changed

Lines changed: 19 additions & 0 deletions

File tree

scripts/infrastructure/setup_ceph_on_lz.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,25 @@ fi
113113

114114
success "Config files verified on Landing Zone"
115115

116+
# Step 5: Merge Ceph configs into global.yaml so bootstrap steps can use them
117+
# bootstrap.sh reads global.yaml directly and does not source odf.sh
118+
info ""
119+
info "Step 5: Updating global.yaml with Ceph/ODF configuration..."
120+
GLOBAL_VARS="${LZ_ENCLAVE_DIR}/config/global.yaml"
121+
122+
# Append both configs on the LZ side to avoid shell quoting issues with JSON
123+
# RGW config for Quay S3 validation, ODF config for operator deployment
124+
# shellcheck disable=SC2086
125+
ssh $SSH_OPTS "$LZ_SSH" bash -s -- "${GLOBAL_VARS}" "${CEPH_CONFIG_DIR}" <<'REMOTE_SCRIPT'
126+
GLOBAL_VARS="$1"
127+
CEPH_CONFIG_DIR="$2"
128+
RGW_CONFIG=$(cat "${CEPH_CONFIG_DIR}/quay_backend_rgw_config.yaml")
129+
ODF_CONFIG=$(cat "${CEPH_CONFIG_DIR}/odf_external_config.json")
130+
printf '\nquayBackendRGWConfiguration: %s\n' "${RGW_CONFIG}" >> "${GLOBAL_VARS}"
131+
printf "odfExternalConfig: '%s'\n" "${ODF_CONFIG}" >> "${GLOBAL_VARS}"
132+
REMOTE_SCRIPT
133+
success "global.yaml updated with quayBackendRGWConfiguration and odfExternalConfig"
134+
116135
info ""
117136
info "========================================="
118137
info "Ceph Setup Complete"

0 commit comments

Comments
 (0)