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/unexclude.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/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 |