diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-06 11:23:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 11:23:39 -0500 |
| commit | 4f5f4565634d3db98e45319237898bf620b8ecc4 (patch) | |
| tree | 840ac6c2113a1c85b6270bb40bd425dc87042111 | |
| parent | af8547120016ea0e1b01337805235428e2164f3f (diff) | |
| parent | 96276a3865a7642fbbf86614ddeb4cefe5dbda24 (diff) | |
| download | openshift-4f5f4565634d3db98e45319237898bf620b8ecc4.tar.gz openshift-4f5f4565634d3db98e45319237898bf620b8ecc4.tar.bz2 openshift-4f5f4565634d3db98e45319237898bf620b8ecc4.tar.xz openshift-4f5f4565634d3db98e45319237898bf620b8ecc4.zip | |
Merge pull request #3863 from ingvagabund/unexlude-excluder-if-it-is-upgraded-and-already-installed
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_excluder/tasks/disable.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_excluder/tasks/disable.yml b/roles/openshift_excluder/tasks/disable.yml index 325d2a4e8..97044fff6 100644 --- a/roles/openshift_excluder/tasks/disable.yml +++ b/roles/openshift_excluder/tasks/disable.yml @@ -4,6 +4,14 @@ # - docker_excluder_package_state - include: init.yml +# unexclude the current openshift/origin-excluder if it is installed so it can be updated +- include: unexclude.yml + vars: + unexclude_docker_excluder: false + unexclude_openshift_excluder: "{{ openshift_excluder_on | bool }}" + when: + - not openshift.common.is_atomic | bool + # Install any excluder that is enabled - include: install.yml vars: |