From c5c222eddb0b8950995105c4c406f5a5d0bfbacd Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Thu, 11 May 2017 11:46:34 -0400 Subject: Rework openshift_excluders role --- roles/openshift_excluder/tasks/enable.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'roles/openshift_excluder/tasks/enable.yml') diff --git a/roles/openshift_excluder/tasks/enable.yml b/roles/openshift_excluder/tasks/enable.yml index e719325bc..fce44cfb5 100644 --- a/roles/openshift_excluder/tasks/enable.yml +++ b/roles/openshift_excluder/tasks/enable.yml @@ -1,18 +1,6 @@ --- -# input variables: -- block: - - include: init.yml +- name: Install excluders + include: install.yml - - include: install.yml - vars: - install_docker_excluder: "{{ docker_excluder_on | bool }}" - install_openshift_excluder: "{{ openshift_excluder_on | bool }}" - when: docker_excluder_on or openshift_excluder_on | bool - - - include: exclude.yml - vars: - exclude_docker_excluder: "{{ docker_excluder_on | bool }}" - exclude_openshift_excluder: "{{ openshift_excluder_on | bool }}" - - when: - - not openshift.common.is_atomic | bool +- name: Enable excluders + include: exclude.yml -- cgit v1.2.3