summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-02 11:03:55 -0500
committerGitHub <noreply@github.com>2017-06-02 11:03:55 -0500
commit47a269e171e81fc5e9e0c9960a6306e47b253c54 (patch)
treeba2031f97be992cd01c97c678edb8eb7ea746126 /roles
parent65719ca75b02b3002fbcacb48abaf7a2988bb39e (diff)
parent67f138de515f01dbfc24bb7fd13d28dc9ac0c0f2 (diff)
downloadopenshift-47a269e171e81fc5e9e0c9960a6306e47b253c54.tar.gz
openshift-47a269e171e81fc5e9e0c9960a6306e47b253c54.tar.bz2
openshift-47a269e171e81fc5e9e0c9960a6306e47b253c54.tar.xz
openshift-47a269e171e81fc5e9e0c9960a6306e47b253c54.zip
Merge pull request #4309 from ingvagabund/disable-docker-excluder-when-updating
Merged by openshift-bot
Diffstat (limited to 'roles')
-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