diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-03-07 23:39:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 23:39:00 +0100 |
| commit | d3da4d1817d54b9c3aef9fffa6ad166ec950e830 (patch) | |
| tree | 6fe794ca484b0a4807c7af3dc4bdf008d0c8d9bd /roles/openshift_excluder/tasks/exclude.yml | |
| parent | 7c8f77dbf4ea10a5b9034dbd2a6519d8e0d5e8ce (diff) | |
| parent | 1a16667b6a2e99ca6dc6b83c5794fb9995501280 (diff) | |
| download | openshift-d3da4d1817d54b9c3aef9fffa6ad166ec950e830.tar.gz openshift-d3da4d1817d54b9c3aef9fffa6ad166ec950e830.tar.bz2 openshift-d3da4d1817d54b9c3aef9fffa6ad166ec950e830.tar.xz openshift-d3da4d1817d54b9c3aef9fffa6ad166ec950e830.zip | |
Merge pull request #3529 from ingvagabund/upgrade-excluders-in-upgrade-only
WIP: update excluders to latest by default, in non-upgrade scenarios do not update
Diffstat (limited to 'roles/openshift_excluder/tasks/exclude.yml')
| -rw-r--r-- | roles/openshift_excluder/tasks/exclude.yml | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/roles/openshift_excluder/tasks/exclude.yml b/roles/openshift_excluder/tasks/exclude.yml index 570183aef..ee0ad8a0b 100644 --- a/roles/openshift_excluder/tasks/exclude.yml +++ b/roles/openshift_excluder/tasks/exclude.yml @@ -1,11 +1,20 @@ --- -- include: install.yml - when: not openshift.common.is_containerized | bool +# input variables: +# - enable_docker_excluder +# - enable_openshift_excluder +- block: + - name: Enable docker excluder + command: "{{ openshift.common.service_type }}-docker-excluder exclude" + # if the docker override is set, it means the docker excluder needs to be enabled no matter what + # if the docker override is not set, the excluder is set based on enable_docker_excluder + when: + - enable_docker_excluder | default(false) | bool -- name: Enable docker excluder - command: "{{ openshift.common.service_type }}-docker-excluder exclude" - when: not openshift.common.is_containerized | bool - -- name: Enable excluder - command: "{{ openshift.common.service_type }}-excluder exclude" - when: not openshift.common.is_containerized | bool + - name: Enable openshift excluder + command: "{{ openshift.common.service_type }}-excluder exclude" + # if the openshift override is set, it means the openshift excluder is disabled no matter what + # if the openshift override is not set, the excluder is set based on enable_openshift_excluder + when: + - enable_openshift_excluder | default(false) | bool + when: + - not openshift.common.is_containerized | bool |