Revert "Only enable leapp tasks when distribution is correct"

This reverts commit 3a44feeb4d.

This has broken the pacemaker setup part of the upgrade process,
so we need to revert it and revisit the idempotency.

Change-Id: I95fa9f263e89e0ed99bc42e3966acbe5973c4cc9

deployment/pacemaker/pacemaker-baremetal-puppet.yaml

@@ -212,24 +212,9 @@ outputs:
         - name: upgrade step 0
           when: step|int == 0
           block:
-            - name: Gather missing facts
-              setup:
-                gather_subset: "distribution"
-              when: >-
-                ansible_facts['distribution'] is not defined or
-                ansible_facts['distribution_major_version'] is not defined
-              tags:
-                - always
             - name: Set fact upgrade_leapp_enabled
               set_fact:
-                upgrade_leapp_enabled: >-
-                  {{ _upgradeLeappEnabled | bool and
-                     ansible_facts['distribution'] == 'RedHat' and
-                     ansible_facts['distribution_major_version'] is version('7', '==') }}
-              vars:
-                _upgradeLeappEnabled: {get_param: UpgradeLeappEnabled}
-              tags:
-                - always
+                upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
             - name: Check pacemaker cluster running before upgrade
               tags: validation
               pacemaker_cluster: state=online check_and_fail=true

deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

@@ -119,28 +119,14 @@ outputs:
       step_config: |
         include tripleo::packages
       upgrade_tasks:
-        - name: Gather missing facts
-          setup:
-            gather_subset: "distribution"
-          when: >-
-            ansible_facts['distribution'] is not defined or
-            ansible_facts['distribution_major_version'] is not defined
-          tags:
-            - always
-        - name: Set leapp facts
+        - name: set leapp facts
+          tags: always
           set_fact:
-            upgrade_leapp_enabled: >-
-              {{ _upgradeLeappEnabled | bool and
-                 ansible_facts['distribution'] == 'RedHat' and
-                 ansible_facts['distribution_major_version'] is version('7', '==') }}
+            upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
             upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
             upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
             upgrade_leapp_command_options: {get_param: UpgradeLeappCommandOptions}
             upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
-          vars:
-            _upgradeLeappEnabled: {get_param: UpgradeLeappEnabled}
-          tags:
-            - always
 
         - name: system_upgrade_prepare step 3
           tags: