diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-13 12:22:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 12:22:50 -0800 |
| commit | 39a8e54ff578f0ce5b1d7eec874b4172331bf4a3 (patch) | |
| tree | e1bc88232caf0f04d0e227cf693607a56872353d | |
| parent | b1cca03835322c1fb325834112b4a002229dc00e (diff) | |
| parent | cf298e1e9af2e8a3542607f6905d8faa59718c91 (diff) | |
| download | openshift-39a8e54ff578f0ce5b1d7eec874b4172331bf4a3.tar.gz openshift-39a8e54ff578f0ce5b1d7eec874b4172331bf4a3.tar.bz2 openshift-39a8e54ff578f0ce5b1d7eec874b4172331bf4a3.tar.xz openshift-39a8e54ff578f0ce5b1d7eec874b4172331bf4a3.zip | |
Merge pull request #7130 from kwoodson/preinstall_rpms
Automatic merge from submit-queue.
Move installation of packages before container_runtime to ensure bind mounts are avaialable.
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/bootstrap.yml | 10 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/install_rpms.yml | 9 |
3 files changed, 13 insertions, 8 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 64ab07bb5..9f887891b 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -112,7 +112,7 @@ l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_contain openshift_image_tag: '' default_r_openshift_node_image_prep_packages: -#- "{{ openshift_service_type }}-master" +- "{{ openshift_service_type }}-master" - "{{ openshift_service_type }}-node" - "{{ openshift_service_type }}-docker-excluder" - "{{ openshift_service_type }}-sdn-ovs" diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml index f9f042eeb..4abd060c4 100644 --- a/roles/openshift_node/tasks/bootstrap.yml +++ b/roles/openshift_node/tasks/bootstrap.yml @@ -1,11 +1,7 @@ --- -- name: install needed rpm(s) - package: - name: "{{ item }}" - state: present - with_items: "{{ r_openshift_node_image_prep_packages }}" - register: result - until: result is succeeded +- name: include package installs + import_tasks: install_rpms.yml + when: not (openshift_is_atomic | default(False) | bool) - name: create the directory for node file: diff --git a/roles/openshift_node/tasks/install_rpms.yml b/roles/openshift_node/tasks/install_rpms.yml new file mode 100644 index 000000000..c96e9cdaf --- /dev/null +++ b/roles/openshift_node/tasks/install_rpms.yml @@ -0,0 +1,9 @@ +--- +- name: install needed rpm(s) + package: + name: "{{ item }}" + state: present + with_items: "{{ r_openshift_node_image_prep_packages }}" + register: result + until: result is succeeded + when: not (openshift_is_atomic | default(False) | bool) |