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/init/main.yml | |
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/init/main.yml')
-rw-r--r-- | playbooks/init/main.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/playbooks/init/main.yml b/playbooks/init/main.yml index 8a3f4682d..9886691e0 100644 --- a/playbooks/init/main.yml +++ b/playbooks/init/main.yml @@ -1,4 +1,7 @@ --- +# skip_verison and l_install_base_packages are passed in via prerequistes.yml. +# skip_sanity_checks is passed in via openshift-node/private/image_prep.yml + - name: Initialization Checkpoint Start hosts: all gather_facts: false @@ -15,7 +18,13 @@ - import_playbook: evaluate_groups.yml -- import_playbook: facts.yml +- import_playbook: basic_facts.yml + +# base_packages needs to be setup for openshift_facts.py to run correctly. +- import_playbook: base_packages.yml + when: l_install_base_packages | default(False) | bool + +- import_playbook: cluster_facts.yml - import_playbook: version.yml when: not (skip_verison | default(False)) |