Description of problem:

When enabling heat-cfn via config parameter CONFIG_HEAT_CFN_INSTALL=y, packstack installation fails with message:

Error: Invalid parameter admin_address on Class[Heat::Keystone::Auth_cfn] at /var/tmp/packstack/4e65a6cd39854152aa91d2539c17c5d6/manifests/192.168.121.82_heatcnf.pp:67 on node newtontest.example.com


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

# rpm -q openstack-packstack puppet-heat
openstack-packstack-8.0.0-0.20160608133626.e531ea5.el7.centos.noarch
puppet-heat-8.0-0.20160608170257.0bb0521.el7.centos.noarch


How reproducible:

Allways

Steps to Reproduce:
1. install openstack-packstack from trunk.rdoproject.org/centos7-master/consistent
2. Enable following options in answer file:

CONFIG_HEAT_INSTALL=y
CONFIG_HEAT_CLOUDWATCH_INSTALL=y
CONFIG_HEAT_CFN_INSTALL=y	

3. lauch packastack installation

Actual results:

Packstack fails with error:

ERROR : Error appeared during Puppet run: 192.168.121.82_heatcnf.pp
Error: Invalid parameter admin_address on Class[Heat::Keystone::Auth_cfn] at /var/tmp/packstack/4e65a6cd39854152aa91d2539c17c5d6/manifests/192.168.121.82_heatcnf.pp:67 on node newtontest.example.com
You will find full trace in log /var/tmp/packstack/20160610-044157-Rba075/manifests/192.168.121.82_heatcnf.pp.log

Expected results:

Packstack should work.

Additional info:

puppet-heat removed deprecated config parameters in https://github.com/openstack/puppet-heat/commit/3b49812852e8f672a5be64d026e95cbda50d00ef . packstack template for heat-cfn must me adapted.