Get rid of adjust.yml

roles/openshift_excluder/tasks/adjust.yml

@@ -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

roles/openshift_excluder/tasks/disable.yml

@@ -17,5 +17,24 @@
   # it the docker excluder is enabled, we install it and in case its status is non-zero
   # it is enabled no matter what
 
-  # And finally adjust an excluder in order to update host components correctly
-- include: adjust.yml
+# And finally adjust an excluder in order to update host components correctly. First
+# exclude then unexclude
+- block:
+  - 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