Description of problem:
During 7->8 upgrade, when providing the subscription parameters in an environment file the 1st step of the upgrade fails with:
Property error: resources.NodeExtraConfig.properties: Property rhel_reg_sat_repo not assigned

Version-Release number of selected component (if applicable):
openstack-tripleo-heat-templates-0.8.14-9.el7ost.noarch


Steps to Reproduce:
1. Deploy overcloud using OSPd 7.3 and passing the registration details through an environment file:

export THT=/home/stack/templates/my-overcloud 
openstack overcloud deploy --templates $THT \
  -e $THT/environments/network-isolation.yaml \
  -e ~/templates/network-environment.yaml \
  -e ~/templates/environment-reg.yaml \
  -e $THT/extraconfig/pre_deploy/rhel-registration/rhel-registration-resource-registry.yaml \
  --control-scale 3 \
  --compute-scale 1 \
  --ntp-server clock.redhat.com \
  --libvirt-type qemu 

stack@instack:~>>> cat ~/templates/environment-reg.yaml 
parameter_defaults:
  rhel_reg_activation_key: ""
  rhel_reg_auto_attach: ""
  rhel_reg_base_url: ""
  rhel_reg_environment: ""
  rhel_reg_force: ""
  rhel_reg_machine_name: ""
  rhel_reg_org: ""
  rhel_reg_password: "somepassword"
  rhel_reg_pool_id: "someid"
  rhel_reg_release: ""
  rhel_reg_repos: "rhel-7-server-rpms,rhel-7-server-extras-rpms,rhel-7-server-rh-common-rpms,rhel-ha-for-rhel-7-server-rpms,rhel-7-server-openstack-7.0-director-rpms,rhel-7-server-openstack-7.0-rpms,rhel-7-server-rhceph-1.3-osd-rpms,rhel-7-server-rhceph-1.3-mon-rpms"
  rhel_reg_sat_url: ""
  rhel_reg_server_url: ""
  rhel_reg_service_level: ""
  rhel_reg_user: "mcornea"
  rhel_reg_type: ""
  rhel_reg_method: "portal"

2. Upgrade undercloud 

3. Run upgrade step 1:
export THT=/home/stack/templates/my-overcloud-8.0
openstack overcloud deploy --templates $THT \
  -e $THT/environments/network-isolation.yaml \
  -e ~/templates/network-environment.yaml \
  -e ~/templates/environment-reg.yaml \
  -e $THT/extraconfig/pre_deploy/rhel-registration/rhel-registration-resource-registry.yaml \
  -e $THT/environments/major-upgrade-pacemaker-init.yaml 


Actual results:

2016-04-21 13:12:08 [0]: UPDATE_FAILED  resources[0]: Property error: resources.NodeExtraConfig.properties: Property rhel_reg_sat_repo not assigned
2016-04-21 13:12:09 [overcloud-Compute-v3d55v74rbdp]: UPDATE_FAILED  resources[0]: Property error: resources.NodeExtraConfig.properties: Property rhel_reg_sat_repo not assigned
Stack overcloud UPDATE_FAILED
Heat Stack update failed.

Expected results:

Additional info:

The environment-rhel-registration.yaml in the version 8 templates contain a new parameter:

diff my-overcloud/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml my-overcloud-8.0/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml 
22a23
>   rhel_reg_sat_repo: "rhel-7-server-satellite-tools-6.1-rpms"

Workaround:
Add the parameter to the environment file used initially for the registration parameters and rerun upgrade step 1

stack@instack:~>>> cat ~/templates/environment-reg.yaml 
parameter_defaults:
  rhel_reg_activation_key: ""
  rhel_reg_auto_attach: ""
  rhel_reg_base_url: ""
  rhel_reg_environment: ""
  rhel_reg_force: ""
  rhel_reg_machine_name: ""
  rhel_reg_org: ""
  rhel_reg_password: "somepassword"
  rhel_reg_pool_id: "someid"
  rhel_reg_release: ""
  rhel_reg_repos: "rhel-7-server-rpms,rhel-7-server-extras-rpms,rhel-7-server-rh-common-rpms,rhel-ha-for-rhel-7-server-rpms,rhel-7-server-openstack-7.0-director-rpms,rhel-7-server-openstack-7.0-rpms,rhel-7-server-rhceph-1.3-osd-rpms,rhel-7-server-rhceph-1.3-mon-rpms"
  rhel_reg_sat_url: ""
  rhel_reg_server_url: ""
  rhel_reg_service_level: ""
  rhel_reg_user: "mcornea"
  rhel_reg_type: ""
  rhel_reg_method: "portal"
  rhel_reg_sat_repo: "rhel-7-server-satellite-tools-6.1-rpms"