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/unexclude.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/unexclude.yml')
| -rw-r--r-- | roles/openshift_excluder/tasks/unexclude.yml | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/roles/openshift_excluder/tasks/unexclude.yml b/roles/openshift_excluder/tasks/unexclude.yml index 38f0759aa..4df92bc65 100644 --- a/roles/openshift_excluder/tasks/unexclude.yml +++ b/roles/openshift_excluder/tasks/unexclude.yml @@ -1,12 +1,19 @@ --- -- name: disable docker excluder - command: "{{ openshift.common.service_type }}-docker-excluder unexclude" - when: - - docker_excluder_enabled | bool - - not openshift.common.is_containerized | bool +# input variables: +# - disable_docker_excluder +# - disable_openshift_excluder +- block: + - include: init.yml + + - name: disable docker excluder + command: "{{ openshift.common.service_type }}-docker-excluder unexclude" + when: + - disable_docker_excluder | default(false) | bool + + - name: disable openshift excluder + command: "{{ openshift.common.service_type }}-excluder unexclude" + when: + - disable_openshift_excluder | default(false) | bool -- name: disable excluder - command: "{{ openshift.common.service_type }}-excluder unexclude" when: - - openshift_excluder_enabled | bool - not openshift.common.is_containerized | bool |