Description of problem:

When upgrading frm osp13 to osp14 having an already registered overcloud via Satellite (old rhel-registration service was used during deployment) the overcloud upgrade run command will fail because it can't find some puppet classes. This is usually a sign that the overcloud nodes did not have their repositories updated to the last version.
This can be observed in the upgrade_tasks when rhsm service invokes redhat-subsciption ansible role:

u'TASK [redhat-subscription : SATELLITE 6 | Install katello-ca-consumer] *********',
 u'Tuesday 11 December 2018  07:15:18 -0500 (0:00:00.916)       0:01:05.081 ****** ',
 u'ok: [controller-0] => {"changed": false, "msg": "", "rc": 0, "results": ["katello-ca-consumer-rhos-compute-node-08.lab.eng.rdu2.redhat.com-1.0-2.noarch providing /tmp/katello-ca-consumer-latest.noarchK641hh.rpm is already installed"]}',
 u'',
 u'TASK [redhat-subscription : SATELLITE 6 | Execute katello-rhsm-consumer] *******',
 u'Tuesday 11 December 2018  07:15:23 -0500 (0:00:05.216)       0:01:10.298 ****** ',
 u'skipping: [controller-0] => {"changed": false, "skip_reason": "Conditional result was False"}',
 u'',
 u'TASK [redhat-subscription : Manage Red Hat subscription] ***********************',
 u'Tuesday 11 December 2018  07:15:24 -0500 (0:00:00.392)       0:01:10.690 ****** ',
 u'ok: [controller-0] => {"changed": false, "msg": "System already registered."}',
 u'',
 u'TASK [redhat-subscription : Configure repository subscriptions] ****************',
 u'Tuesday 11 December 2018  07:15:26 -0500 (0:00:01.948)       0:01:12.639 ****** ',
 u'skipping: [controller-0] => {"changed": false, "skip_reason": "Conditional result was False"}',
 u'',
 u'TASK [Check if swift-proxy or swift-object-expirer are deployed] ***************',
 u'Tuesday 11 December 2018  07:15:26 -0500 (0:00:00.285)       0:01:12.924 ****** ',

The role does not register the environment with the new osp14 activation key provided because the system was already registered.

Version-Release number of selected component (if applicable):


How reproducible:


Steps to Reproduce:
1. Deploy the overcloud using rhel-registration to connec to a satellite server (via activation key)
cat rhel-registration/environment-rhel-registration.yaml
parameter_defaults:
  rhel_reg_activation_key: "rhos13-dev"
  rhel_reg_auto_attach: ""
  rhel_reg_base_url: ""
  rhel_reg_environment: ""
  rhel_reg_force: ""
  rhel_reg_machine_name: ""
  rhel_reg_org: "Default_Organization"
(some parameters are not included on purpose)
overcloud deploy command used:
openstack overcloud deploy \
--timeout 100 \
--templates /usr/share/openstack-tripleo-heat-templates \
--stack overcloud \
--libvirt-type kvm \
--ntp-server clock.redhat.com \
-e /home/stack/virt/config_lvm.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
-e /home/stack/virt/network/network-environment.yaml \
-e /home/stack/virt/enable-tls.yaml \
-e /home/stack/virt/inject-trust-anchor.yaml \
-e /home/stack/virt/public_vip.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/ssl/tls-endpoints-public-ip.yaml \
-e /home/stack/virt/hostnames.yml \
-e /home/stack/virt/nodes_data.yaml \
-e /home/stack/virt/extra_templates.yaml \
-e /home/stack/virt/docker-images.yaml \
-e /home/stack/rhel-registration/rhel-registration-resource-registry.yaml \
-e /home/stack/rhel-registration/environment-rhel-registration.yaml \
--log-file overcloud_deployment_40.log
2. Upgrade the undercloud to osp 14
3. Prepare rhsm.yaml environment file: 
cat rhsm.yaml 
resource_registry:
  OS::TripleO::Services::Rhsm: /usr/share/openstack-tripleo-heat-templates/extraconfig/services/rhsm.yaml
parameter_defaults:
  RhsmVars:
    rhsm_activation_key: "osp14-dev"
    rhsm_org_id: "Default_Organization"
    rhsm_method: satellite
    rhsm_insecure: yes
(some paraemeters are ommitted on purpose)

And run overcloud_upgrade_prepare:
cat overcloud_prepare.sh 
#!/bin/bash

openstack overcloud upgrade prepare \
--timeout 100 \
--templates /usr/share/openstack-tripleo-heat-templates \
--stack overcloud \
--libvirt-type kvm \
--ntp-server clock.redhat.com \
-e /home/stack/virt/config_lvm.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
-e /home/stack/virt/network/network-environment.yaml \
-e /home/stack/virt/enable-tls.yaml \
-e /home/stack/virt/inject-trust-anchor.yaml \
-e /home/stack/virt/public_vip.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/ssl/tls-endpoints-public-ip.yaml \
-e /home/stack/virt/hostnames.yml \
-e /home/stack/virt/nodes_data.yaml \
-e /home/stack/virt/extra_templates.yaml \
-e /home/stack/containers-prepare-parameter-oc.yaml \
-e /home/stack/rhsm.yaml

4. Run external-upgrade-run --tags container_image_prepare
5. Run "overcloud upgrade run --roles Controller --playbook all

Actual results:


Expected results:


Additional info: