diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-12 04:07:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 04:07:21 -0800 |
| commit | d00e5f4e224f281961c3f5975c27381f5e5d972d (patch) | |
| tree | 82f6fbd17a4f5a10689f9e7698042322600dbbfc /roles | |
| parent | c86e136cd2e6f30372c77fa2fd4ce13586e88bb9 (diff) | |
| parent | cf4ec9c8205e84288bf35f93e7f2f4190d2bf9a4 (diff) | |
| download | openshift-d00e5f4e224f281961c3f5975c27381f5e5d972d.tar.gz openshift-d00e5f4e224f281961c3f5975c27381f5e5d972d.tar.bz2 openshift-d00e5f4e224f281961c3f5975c27381f5e5d972d.tar.xz openshift-d00e5f4e224f281961c3f5975c27381f5e5d972d.zip | |
Merge pull request #6381 from bogdando/dns_hostname_prefixes
Automatic merge from submit-queue.
Allow 2 sets of hostnames for openstack provider
Support private/public hostnames suffixes for DNS records.
Real hostnames, Inventory variables, Nova servers and ansible
hostnames will ignore the custom suffixes. Those are only for
nsupdates sent to external DNS servers.
Related change: add openshift_openstack_public_dns_domain to
the role defaults to not rely on the group vars example only.
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Co-authored-by: Tomas Sedovic <tsedovic@redhat.com>
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_openstack/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_openstack/tasks/populate-dns.yml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_openstack/defaults/main.yml b/roles/openshift_openstack/defaults/main.yml index 929b76f54..65a647b8f 100644 --- a/roles/openshift_openstack/defaults/main.yml +++ b/roles/openshift_openstack/defaults/main.yml @@ -44,6 +44,9 @@ openshift_openstack_container_storage_setup: # populate-dns openshift_openstack_dns_records_add: [] +openshift_openstack_public_hostname_suffix: "" +openshift_openstack_private_hostname_suffix: "" +openshift_openstack_public_dns_domain: "example.com" openshift_openstack_full_dns_domain: "{{ (openshift_openstack_clusterid|trim == '') | ternary(openshift_openstack_public_dns_domain, openshift_openstack_clusterid + '.' + openshift_openstack_public_dns_domain) }}" openshift_openstack_app_subdomain: "apps" diff --git a/roles/openshift_openstack/tasks/populate-dns.yml b/roles/openshift_openstack/tasks/populate-dns.yml index eae4967f7..cf2ead5c3 100644 --- a/roles/openshift_openstack/tasks/populate-dns.yml +++ b/roles/openshift_openstack/tasks/populate-dns.yml @@ -1,7 +1,7 @@ --- - name: "Generate list of private A records" set_fact: - private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': hostvars[item]['ansible_hostname'], 'ip': hostvars[item]['private_v4'] } ] }}" + private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': hostvars[item]['ansible_hostname'] + openshift_openstack_private_hostname_suffix, 'ip': hostvars[item]['private_v4'] } ] }}" with_items: "{{ groups['cluster_hosts'] }}" - name: "Add wildcard records to the private A records for infrahosts" @@ -48,7 +48,7 @@ - name: "Generate list of public A records" set_fact: - public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': hostvars[item]['ansible_hostname'], 'ip': hostvars[item]['public_v4'] } ] }}" + public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': hostvars[item]['ansible_hostname'] + openshift_openstack_public_hostname_suffix, 'ip': hostvars[item]['public_v4'] } ] }}" with_items: "{{ groups['cluster_hosts'] }}" when: hostvars[item]['public_v4'] is defined |