+++ This bug was initially created as a clone of Bug #1452677 +++

Description of problem:

heat metadata urls are set to 127.0.0.1 in the defaults in /usr/share/heat/heat-dist.conf:
heat_metadata_server_url = http://127.0.0.1:8000
heat_waitcondition_server_url = http://127.0.0.1:8000/v1/waitcondition
heat_watch_server_url =http://127.0.0.1:8003

Recently there was a BZ around those values being set to 127.0.0.1 via Puppet #1395139 this has been fixed by removing those defaults from the heat-puppet modules. And now those values are no longer defined in /etc/heat/heat.conf.

This means that they fall back to the values from /usr/share/heat/heat-dist.conf from the openstack-heat-commons package, which still have those values set to 127.0.0.1.

A complete fix of the problem would require to remove those values from /usr/share/heat/heat-dist.conf as well, and then Heat would finally fall back to the values provided by Keystone.
Alternatively it should be explicitely set to the correct heat_cfn endpoint.

Version-Release number of selected component (if applicable):
puppet-heat-9.5.0-1.el7ost.noarch
openstack-heat-api-cfn-7.0.2-1.el7ost.noarch
python-heat-agent-0-0.11.1e6015dgit.el7ost.noarch
openstack-heat-api-7.0.2-1.el7ost.noarch
python-heat-agent-puppet-0-0.11.1e6015dgit.el7ost.noarch
python-heatclient-1.5.0-1.el7ost.noarch
openstack-heat-api-cloudwatch-7.0.2-1.el7ost.noarch
openstack-heat-common-7.0.2-1.el7ost.noarch
openstack-heat-engine-7.0.2-1.el7ost.noarch
heat-cfntools-1.3.0-2.el7ost.noarch

How reproducible:
Always

Steps to Reproduce:
1. Install OSP10
2. Launch a Heat stack containing with a Nova instance and using a SoftwareDeployment and SOFTWARE_CONFIG
3. Check that /var/lib/heat-cfntools/cfn-init-data

Actual results:
"metadata_url" is set to 127.0.0.1

Expected results:
"metadata_url" is set to the Public heat_cfn endpoint.