diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-12-08 11:17:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 11:17:51 -0500 |
| commit | 09b3183997a65c2835a95cf8c38c28e3f20380a7 (patch) | |
| tree | ae352df44a7b8eda8a247a32d3983cefb4725e29 /roles/openshift_node | |
| parent | 0738801494527eef3c4a9ab7c7b5bb3af00526b0 (diff) | |
| parent | 44d369feb1d18f628d9f10feed2cc0e29bac7c8d (diff) | |
| download | openshift-09b3183997a65c2835a95cf8c38c28e3f20380a7.tar.gz openshift-09b3183997a65c2835a95cf8c38c28e3f20380a7.tar.bz2 openshift-09b3183997a65c2835a95cf8c38c28e3f20380a7.tar.xz openshift-09b3183997a65c2835a95cf8c38c28e3f20380a7.zip | |
Merge pull request #2937 from dgoodwin/upgrade-prepull
Pre-pull master/node/ovs images during upgrade.
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 14 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 9a6d8d588..e970c4cd1 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -60,20 +60,6 @@ state: present when: openshift.common.use_openshift_sdn and not openshift.common.is_containerized | bool -- name: Pull node image - command: > - docker pull {{ openshift.node.node_image }}:{{ openshift_image_tag }} - register: pull_result - changed_when: "'Downloaded newer image' in pull_result.stdout" - when: openshift.common.is_containerized | bool - -- name: Pull OpenVSwitch image - command: > - docker pull {{ openshift.node.ovs_image }}:{{ openshift_image_tag }} - register: pull_result - changed_when: "'Downloaded newer image' in pull_result.stdout" - when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool - - name: Install the systemd units include: systemd_units.yml diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index f722a6e69..8b669a2c6 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -1,6 +1,20 @@ # This file is included both in the openshift_master role and in the upgrade # playbooks. +- name: Pre-pull node image + command: > + docker pull {{ openshift.node.node_image }}:{{ openshift_image_tag }} + register: pull_result + changed_when: "'Downloaded newer image' in pull_result.stdout" + when: openshift.common.is_containerized | bool + +- name: Pre-pull openvswitch image + command: > + docker pull {{ openshift.node.ovs_image }}:{{ openshift_image_tag }} + register: pull_result + changed_when: "'Downloaded newer image' in pull_result.stdout" + when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool + - name: Install Node dependencies docker service file template: dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node-dep.service" |