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_master | |
| 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_master')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/systemd_units.yml | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 2de5cd3f3..9cd6b6c81 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -29,13 +29,6 @@ state: present when: not openshift.common.is_containerized | bool -- name: Pull master image - command: > - docker pull {{ openshift.master.master_image }}:{{ openshift_image_tag }} - register: pull_result - changed_when: "'Downloaded newer image' in pull_result.stdout" - when: openshift.common.is_containerized | bool - - name: Create openshift.common.data_dir file: path: "{{ openshift.common.data_dir }}" diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index 11e010716..e2b722abd 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -13,6 +13,14 @@ ha_svc_template_path: "docker-cluster" when: openshift.common.is_containerized | bool +# This is the image used for both HA and non-HA clusters: +- name: Pre-pull master image + command: > + docker pull {{ openshift.master.master_image }}:{{ openshift_image_tag }} + register: pull_result + changed_when: "'Downloaded newer image' in pull_result.stdout" + when: openshift.common.is_containerized | bool + # workaround for missing systemd unit files - name: Create the systemd unit files template: |