Merge "Invoke redhat-subscription role during upgrade."

extraconfig/services/rhsm.yaml

@@ -64,10 +64,19 @@ outputs:
       service_name: rhsm
       config_settings:
         tripleo::rhsm::firewall_rules: {}
-      upgrade_tasks: []
       step_config: ''
       host_prep_tasks:
         - name: Red Hat Subscription Management configuration
           import_role:
             name: redhat-subscription
           vars: {get_attr: [RoleParametersValue, value, vars]}
+      upgrade_tasks:
+        - name: Red Hat Subscription Management configuration
+          import_role:
+            name: redhat-subscription
+          vars:
+            map_merge:
+              - {get_attr: [RoleParametersValue, value, vars]}
+              # Force only rhsm_repos content to be enabled.
+              - rhsm_repos_purge: True
+          when: step|int == 0