From cf4ec9c8205e84288bf35f93e7f2f4190d2bf9a4 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Thu, 7 Dec 2017 12:42:18 +0100 Subject: 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 Co-authored-by: Tomas Sedovic --- roles/openshift_openstack/tasks/populate-dns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_openstack/tasks') 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 -- cgit v1.2.3