diff options
| author | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-12-04 10:38:44 +0100 |
|---|---|---|
| committer | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-12-05 16:29:59 +0100 |
| commit | f8106699eb9157797f27157b62aef83cacb02791 (patch) | |
| tree | ed12dedd9a07b99e3b8664ba9c0219595658e418 /roles/openshift_openstack/tasks/populate-dns.yml | |
| parent | 40ccc162de50107c6b1db06ca0c96aa949698f9f (diff) | |
| download | openshift-f8106699eb9157797f27157b62aef83cacb02791.tar.gz openshift-f8106699eb9157797f27157b62aef83cacb02791.tar.bz2 openshift-f8106699eb9157797f27157b62aef83cacb02791.tar.xz openshift-f8106699eb9157797f27157b62aef83cacb02791.zip | |
Fix and cleanup not required dns bits
* Do not manage hostnames for openstack cloud provider,
let cloud-init to do its job.
* Make python-dns / dnspython dependency check conditional.
* Drop not used dns node flavor and image.
* Do not manage dns nodes and sec groups in heat stacks.
* Keep supporting dynamic updates for private DNS records, yet only
limited to an external DNS managed elsewhere (not deployed by
the openshift_openstack provider). So users may still benefit from
this feature, sending nsupdates to private and public servers as
they want it.
* Fix openstack default for external nsupdate keys. It should be
undefined by default as the dns-populate logic is based on that.
* Fix dns records generation for openstack provider's populate-dns
* Update docs
Diffstat (limited to 'roles/openshift_openstack/tasks/populate-dns.yml')
| -rw-r--r-- | roles/openshift_openstack/tasks/populate-dns.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/roles/openshift_openstack/tasks/populate-dns.yml b/roles/openshift_openstack/tasks/populate-dns.yml index b5c4da532..eae4967f7 100644 --- a/roles/openshift_openstack/tasks/populate-dns.yml +++ b/roles/openshift_openstack/tasks/populate-dns.yml @@ -30,7 +30,6 @@ nsupdate_key_algorithm_private: "{{ openshift_openstack_external_nsupdate_keys['private']['key_algorithm'] }}" nsupdate_private_key_name: "{{ openshift_openstack_external_nsupdate_keys['private']['key_name']|default('private-' + openshift_openstack_full_dns_domain) }}" when: - - openshift_openstack_external_nsupdate_keys is defined - openshift_openstack_external_nsupdate_keys['private'] is defined @@ -44,6 +43,8 @@ key_secret: "{{ nsupdate_key_secret_private }}" key_algorithm: "{{ nsupdate_key_algorithm_private | lower }}" entries: "{{ private_records }}" + when: + - openshift_openstack_external_nsupdate_keys['private'] is defined - name: "Generate list of public A records" set_fact: @@ -78,7 +79,6 @@ nsupdate_key_algorithm_public: "{{ openshift_openstack_external_nsupdate_keys['public']['key_algorithm'] }}" nsupdate_public_key_name: "{{ openshift_openstack_external_nsupdate_keys['public']['key_name']|default('public-' + openshift_openstack_full_dns_domain) }}" when: - - openshift_openstack_external_nsupdate_keys is defined - openshift_openstack_external_nsupdate_keys['public'] is defined - name: "Generate the public Add section for DNS" @@ -91,11 +91,13 @@ key_secret: "{{ nsupdate_key_secret_public }}" key_algorithm: "{{ nsupdate_key_algorithm_public | lower }}" entries: "{{ public_records }}" + when: + - openshift_openstack_external_nsupdate_keys['public'] is defined - name: "Generate the final openshift_openstack_dns_records_add" set_fact: - openshift_openstack_dns_records_add: "{{ private_named_records + public_named_records }}" + openshift_openstack_dns_records_add: "{{ private_named_records|default([]) + public_named_records|default([]) }}" - name: "Add DNS A records" @@ -111,7 +113,7 @@ # TODO(shadower): add a cleanup playbook that removes these records, too! state: present with_subelements: - - "{{ openshift_openstack_dns_records_add | default({}) }}" + - "{{ openshift_openstack_dns_records_add | default([]) }}" - entries register: nsupdate_add_result until: nsupdate_add_result|succeeded |