diff options
author | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-01 16:43:13 +0100 |
---|---|---|
committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-07 14:35:47 +1100 |
commit | 79f29bc825286c4f69073827a5b6d71f71f47c91 (patch) | |
tree | db91c04c153aef1419871a7843e8d415c49e0a60 /playbooks/openstack/openshift-cluster | |
parent | 23674d565f2801d88060bd0443ec384fbdcdad59 (diff) | |
download | openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.gz openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.bz2 openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.xz openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.zip |
Add the DNS updates and rename the openstack vars
Most of the vars in `roles/openshift_openstack/defaults/main.yml` are
now prefixed with `openstack_`.
Diffstat (limited to 'playbooks/openstack/openshift-cluster')
-rw-r--r-- | playbooks/openstack/openshift-cluster/provision.yml | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml index ed44d4a32..b1dff1870 100644 --- a/playbooks/openstack/openshift-cluster/provision.yml +++ b/playbooks/openstack/openshift-cluster/provision.yml @@ -7,15 +7,17 @@ name: openshift_openstack tasks_from: provision.yml -# NOTE(shadower): the (internal) DNS must be functional at this point!! -# That will have happened in provision.yml if nsupdate was configured. -# TODO(shadower): consider splitting this up so people can stop here -# and configure their DNS if they have to. +# NOTE(shadower): Bring in the host groups: +- name: normalize groups + include: ../../byo/openshift-cluster/initialize_groups.yml +- name: evaluate groups + include: ../../common/openshift-cluster/evaluate_groups.yml -- name: Prepare the Nodes in the cluster for installation + +- name: Wait for the nodes and gather their facts hosts: oo_all_hosts - become: true + become: yes # NOTE: The nodes may not be up yet, don't gather facts here. # They'll be collected after `wait_for_connection`. gather_facts: no @@ -26,6 +28,28 @@ - name: Gather facts for the new nodes setup: + +# NOTE(shadower): the (internal) DNS must be functional at this point!! +# That will have happened in provision.yml if nsupdate was configured. + +# TODO(shadower): consider splitting this up so people can stop here +# and configure their DNS if they have to. +- name: Populate the DNS entries + hosts: localhost + tasks: + - name: Populate DNS entries + include_role: + name: openshift_openstack + tasks_from: populate-dns.yml + when: + - external_nsupdate_keys is defined + - external_nsupdate_keys.private is defined or external_nsupdate_keys.public is defined + +- name: Prepare the Nodes in the cluster for installation + hosts: oo_all_hosts + become: yes + gather_facts: yes + tasks: - name: Install dependencies include_role: name: openshift_openstack |