Skip to content

Commit 09e54ac

Browse files
committed
fix: Remove ACR output retrieval from provision.sh
- Replace ACR_LOGIN_SERVER/ACR_NAME outputs with REGISTRY_URL - Update infrastructure-outputs.env to use bastion registry - Fix provision.sh completion message to show registry instead of ACR
1 parent 7789eef commit 09e54ac

1 file changed

Lines changed: 18 additions & 11 deletions

File tree

rhdp-isolated/provision.sh

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ terraform apply tfplan
143143
log_info "Retrieving outputs..."
144144
BASTION_IP=$(terraform output -raw bastion_public_ip)
145145
BASTION_USER=$(terraform output -raw bastion_admin_username)
146-
ACR_LOGIN_SERVER=$(terraform output -raw acr_login_server)
147-
ACR_NAME=$(terraform output -raw acr_name)
146+
REGISTRY_URL=$(terraform output -raw bastion_registry_url)
148147

149148
# Save outputs to file for later use
150149
OUTPUTS_FILE="${SCRIPT_DIR}/infrastructure-outputs.env"
@@ -156,19 +155,14 @@ cat > "${OUTPUTS_FILE}" <<EOF
156155
157156
export BASTION_IP="${BASTION_IP}"
158157
export BASTION_USER="${BASTION_USER}"
159-
export ACR_LOGIN_SERVER="${ACR_LOGIN_SERVER}"
160-
export ACR_NAME="${ACR_NAME}"
158+
export REGISTRY_URL="${REGISTRY_URL}"
161159
export AZURE_REGION="${AZURE_REGION}"
162160
export GUID="${GUID}"
163161
export RESOURCEGROUP="${RESOURCEGROUP}"
164162
export CLIENT_ID="${CLIENT_ID}"
165163
export PASSWORD="${PASSWORD}"
166164
export TENANT="${TENANT}"
167165
export SUBSCRIPTION="${SUBSCRIPTION}"
168-
169-
# Get ACR credentials (these are sensitive)
170-
export ACR_USERNAME=$(terraform output -raw acr_admin_username)
171-
export ACR_PASSWORD=$(terraform output -raw acr_admin_password)
172166
EOF
173167

174168
chmod 600 "${OUTPUTS_FILE}"
@@ -179,14 +173,27 @@ log_info "Infrastructure provisioning complete!"
179173
log_info "=========================================="
180174
log_info ""
181175
log_info "Bastion Host: ${BASTION_USER}@${BASTION_IP}"
182-
log_info "ACR: ${ACR_LOGIN_SERVER}"
176+
log_info "Container Registry: ${REGISTRY_URL} (bastion-hosted)"
177+
log_info ""
178+
log_info "Cloud-init configured on bastion:"
179+
log_info " ✓ Container registry (port 5000)"
180+
log_info " ✓ Git HTTP server (port 8080)"
181+
log_info " ✓ Ignition HTTP server (port 8081)"
182+
log_info " ✓ Azure credentials, SSH key, pattern repo"
183183
log_info ""
184184
log_info "Next steps:"
185-
log_info "1. Configure the bastion host:"
185+
log_info "1. Verify bastion configuration (optional):"
186186
log_info " ./configure-bastion.sh"
187187
log_info ""
188-
log_info "2. SSH to bastion (credentials saved in ${OUTPUTS_FILE}):"
188+
log_info "2. Copy pull secret to bastion:"
189+
log_info " scp ~/pull-secret.json ${BASTION_USER}@${BASTION_IP}:~/"
190+
log_info ""
191+
log_info "3. SSH to bastion and deploy:"
189192
log_info " ssh ${BASTION_USER}@${BASTION_IP}"
193+
log_info " cd ~/coco-pattern"
194+
log_info " ./rhdp-isolated/bastion/deploy-cluster.sh ${AZURE_REGION}"
195+
log_info ""
196+
log_info "Note: deploy-cluster.sh automatically runs mirroring if needed (2-4 hours first time)"
190197
log_info ""
191198
log_info "Connection details saved to: ${OUTPUTS_FILE}"
192199
log_info "To use these variables: source ${OUTPUTS_FILE}"

0 commit comments

Comments
 (0)