summaryrefslogtreecommitdiffstats
path: root/roles/openshift_excluder/tasks/unexclude.yml
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-03-01 12:54:19 +0100
committerJan Chaloupka <jchaloup@redhat.com>2017-03-07 22:27:48 +0100
commit1a16667b6a2e99ca6dc6b83c5794fb9995501280 (patch)
tree3427f0f326a307bf2b63e16c8fb5c1f887731712 /roles/openshift_excluder/tasks/unexclude.yml
parent6ecb86b2fcc36e3383d86395d3be0a443e12981e (diff)
downloadopenshift-1a16667b6a2e99ca6dc6b83c5794fb9995501280.tar.gz
openshift-1a16667b6a2e99ca6dc6b83c5794fb9995501280.tar.bz2
openshift-1a16667b6a2e99ca6dc6b83c5794fb9995501280.tar.xz
openshift-1a16667b6a2e99ca6dc6b83c5794fb9995501280.zip
- update excluders to latest, in non-upgrade scenarios do not update
- check both available excluder versions are at most of upgrade target version - get excluder status through status command - make excluders enablement configurable
Diffstat (limited to 'roles/openshift_excluder/tasks/unexclude.yml')
-rw-r--r--roles/openshift_excluder/tasks/unexclude.yml23
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