diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2018-01-31 14:42:58 +0100 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2018-02-12 11:17:02 +0100 |
| commit | d9c87eaa322c3422d679bcd36422a613278f6345 (patch) | |
| tree | 76b43596dd18fad4067ac7ae21c13e21d6f78a69 | |
| parent | f18cfa7897d771cb973b9aa28a90bc3575b56f58 (diff) | |
| download | openshift-d9c87eaa322c3422d679bcd36422a613278f6345.tar.gz openshift-d9c87eaa322c3422d679bcd36422a613278f6345.tar.bz2 openshift-d9c87eaa322c3422d679bcd36422a613278f6345.tar.xz openshift-d9c87eaa322c3422d679bcd36422a613278f6345.zip | |
Fix OpenStack playbooks
This shuffles a few playbooks around to fix the ordering between various
facts and prerequisites.
| -rw-r--r-- | playbooks/openstack/openshift-cluster/install.yml | 4 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/provision.yml | 14 | ||||
| -rw-r--r-- | roles/openshift_openstack/defaults/main.yml | 11 |
3 files changed, 17 insertions, 12 deletions
diff --git a/playbooks/openstack/openshift-cluster/install.yml b/playbooks/openstack/openshift-cluster/install.yml index 2ab7d14a0..0c70b5ce2 100644 --- a/playbooks/openstack/openshift-cluster/install.yml +++ b/playbooks/openstack/openshift-cluster/install.yml @@ -8,8 +8,8 @@ # 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 +- import_playbook: ../../init/cluster_facts.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 diff --git a/roles/openshift_openstack/defaults/main.yml b/roles/openshift_openstack/defaults/main.yml index 2bdb81632..30c49d517 100644 --- a/roles/openshift_openstack/defaults/main.yml +++ b/roles/openshift_openstack/defaults/main.yml @@ -21,16 +21,15 @@ openshift_openstack_cluster_node_labels: openshift_openstack_install_debug_packages: false openshift_openstack_required_packages: - - docker - NetworkManager - - wget - - git - - net-tools - - bind-utils - - bridge-utils openshift_openstack_debug_packages: - bash-completion + - bind-utils + - bridge-utils + - git + - net-tools - vim-enhanced + - wget # container-storage-setup openshift_openstack_container_storage_setup: |