diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-03 19:56:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 19:56:45 -0400 |
| commit | 9e45069e4029e3c847fd4a778f45acb27110f322 (patch) | |
| tree | e4aa07e73c7a3393c27c79dc5b6ba26158897872 | |
| parent | 2ae2dfdb085be0e1bda00d0e33a7c9388b337307 (diff) | |
| parent | b9d9edef5efb7cfb75c8ec2e484f16ad40ac09c7 (diff) | |
| download | openshift-9e45069e4029e3c847fd4a778f45acb27110f322.tar.gz openshift-9e45069e4029e3c847fd4a778f45acb27110f322.tar.bz2 openshift-9e45069e4029e3c847fd4a778f45acb27110f322.tar.xz openshift-9e45069e4029e3c847fd4a778f45acb27110f322.zip | |
Merge pull request #4666 from ingvagabund/pre-pull-docker-images-before-stopping-docker
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_node_upgrade/tasks/main.yml | 14 | ||||
| -rw-r--r-- | roles/openshift_node_upgrade/tasks/systemd_units.yml | 15 |
2 files changed, 14 insertions, 15 deletions
diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml index 9807aa9a3..ac9ea32cb 100644 --- a/roles/openshift_node_upgrade/tasks/main.yml +++ b/roles/openshift_node_upgrade/tasks/main.yml @@ -31,6 +31,20 @@ failed_when: false when: openshift.common.is_containerized | bool +- 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 + - include: docker/upgrade.yml vars: # We will restart Docker ourselves after everything is ready: diff --git a/roles/openshift_node_upgrade/tasks/systemd_units.yml b/roles/openshift_node_upgrade/tasks/systemd_units.yml index 862cd19c4..e8f017445 100644 --- a/roles/openshift_node_upgrade/tasks/systemd_units.yml +++ b/roles/openshift_node_upgrade/tasks/systemd_units.yml @@ -18,21 +18,6 @@ # 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" |