summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-12-07 11:33:40 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2016-12-07 11:33:40 -0400
commit44d369feb1d18f628d9f10feed2cc0e29bac7c8d (patch)
treef7cda65cf112175c000d5a51149aa1ef12431020 /roles/openshift_master
parenta3ce4c106304773b6002458dfb113de9fd36efde (diff)
downloadopenshift-44d369feb1d18f628d9f10feed2cc0e29bac7c8d.tar.gz
openshift-44d369feb1d18f628d9f10feed2cc0e29bac7c8d.tar.bz2
openshift-44d369feb1d18f628d9f10feed2cc0e29bac7c8d.tar.xz
openshift-44d369feb1d18f628d9f10feed2cc0e29bac7c8d.zip
Pre-pull master/node/ovs images during upgrade.
We did this for install but not upgrade, leading to situations where the service restarts after upgrade could take much longer than expected as docker pulls down the new image. Now the images are present when we restart services and should allow them to come back online much more quickly, equivalent to rpm service restarts.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml7
-rw-r--r--roles/openshift_master/tasks/systemd_units.yml8
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: