summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-11 13:45:01 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-12 14:32:24 -0400
commitff06c2e87d1a6ccc9d1cd68cf978eae950c63d31 (patch)
tree9c035942864b83bc476716c72b793ba9287d1367
parentad9aad99694fa9e0c6454483bc4921bf3acfa6a9 (diff)
downloadopenshift-ff06c2e87d1a6ccc9d1cd68cf978eae950c63d31.tar.gz
openshift-ff06c2e87d1a6ccc9d1cd68cf978eae950c63d31.tar.bz2
openshift-ff06c2e87d1a6ccc9d1cd68cf978eae950c63d31.tar.xz
openshift-ff06c2e87d1a6ccc9d1cd68cf978eae950c63d31.zip
Make sure Docker is restarted after we have correctly configured the containerized systemd units
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
index 7e3253d8f..c1dabc150 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
@@ -105,8 +105,12 @@
- include: ../../../../../roles/openshift_master/handlers/main.yml
- include: ../../../../../roles/openshift_node/handlers/main.yml
roles:
+ # We want the cli role to evaluate so that the containerized oc/oadm wrappers
+ # are modified to use the correct image tag. However, this can trigger a
+ # docker restart if new configuration is laid down which would immediately
+ # pull the latest image and defeat the purpose of these tasks.
- openshift_cli
- tasks:
+ pre_tasks:
- name: Clean package cache
command: "{{ ansible_pkg_mgr }} clean all"
when: not openshift.common.is_atomic | bool