re-enable excluders if they are enabled after openshift version detection

playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml

@@ -50,6 +50,8 @@
   tags:
   - pre_upgrade
 
+# Note: During upgrade the openshift excluder is not unexcluded inside the initialize_openshift_version.yml play.
+#       So it is necassary to run the play after running disable_excluder.yml.
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/common/openshift-cluster/config.yml

@@ -60,3 +60,7 @@
 - include: openshift_hosted.yml
   tags:
   - hosted
+
+- include: reset_excluder.yml
+  tags:
+  - always

playbooks/common/openshift-cluster/initialize_openshift_version.yml

@@ -18,12 +18,14 @@
       msg: Incompatible versions of yum and subscription-manager found. You may need to update yum and yum-utils.
     when: "not openshift.common.is_atomic | bool and 'Plugin \"search-disabled-repos\" requires API 2.7. Supported API is 2.6.' in yum_ver_test.stdout"
 
+# TODO(jchaloup): find a different way how to make repoquery --qf '%version` atomic-openshift work without disabling the excluders
 - include: disable_excluder.yml
   vars:
     # the excluders needs to be disabled no matter what status says
     with_status_check: false
   tags:
   - always
+  when: openshift_upgrade_target is not defined
 
 - name: Determine openshift_version to configure on first master
   hosts: oo_first_master
@@ -39,3 +41,9 @@
     openshift_version: "{{ hostvars[groups.oo_first_master.0].openshift_version }}"
   roles:
   - openshift_version
+
+  # Re-enable excluders if they are meant to be enabled (and only during installation, upgrade disables the excluders before this play)
+- include: reset_excluder.yml
+  tags:
+  - always
+  when: openshift_upgrade_target is not defined