summaryrefslogtreecommitdiffstats
path: root/roles/openshift_excluder
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-05-30 15:16:29 +0200
committerJan Chaloupka <jchaloup@redhat.com>2017-05-30 15:24:32 +0200
commit67f138de515f01dbfc24bb7fd13d28dc9ac0c0f2 (patch)
treefe2b197e0d39550dd00e43018675a8b0c16afe60 /roles/openshift_excluder
parentc5f4a60fdd9ebc81180a96677717ca96b9badc72 (diff)
downloadopenshift-67f138de515f01dbfc24bb7fd13d28dc9ac0c0f2.tar.gz
openshift-67f138de515f01dbfc24bb7fd13d28dc9ac0c0f2.tar.bz2
openshift-67f138de515f01dbfc24bb7fd13d28dc9ac0c0f2.tar.xz
openshift-67f138de515f01dbfc24bb7fd13d28dc9ac0c0f2.zip
disable docker excluder before it is updated to remove older excluded packages
Diffstat (limited to 'roles/openshift_excluder')
-rw-r--r--roles/openshift_excluder/tasks/disable.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_excluder/tasks/disable.yml b/roles/openshift_excluder/tasks/disable.yml
index 8d5a08874..5add25b45 100644
--- a/roles/openshift_excluder/tasks/disable.yml
+++ b/roles/openshift_excluder/tasks/disable.yml
@@ -5,10 +5,12 @@
include: verify_upgrade.yml
# unexclude the current openshift/origin-excluder if it is installed so it can be updated
-- name: Disable OpenShift excluder so it can be updated
+- name: Disable excluders before the upgrade to remove older excluding expressions
include: unexclude.yml
vars:
- unexclude_docker_excluder: false
+ # before the docker excluder can be updated, it needs to be disabled
+ # to remove older excluded packages that are no longer excluded
+ unexclude_docker_excluder: "{{ r_openshift_excluder_enable_docker_excluder }}"
unexclude_openshift_excluder: "{{ r_openshift_excluder_enable_openshift_excluder }}"
# Install any excluder that is enabled