diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-20 20:14:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 20:14:42 -0500 |
| commit | 8f9adf4a895b1f33a8c9ae734483c428c10e8b15 (patch) | |
| tree | 70fbd12d06546a264ee2912133a28fc729a34d58 /roles/openshift_excluder/tasks/enable.yml | |
| parent | 03ae7f76debd812264b6831a6f3314825b251abe (diff) | |
| parent | 0dc62b7550980a0627cb15796be3746f6a924a7d (diff) | |
| download | openshift-8f9adf4a895b1f33a8c9ae734483c428c10e8b15.tar.gz openshift-8f9adf4a895b1f33a8c9ae734483c428c10e8b15.tar.bz2 openshift-8f9adf4a895b1f33a8c9ae734483c428c10e8b15.tar.xz openshift-8f9adf4a895b1f33a8c9ae734483c428c10e8b15.zip | |
Merge pull request #3715 from sdodson/excluders-v99
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_excluder/tasks/enable.yml')
| -rw-r--r-- | roles/openshift_excluder/tasks/enable.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/roles/openshift_excluder/tasks/enable.yml b/roles/openshift_excluder/tasks/enable.yml index 9122c9aeb..e719325bc 100644 --- a/roles/openshift_excluder/tasks/enable.yml +++ b/roles/openshift_excluder/tasks/enable.yml @@ -1,6 +1,5 @@ --- # input variables: -# - with_install - block: - include: init.yml @@ -8,14 +7,12 @@ vars: install_docker_excluder: "{{ docker_excluder_on | bool }}" install_openshift_excluder: "{{ openshift_excluder_on | bool }}" - when: with_install | default(docker_excluder_on or openshift_excluder_on) | bool + when: docker_excluder_on or openshift_excluder_on | bool - include: exclude.yml vars: - # Enable the docker excluder only if it is overrided, resp. enabled by default (in that order) - exclude_docker_excluder: "{{ enable_docker_excluder_override | default(docker_excluder_on) | bool }}" - # Enable the openshift excluder only if it is not overrided, resp. enabled by default (in that order) - exclude_openshift_excluder: "{{ not disable_openshift_excluder_override | default(not openshift_excluder_on) | bool }}" + exclude_docker_excluder: "{{ docker_excluder_on | bool }}" + exclude_openshift_excluder: "{{ openshift_excluder_on | bool }}" when: - not openshift.common.is_atomic | bool |