diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-18 09:33:51 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-18 09:33:51 -0500 |
commit | ed988a68bd6edce0d91e2aa0b20e6dd8327863be (patch) | |
tree | 1ff0cc5daa570522df7b262f6143b195ea74bc2a /roles/openshift_excluder/tasks/exclude.yml | |
parent | b1c0247fdeb01f46e885c57cd272786d00ac8490 (diff) | |
parent | c5c222eddb0b8950995105c4c406f5a5d0bfbacd (diff) | |
download | openshift-ed988a68bd6edce0d91e2aa0b20e6dd8327863be.tar.gz openshift-ed988a68bd6edce0d91e2aa0b20e6dd8327863be.tar.bz2 openshift-ed988a68bd6edce0d91e2aa0b20e6dd8327863be.tar.xz openshift-ed988a68bd6edce0d91e2aa0b20e6dd8327863be.zip |
Merge pull request #4176 from mtnbikenc/refactor-openshift_excluders
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_excluder/tasks/exclude.yml')
-rw-r--r-- | roles/openshift_excluder/tasks/exclude.yml | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/roles/openshift_excluder/tasks/exclude.yml b/roles/openshift_excluder/tasks/exclude.yml index ca18d343f..934f1b2d2 100644 --- a/roles/openshift_excluder/tasks/exclude.yml +++ b/roles/openshift_excluder/tasks/exclude.yml @@ -1,30 +1,22 @@ --- -# input variables: -# - exclude_docker_excluder -# - exclude_openshift_excluder -- block: +- name: Check for docker-excluder + stat: + path: /sbin/{{ r_openshift_excluder_service_type }}-docker-excluder + register: docker_excluder_stat - - name: Check for docker-excluder - stat: - path: /sbin/{{ openshift.common.service_type }}-docker-excluder - register: docker_excluder_stat - - name: Enable docker excluder - command: "{{ openshift.common.service_type }}-docker-excluder exclude" - when: - - exclude_docker_excluder | default(false) | bool - - docker_excluder_stat.stat.exists +- name: Enable docker excluder + command: "{{ r_openshift_excluder_service_type }}-docker-excluder exclude" + when: + - r_openshift_excluder_enable_docker_excluder | bool + - docker_excluder_stat.stat.exists - - name: Check for openshift excluder - stat: - path: /sbin/{{ openshift.common.service_type }}-excluder - register: openshift_excluder_stat - - 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: - - exclude_openshift_excluder | default(false) | bool - - openshift_excluder_stat.stat.exists +- name: Check for openshift excluder + stat: + path: /sbin/{{ r_openshift_excluder_service_type }}-excluder + register: openshift_excluder_stat +- name: Enable openshift excluder + command: "{{ r_openshift_excluder_service_type }}-excluder exclude" when: - - not openshift.common.is_atomic | bool + - r_openshift_excluder_enable_openshift_excluder | bool + - openshift_excluder_stat.stat.exists |