diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-22 13:17:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 13:17:19 -0800 |
| commit | b79b497a9a443140f23cd3b8ef5c19d1893bce95 (patch) | |
| tree | 0ae7a57c61f282c7eaede25a0f7391b4095c8691 /playbooks/common | |
| parent | f34f986bf3ab0523ce6ec1145b4a57a51b9ab3fa (diff) | |
| parent | 7b33ab6dad2f9775a4e206ec90bc10ce46ae02f6 (diff) | |
| download | openshift-b79b497a9a443140f23cd3b8ef5c19d1893bce95.tar.gz openshift-b79b497a9a443140f23cd3b8ef5c19d1893bce95.tar.bz2 openshift-b79b497a9a443140f23cd3b8ef5c19d1893bce95.tar.xz openshift-b79b497a9a443140f23cd3b8ef5c19d1893bce95.zip | |
Merge pull request #6814 from mgugino-upstream-stage/move-up-base-packages
Automatic merge from submit-queue.
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')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/init.yml | 3 |
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') }}" |