diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-20 13:17:08 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-03-20 14:00:20 -0400 |
| commit | 4b0fa927ae262a09da87c72ced250c1b3e9c91ae (patch) | |
| tree | f9f4e41fc0dc3b6a61bedc04a2102de79afea2f2 /roles/openshift_excluder/tasks/adjust.yml | |
| parent | b6aa824eb212ff968cc4b925bb32c05ef2ebd61d (diff) | |
| download | openshift-4b0fa927ae262a09da87c72ced250c1b3e9c91ae.tar.gz openshift-4b0fa927ae262a09da87c72ced250c1b3e9c91ae.tar.bz2 openshift-4b0fa927ae262a09da87c72ced250c1b3e9c91ae.tar.xz openshift-4b0fa927ae262a09da87c72ced250c1b3e9c91ae.zip | |
Simplify excluder enablement logic a bit more
Diffstat (limited to 'roles/openshift_excluder/tasks/adjust.yml')
| -rw-r--r-- | roles/openshift_excluder/tasks/adjust.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_excluder/tasks/adjust.yml b/roles/openshift_excluder/tasks/adjust.yml index cbdd7785b..c32cd6070 100644 --- a/roles/openshift_excluder/tasks/adjust.yml +++ b/roles/openshift_excluder/tasks/adjust.yml @@ -9,7 +9,7 @@ vars: # Enable the docker excluder only if it is overrided # BZ #1430612: docker excluders should be enabled even during installation and upgrade - exclude_docker_excluder: "{{ enable_docker_excluder | default(true) | bool }}" + exclude_docker_excluder: "{{ docker_excluder_on | bool }}" # excluder is to be disabled by default exclude_openshift_excluder: false # All excluders that are to be disabled are disabled @@ -20,6 +20,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: "{{ openshift_excluder_on | bool }}" + unexclude_openshift_excluder: true when: - not openshift.common.is_atomic | bool |