diff options
| author | Russell Teague <rteague@redhat.com> | 2017-05-11 11:46:34 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-05-16 11:20:26 -0400 |
| commit | c5c222eddb0b8950995105c4c406f5a5d0bfbacd (patch) | |
| tree | 7f5cd9c30afb7f8f9e0d78696de0813078fb9928 /roles/openshift_excluder/tasks/exclude.yml | |
| parent | 15fd42020a0b5fee665c45cd23b9ba3bd152251d (diff) | |
| download | openshift-c5c222eddb0b8950995105c4c406f5a5d0bfbacd.tar.gz openshift-c5c222eddb0b8950995105c4c406f5a5d0bfbacd.tar.bz2 openshift-c5c222eddb0b8950995105c4c406f5a5d0bfbacd.tar.xz openshift-c5c222eddb0b8950995105c4c406f5a5d0bfbacd.zip | |
Rework openshift_excluders role
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 |