summaryrefslogtreecommitdiffstats
path: root/roles/openshift_excluder
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-28 16:24:20 -0500
committerGitHub <noreply@github.com>2017-03-28 16:24:20 -0500
commit89f2e49cbe7f61fa8379343552ae9862f926bbfb (patch)
tree85c274b5b41cbb3a3ff19024c40173abdff94fcc /roles/openshift_excluder
parentd77a9a685c3add9ef9c4d659ee47ebf35e145fe4 (diff)
parent7fcc44c894888fd9ed4a5997fd7f82bfc8daf19e (diff)
downloadopenshift-89f2e49cbe7f61fa8379343552ae9862f926bbfb.tar.gz
openshift-89f2e49cbe7f61fa8379343552ae9862f926bbfb.tar.bz2
openshift-89f2e49cbe7f61fa8379343552ae9862f926bbfb.tar.xz
openshift-89f2e49cbe7f61fa8379343552ae9862f926bbfb.zip
Merge pull request #3781 from ingvagabund/make-the-ocp-version-detection-excluder-free
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_excluder')
-rw-r--r--roles/openshift_excluder/tasks/disable.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_excluder/tasks/disable.yml b/roles/openshift_excluder/tasks/disable.yml
index e23496b3b..325d2a4e8 100644
--- a/roles/openshift_excluder/tasks/disable.yml
+++ b/roles/openshift_excluder/tasks/disable.yml
@@ -1,6 +1,5 @@
---
# input variables
-# - with_status_check
# - excluder_package_state
# - docker_excluder_package_state
- include: init.yml
@@ -35,6 +34,6 @@
unexclude_docker_excluder: false
# disable openshift excluder is never overrided to be enabled
# disable it if the docker excluder is enabled
- unexclude_openshift_excluder: true
+ unexclude_openshift_excluder: "{{ openshift_excluder_on | bool }}"
when:
- not openshift.common.is_atomic | bool