summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2018-01-22 11:02:12 -0500
committerMichael Gugino <mgugino@redhat.com>2018-01-22 11:43:10 -0500
commit7b33ab6dad2f9775a4e206ec90bc10ce46ae02f6 (patch)
tree8648caf9b8d2b2cf86426dca1d365052e42ab43c /playbooks/common/openshift-cluster/upgrades
parent986b28f8eca1856559a44c4b73770a4eab4930f4 (diff)
downloadopenshift-7b33ab6dad2f9775a4e206ec90bc10ce46ae02f6.tar.gz
openshift-7b33ab6dad2f9775a4e206ec90bc10ce46ae02f6.tar.bz2
openshift-7b33ab6dad2f9775a4e206ec90bc10ce46ae02f6.tar.xz
openshift-7b33ab6dad2f9775a4e206ec90bc10ce46ae02f6.zip
Install base_packages earlier
Currently, openshift_facts requires pyyaml to be installed. This package is installed via init/base_packages.yml, which is currently called after init/facts.yml. This results in a situation where installs will fail due to missing python dependency. This commit splits init/facts.yml into two, and allows base_packages.yml to be run before the openshift_facts.py plugin is executed.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/init.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index 8ee83819e..ba783638d 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/playbooks/common/openshift-cluster/upgrades/init.yml
@@ -5,7 +5,8 @@
g_new_master_hosts: []
g_new_node_hosts: []
-- import_playbook: ../../../init/facts.yml
+- import_playbook: ../../../init/basic_facts.yml
+- import_playbook: ../../../init/cluster_facts.yml
- name: Ensure firewall is not switched during upgrade
hosts: "{{ l_upgrade_no_switch_firewall_hosts | default('oo_all_hosts') }}"