From 4b0fa927ae262a09da87c72ced250c1b3e9c91ae Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 20 Mar 2017 13:17:08 -0400 Subject: Simplify excluder enablement logic a bit more --- roles/openshift_excluder/tasks/adjust.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_excluder/tasks/adjust.yml') diff --git a/roles/openshift_excluder/tasks/adjust.yml b/roles/openshift_excluder/tasks/adjust.yml index cbdd7785b..c32cd6070 100644 --- a/roles/openshift_excluder/tasks/adjust.yml +++ b/roles/openshift_excluder/tasks/adjust.yml @@ -9,7 +9,7 @@ vars: # Enable the docker excluder only if it is overrided # BZ #1430612: docker excluders should be enabled even during installation and upgrade - exclude_docker_excluder: "{{ enable_docker_excluder | default(true) | bool }}" + exclude_docker_excluder: "{{ docker_excluder_on | bool }}" # excluder is to be disabled by default exclude_openshift_excluder: false # All excluders that are to be disabled are disabled @@ -20,6 +20,6 @@ unexclude_docker_excluder: false # disable openshift excluder is never overrided to be enabled # disable it if the docker excluder is enabled - unexclude_openshift_excluder: "{{ openshift_excluder_on | bool }}" + unexclude_openshift_excluder: true when: - not openshift.common.is_atomic | bool -- cgit v1.2.3 From 36b7f1bb7b036d619f224594c4fc08ed2b434a80 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 20 Mar 2017 14:12:54 -0400 Subject: Get rid of adjust.yml --- roles/openshift_excluder/tasks/adjust.yml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 roles/openshift_excluder/tasks/adjust.yml (limited to 'roles/openshift_excluder/tasks/adjust.yml') diff --git a/roles/openshift_excluder/tasks/adjust.yml b/roles/openshift_excluder/tasks/adjust.yml deleted file mode 100644 index c32cd6070..000000000 --- a/roles/openshift_excluder/tasks/adjust.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# Depending on enablement of individual excluders and their status -# some excluders needs to be disabled, resp. enabled -# By default, all excluders are disabled unless overrided. -- block: - - include: init.yml - # All excluders that are to be enabled are enabled - - include: exclude.yml - vars: - # Enable the docker excluder only if it is overrided - # BZ #1430612: docker excluders should be enabled even during installation and upgrade - exclude_docker_excluder: "{{ docker_excluder_on | bool }}" - # excluder is to be disabled by default - exclude_openshift_excluder: false - # All excluders that are to be disabled are disabled - - include: unexclude.yml - vars: - # If the docker override is not set, default to the generic behaviour - # BZ #1430612: docker excluders should be enabled even during installation and upgrade - unexclude_docker_excluder: false - # disable openshift excluder is never overrided to be enabled - # disable it if the docker excluder is enabled - unexclude_openshift_excluder: true - when: - - not openshift.common.is_atomic | bool -- cgit v1.2.3