Overcloud deploy fails when stack name contains an underscore

Issue

• When deploying an Overcloud, the deployment fails with the following heat resource failures:

[stack@director ~]$ heat stack-list --show-nested |grep -iv complete
WARNING (shell) "heat stack-list" is deprecated, please use "openstack stack list" instead
+--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------+--------------------+---------------------+--------------+--------------------------------------+
| id                                   | stack_name                                                                                                                                         | stack_status       | creation_time       | updated_time | parent                               |
+--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------+--------------------+---------------------+--------------+--------------------------------------+
| 1208b532-d745-4aff-8b26-7afaf7ab7add | TEST_STACK34                                                                                                                                       | CREATE_FAILED      | 2016-09-26T15:27:11 | None         | None                                 |
| 68141554-d1c9-4d08-874c-0abebb931745 | TEST_STACK34-ComputeNodesPostDeployment-rfxdqwvnngpm                                                                                               | CREATE_IN_PROGRESS | 2016-09-26T15:46:13 | None         | 1208b532-d745-4aff-8b26-7afaf7ab7add |
| 839788ce-938a-4700-991a-e136e04a9ec9 | TEST_STACK34-ControllerNodesPostDeployment-q4qzgv6m4gqr                                                                                            | CREATE_FAILED      | 2016-09-26T15:46:13 | None         | 1208b532-d745-4aff-8b26-7afaf7ab7add |
| e562f4f7-c933-45af-aff1-24dd63df155e | TEST_STACK34-ControllerNodesPostDeployment-q4qzgv6m4gqr-ControllerLoadBalancerDeployment_Step1-hhg27pnprjfd                                        | CREATE_FAILED      | 2016-09-26T15:46:42 | None         | 839788ce-938a-4700-991a-e136e04a9ec9 |
| 2d4d44b9-64e2-4e2c-89f8-8095f0b233e0 | TEST_STACK34-ComputeNodesPostDeployment-rfxdqwvnngpm-ComputePuppetDeployment-zpllq6lz5rgm                                                          | CREATE_IN_PROGRESS | 2016-09-26T15:46:57 | None         | 68141554-d1c9-4d08-874c-0abebb931745 |
+--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------+--------------------+---------------------+--------------+--------------------------------------+

• Deploy command used:

openstack overcloud deploy --stack TEST_STACK34 --templates -e /home/stack/templates/RHOS9_REPO-environment.yaml -e /home/stack/templates/net-single-nic-with-vlans.yaml --control-scale 1 --compute-scale 1 --control-flavor control --compute-flavor compute --ntp-server 192.0.2.1

• Warning seen in journalctl of controller:

Sep 26 17:49:08 test-stack34-controller-0.localdomain os-collect-config[5123]: [2016-09-26 11:46:56,793] (heat-config) [WARNING] Failed to retrieve 'hostname -f' output

• Output of hostname:

$ hostname 
test-stack34-controller-0.localdomain

• Contents of /etc/hosts:

127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
::1         localhost localhost.localdomain localhost6 localhost6.localdomain6

# HEAT_HOSTS_START - Do not edit manually within this section!
192.0.2.23 test_stack34-compute-0.localdomain test_stack34-compute-0
192.0.2.23 test_stack34-compute-0-external
192.0.2.23 test_stack34-compute-0-internalapi
192.0.2.23 test_stack34-compute-0-storage
192.0.2.23 test_stack34-compute-0-storagemgmt
192.0.2.23 test_stack34-compute-0-tenant
192.0.2.23 test_stack34-compute-0-management

192.0.2.24 test_stack34-controller-0.localdomain test_stack34-controller-0
192.0.2.24 test_stack34-controller-0-external
192.0.2.24 test_stack34-controller-0-internalapi
192.0.2.24 test_stack34-controller-0-storage
192.0.2.24 test_stack34-controller-0-storagemgmt
192.0.2.24 test_stack34-controller-0-tenant
192.0.2.24 test_stack34-controller-0-management
# HEAT_HOSTS_END

• The underscore in the hostname is replaced by a hyphen