@@ -19,8 +19,6 @@ parameters:
19
19
- name : RELEASE_IMAGE_LATEST
20
20
required : true
21
21
- name : BASE_DOMAIN
22
- value : origin-ci-int-aws.dev.rhcloud.com
23
- required : true
24
22
- name : BUILD_ID
25
23
required : false
26
24
@@ -402,10 +400,12 @@ objects:
402
400
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")
403
401
404
402
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
403
+ base_domain="${BASE_DOMAIN:-origin-ci-int-aws.dev.rhcloud.com}"
404
+ echo "FIXME: Base domain: '${base_domain}"
405
405
MACHINE_CIDR=10.0.0.0/16
406
406
cat > /tmp/artifacts/installer/install-config.yaml << EOF
407
407
apiVersion: v1
408
- baseDomain: ${BASE_DOMAIN }
408
+ baseDomain: ${base_domain }
409
409
metadata:
410
410
name: ${CLUSTER_NAME}
411
411
controlPlane:
@@ -442,12 +442,13 @@ objects:
442
442
openshift-install --dir=/tmp/artifacts/installer create manifests
443
443
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machinesets-*.yaml
444
444
elif [[ "${CLUSTER_TYPE}" == "vsphere" ]]; then
445
+ base_domain="${BASE_DOMAIN:-origin-ci-int-aws.dev.rhcloud.com}"
445
446
# Get user and password from TFVARS_PATH
446
447
export VSPHERE_USER=$(grep -oP 'vsphere_user="\K[^"]+' ${TFVARS_PATH})
447
448
export VSPHERE_PASSWORD=$(grep -oP 'vsphere_password="\K[^"]+' ${TFVARS_PATH})
448
449
cat > /tmp/artifacts/installer/install-config.yaml << EOF
449
450
apiVersion: v1beta4
450
- baseDomain: ${BASE_DOMAIN }
451
+ baseDomain: ${base_domain }
451
452
metadata:
452
453
name: ${CLUSTER_NAME}
453
454
networking:
@@ -507,8 +508,8 @@ objects:
507
508
IGNITION_CA="$(jq '.ignition.security.tls.certificateAuthorities[0].source' /tmp/artifacts/installer/master.ign)" # explicitly keeping wrapping quotes
508
509
509
510
HOSTED_ZONE="$(aws route53 list-hosted-zones-by-name \
510
- --dns-name "${BASE_DOMAIN }" \
511
- --query "HostedZones[? Config.PrivateZone != \`true\` && Name == \`${BASE_DOMAIN }.\`].Id" \
511
+ --dns-name "${base_domain }" \
512
+ --query "HostedZones[? Config.PrivateZone != \`true\` && Name == \`${base_domain }.\`].Id" \
512
513
--output text)"
513
514
514
515
aws cloudformation create-stack --stack-name "${CLUSTER_NAME}-vpc" \
@@ -539,7 +540,7 @@ objects:
539
540
ParameterKey=ClusterName,ParameterValue="${CLUSTER_NAME}" \
540
541
ParameterKey=InfrastructureName,ParameterValue="${INFRA_ID}" \
541
542
ParameterKey=HostedZoneId,ParameterValue="${HOSTED_ZONE}" \
542
- ParameterKey=HostedZoneName,ParameterValue="${BASE_DOMAIN }" \
543
+ ParameterKey=HostedZoneName,ParameterValue="${base_domain }" \
543
544
ParameterKey=VpcId,ParameterValue="${VPC_ID}" \
544
545
ParameterKey=PrivateSubnets,ParameterValue="${PRIVATE_SUBNETS}" \
545
546
ParameterKey=PublicSubnets,ParameterValue="${PUBLIC_SUBNETS}" &
@@ -612,12 +613,12 @@ objects:
612
613
ParameterKey=InfrastructureName,ParameterValue="${INFRA_ID}" \
613
614
ParameterKey=RhcosAmi,ParameterValue="${RHCOS_AMI}" \
614
615
ParameterKey=PrivateHostedZoneId,ParameterValue="${PRIVATE_HOSTED_ZONE}" \
615
- ParameterKey=PrivateHostedZoneName,ParameterValue="${CLUSTER_NAME}.${BASE_DOMAIN }" \
616
+ ParameterKey=PrivateHostedZoneName,ParameterValue="${CLUSTER_NAME}.${base_domain }" \
616
617
ParameterKey=Master0Subnet,ParameterValue="${PRIVATE_SUBNET_0}" \
617
618
ParameterKey=Master1Subnet,ParameterValue="${PRIVATE_SUBNET_1}" \
618
619
ParameterKey=Master2Subnet,ParameterValue="${PRIVATE_SUBNET_2}" \
619
620
ParameterKey=MasterSecurityGroupId,ParameterValue="${MASTER_SECURITY_GROUP}" \
620
- ParameterKey=IgnitionLocation,ParameterValue="https://api-int.${CLUSTER_NAME}.${BASE_DOMAIN }:22623/config/master" \
621
+ ParameterKey=IgnitionLocation,ParameterValue="https://api-int.${CLUSTER_NAME}.${base_domain }:22623/config/master" \
621
622
ParameterKey=CertificateAuthorities,ParameterValue="${IGNITION_CA}" \
622
623
ParameterKey=MasterInstanceProfileName,ParameterValue="${MASTER_INSTANCE_PROFILE}" \
623
624
ParameterKey=RegisterNlbIpTargetsLambdaArn,ParameterValue="${NLB_IP_TARGETS_LAMBDA}" \
@@ -648,7 +649,7 @@ objects:
648
649
ParameterKey=RhcosAmi,ParameterValue="${RHCOS_AMI}" \
649
650
ParameterKey=Subnet,ParameterValue="${!SUBNET}" \
650
651
ParameterKey=WorkerSecurityGroupId,ParameterValue="${WORKER_SECURITY_GROUP}" \
651
- ParameterKey=IgnitionLocation,ParameterValue="https://api-int.${CLUSTER_NAME}.${BASE_DOMAIN }:22623/config/worker" \
652
+ ParameterKey=IgnitionLocation,ParameterValue="https://api-int.${CLUSTER_NAME}.${base_domain }:22623/config/worker" \
652
653
ParameterKey=CertificateAuthorities,ParameterValue="${IGNITION_CA}" \
653
654
ParameterKey=WorkerInstanceType,ParameterValue=m4.xlarge \
654
655
ParameterKey=WorkerInstanceProfileName,ParameterValue="${WORKER_INSTANCE_PROFILE}" &
@@ -690,9 +691,9 @@ objects:
690
691
691
692
cluster_id = "${CLUSTER_NAME}"
692
693
693
- base_domain = "${BASE_DOMAIN }"
694
+ base_domain = "${base_domain }"
694
695
695
- cluster_domain = "${CLUSTER_NAME}.${BASE_DOMAIN }"
696
+ cluster_domain = "${CLUSTER_NAME}.${base_domain }"
696
697
697
698
bootstrap_ignition_url = "${BOOTSTRAP_URI}"
698
699
0 commit comments