summaryrefslogtreecommitdiffstats
path: root/roles/openshift_openstack/tasks/check-prerequisites.yml
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-12-04 10:38:44 +0100
committerBogdan Dobrelya <bdobreli@redhat.com>2017-12-05 16:29:59 +0100
commitf8106699eb9157797f27157b62aef83cacb02791 (patch)
treeed12dedd9a07b99e3b8664ba9c0219595658e418 /roles/openshift_openstack/tasks/check-prerequisites.yml
parent40ccc162de50107c6b1db06ca0c96aa949698f9f (diff)
downloadopenshift-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/check-prerequisites.yml')
-rw-r--r--roles/openshift_openstack/tasks/check-prerequisites.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_openstack/tasks/check-prerequisites.yml b/roles/openshift_openstack/tasks/check-prerequisites.yml
index 57c7238d1..0ef60459f 100644
--- a/roles/openshift_openstack/tasks/check-prerequisites.yml
+++ b/roles/openshift_openstack/tasks/check-prerequisites.yml
@@ -32,10 +32,12 @@
command: python -c "import dns"
ignore_errors: yes
register: pythondns_result
+ when: openshift_openstack_external_nsupdate_keys is defined
- name: Check if python-dns is installed
assert:
that: 'pythondns_result.rc == 0'
msg: "Python module python-dns is not installed"
+ when: openshift_openstack_external_nsupdate_keys is defined
# Check jinja2
- name: Try to import jinja2 module
@@ -92,7 +94,6 @@
- "{{ openshift_openstack_node_image }}"
- "{{ openshift_openstack_lb_image }}"
- "{{ openshift_openstack_etcd_image }}"
- - "{{ openshift_openstack_dns_image }}"
# Check that custom flavors are available
- include: custom_flavor_check.yaml
@@ -102,4 +103,3 @@
- "{{ openshift_openstack_node_flavor }}"
- "{{ openshift_openstack_lb_flavor }}"
- "{{ openshift_openstack_etcd_flavor }}"
- - "{{ openshift_openstack_dns_flavor }}"