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/unexclude.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/unexclude.yml')
-rw-r--r-- | roles/openshift_excluder/tasks/unexclude.yml | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/roles/openshift_excluder/tasks/unexclude.yml b/roles/openshift_excluder/tasks/unexclude.yml index 4df7f14b4..a5ce8d5c7 100644 --- a/roles/openshift_excluder/tasks/unexclude.yml +++ b/roles/openshift_excluder/tasks/unexclude.yml @@ -2,27 +2,25 @@ # input variables: # - unexclude_docker_excluder # - unexclude_openshift_excluder -- block: - - name: Check for docker-excluder - stat: - path: /sbin/{{ openshift.common.service_type }}-docker-excluder - register: docker_excluder_stat - - name: disable docker excluder - command: "{{ openshift.common.service_type }}-docker-excluder unexclude" - when: - - unexclude_docker_excluder | default(false) | bool - - docker_excluder_stat.stat.exists +- name: Check for docker-excluder + stat: + path: /sbin/{{ r_openshift_excluder_service_type }}-docker-excluder + register: docker_excluder_stat - - name: Check for openshift excluder - stat: - path: /sbin/{{ openshift.common.service_type }}-excluder - register: openshift_excluder_stat - - name: disable openshift excluder - command: "{{ openshift.common.service_type }}-excluder unexclude" - when: - - unexclude_openshift_excluder | default(false) | bool - - openshift_excluder_stat.stat.exists +- name: disable docker excluder + command: "{{ r_openshift_excluder_service_type }}-docker-excluder unexclude" + when: + - unexclude_docker_excluder | default(false) | bool + - docker_excluder_stat.stat.exists + +- name: Check for openshift excluder + stat: + path: /sbin/{{ r_openshift_excluder_service_type }}-excluder + register: openshift_excluder_stat +- name: disable openshift excluder + command: "{{ r_openshift_excluder_service_type }}-excluder unexclude" when: - - not openshift.common.is_atomic | bool + - unexclude_openshift_excluder | default(false) | bool + - openshift_excluder_stat.stat.exists |