diff options
author | Clayton Coleman <ccoleman@redhat.com> | 2017-10-01 23:15:45 -0400 |
---|---|---|
committer | Clayton Coleman <ccoleman@redhat.com> | 2017-10-01 23:24:20 -0400 |
commit | 287993d2c86b16836cd7796ad2d9e618d5005aa1 (patch) | |
tree | cd30ed92ea93b44ba6ab56ead6e0f6e1f5e2386d /roles/openshift_gcp/templates/dns.j2.sh | |
parent | a9271345b868ca4e9f858d87dd89a31e324ec858 (diff) | |
download | openshift-287993d2c86b16836cd7796ad2d9e618d5005aa1.tar.gz openshift-287993d2c86b16836cd7796ad2d9e618d5005aa1.tar.bz2 openshift-287993d2c86b16836cd7796ad2d9e618d5005aa1.tar.xz openshift-287993d2c86b16836cd7796ad2d9e618d5005aa1.zip |
Update to the openshift_aws style scheme for variables
Corresponding changes will be made to the other repositories after
merge.
Diffstat (limited to 'roles/openshift_gcp/templates/dns.j2.sh')
-rw-r--r-- | roles/openshift_gcp/templates/dns.j2.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_gcp/templates/dns.j2.sh b/roles/openshift_gcp/templates/dns.j2.sh index eacf84b4d..a7475aaf5 100644 --- a/roles/openshift_gcp/templates/dns.j2.sh +++ b/roles/openshift_gcp/templates/dns.j2.sh @@ -2,12 +2,12 @@ set -euo pipefail -dns_zone="{{ dns_managed_zone | default(provision_prefix + 'managed-zone') }}" +dns_zone="{{ dns_managed_zone | default(openshift_gcp_prefix + 'managed-zone') }}" # Check the DNS managed zone in Google Cloud DNS, create it if it doesn't exist -if ! gcloud --project "{{ gce_project_id }}" dns managed-zones describe "${dns_zone}" &>/dev/null; then - gcloud --project "{{ gce_project_id }}" dns managed-zones create "${dns_zone}" --dns-name "{{ public_hosted_zone }}" --description "{{ public_hosted_zone }} domain" >/dev/null +if ! gcloud --project "{{ openshift_gcp_project }}" dns managed-zones describe "${dns_zone}" &>/dev/null; then + gcloud --project "{{ openshift_gcp_project }}" dns managed-zones create "${dns_zone}" --dns-name "{{ public_hosted_zone }}" --description "{{ public_hosted_zone }} domain" >/dev/null fi # Always output the expected nameservers as a comma delimited list -gcloud --project "{{ gce_project_id }}" dns managed-zones describe "${dns_zone}" --format='value(nameServers)' | tr ';' ',' +gcloud --project "{{ openshift_gcp_project }}" dns managed-zones describe "${dns_zone}" --format='value(nameServers)' | tr ';' ',' |