Merge pull request #15135 from samvarankashyap/CVP-1588

[CVP-1588] Set default baseDomain variable inside for ipi stage in step-registry
openshift · Jan 21, 2021 · 0385584 · 0385584
2 parents afaf4ef + b5d5eb1
commit 0385584
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
@@ -27,7 +27,7 @@ ZONES_STR+=" ]"
 echo "AWS region: ${REGION} (zones: ${ZONES_STR})"
 
 cat >> "${CONFIG}" << EOF
-baseDomain: origin-ci-int-aws.dev.rhcloud.com
+baseDomain: ${BASE_DOMAIN}
 controlPlane:
   name: master
   platform:

diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml
@@ -18,5 +18,9 @@ ref:
       default: "2"
       documentation: |-
         The number of AZs to present in the cluster. Accepted values are 1 and 2.
+    - name: BASE_DOMAIN
+      default: "origin-ci-int-aws.dev.rhcloud.com"
+      documentation: |-
+        A fully-qualified domain or subdomain name. The base domain of the cloud provider is used for setting baseDomain variable of the install configuration of the cluster.
   documentation: |-
     The IPI AWS configure step generates the AWS-specific install-config.yaml contents based on the cluster profile and optional input files.