diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-13 05:17:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 05:17:12 -0800 |
| commit | b0943498fd3da4e4bfd2885c02e7d0a75fde8696 (patch) | |
| tree | 965dcad0b82a743b87e00b33b923ca6209e21ae0 /playbooks/openstack/openshift-cluster | |
| parent | 47e428995d3fa8f14994b747e32862521bc9dc92 (diff) | |
| parent | abd62c5613d47a58ea3a5ef636eb79563d02b8f6 (diff) | |
| download | openshift-b0943498fd3da4e4bfd2885c02e7d0a75fde8696.tar.gz openshift-b0943498fd3da4e4bfd2885c02e7d0a75fde8696.tar.bz2 openshift-b0943498fd3da4e4bfd2885c02e7d0a75fde8696.tar.xz openshift-b0943498fd3da4e4bfd2885c02e7d0a75fde8696.zip | |
Merge pull request #6951 from tomassedovic/fix-openstack-master
Automatic merge from submit-queue.
Fix OpenStack playbooks
This shuffles a few playbooks around to fix the ordering between various
facts and prerequisites.
Diffstat (limited to 'playbooks/openstack/openshift-cluster')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/install.yml | 3 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/provision.yml | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/playbooks/openstack/openshift-cluster/install.yml b/playbooks/openstack/openshift-cluster/install.yml index 2ab7d14a0..cb6bf4d11 100644 --- a/playbooks/openstack/openshift-cluster/install.yml +++ b/playbooks/openstack/openshift-cluster/install.yml @@ -8,8 +8,7 @@ # values here. We do it in the OSEv3 group vars. Do we need to add # some logic here? -- name: run the cluster deploy - import_playbook: ../../prerequisites.yml +- import_playbook: ../../prerequisites.yml - name: run the cluster deploy import_playbook: ../../deploy_cluster.yml diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml index 73c1926a0..44e3d00c0 100644 --- a/playbooks/openstack/openshift-cluster/provision.yml +++ b/playbooks/openstack/openshift-cluster/provision.yml @@ -26,9 +26,6 @@ - name: Gather facts for the new nodes setup: -- import_playbook: ../../init/basic_facts.yml -- import_playbook: ../../init/cluster_facts.yml - # TODO(shadower): consider splitting this up so people can stop here # and configure their DNS if they have to. @@ -43,7 +40,10 @@ - openshift_openstack_external_nsupdate_keys is defined - openshift_openstack_external_nsupdate_keys.private is defined or openshift_openstack_external_nsupdate_keys.public is defined -- name: Prepare the Nodes in the cluster for installation + +- import_playbook: ../../init/basic_facts.yml + +- name: Optionally subscribe the RHEL nodes hosts: oo_all_hosts become: yes gather_facts: yes @@ -63,6 +63,12 @@ - ansible_distribution == "RedHat" - rh_subscribed is defined + +- name: Prepare the Nodes in the cluster for installation + hosts: oo_all_hosts + become: yes + gather_facts: yes + tasks: - name: Install dependencies import_role: name: openshift_openstack |