Skip to content

Commit f966eed

Browse files
committed
fix: Update install config generator to use REGISTRY_URL instead of ACR_LOGIN_SERVER
- Change rhdp-cluster-define-disconnected.py to use REGISTRY_URL environment variable - Remove ACR certificate retrieval (bastion registry uses HTTP, no TLS) - Fixes KeyError: 'ACR_LOGIN_SERVER' in deploy-cluster.sh Step 2
1 parent 1bacb16 commit f966eed

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

rhdp-isolated/bastion/rhdp-cluster-define-disconnected.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def setup_install(
131131
try:
132132
GUID = os.environ["GUID"]
133133
RESOURCEGROUP = os.environ["RESOURCEGROUP"]
134-
ACR_LOGIN_SERVER = os.environ["ACR_LOGIN_SERVER"]
134+
REGISTRY_URL = os.environ.get("REGISTRY_URL", "10.0.1.4:5000")
135135
except KeyError as e:
136136
rprint(f"[red]Unable to get required environment variable: {e}[/red]")
137137
raise e
@@ -146,13 +146,9 @@ def setup_install(
146146
ssh_key = ssh_key_path.expanduser().read_text().strip()
147147
pull_secret = pull_secret_path.expanduser().read_text().strip()
148148

149-
# Get ACR certificate
150-
rprint("[info]Retrieving ACR certificate...[/info]")
151-
additional_trust_bundle = get_acr_certificate(ACR_LOGIN_SERVER)
152-
153-
if not additional_trust_bundle:
154-
rprint("[yellow]Warning: No ACR certificate retrieved. You may need to add it manually.[/yellow]")
155-
additional_trust_bundle = "# No certificate retrieved automatically"
149+
# Bastion registry uses HTTP (no TLS), so no certificate needed
150+
rprint("[info]Using bastion-hosted HTTP registry (no TLS certificate needed)[/info]")
151+
additional_trust_bundle = "# Bastion registry uses HTTP (no TLS)"
156152

157153
# Parse IDMS files to imageDigestSources
158154
cluster_resources_dir = pattern_dir / "cluster-resources"

0 commit comments

Comments
 (0)