Description of problem:

When try to change domain part of the overcloud using CloudDomain parameter like:

CloudDomain: example.com

Works for compute, ceph, ... but for controllers this is set static to  HOST.localdomain in puppet/controller-puppet.yaml

1381   hosts_entry:
1382     description: >
1383       Server's IP address and hostname in the /etc/hosts format
1384     value:
1385       str_replace:
1386         template: IP HOST.localdomain HOST

Required change to the above is :

template: "IP HOST.DOMAIN HOST"

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

How reproducible:
always

Steps to Reproduce:
1. change under cloud neutron/nova to use non default domain (e.g. example.com)
2. set `CloudDomain: example.com` in overcloud parameter file
3. deploy overcloud

Actual results:
controller hosts get set to `IP HOST.localdomain HOST` in /etc/hosts

Expected results:
controller hosts get set to `IP HOST.DOMAIN HOST` in /etc/hosts

Additional info:

As mentioned above correct for the other components:

$ grep -A 5 "hosts_entry:" puppet/*-puppet.yaml 
puppet/ceph-storage-puppet.yaml:  hosts_entry:
puppet/ceph-storage-puppet.yaml-    value:
puppet/ceph-storage-puppet.yaml-      str_replace:
puppet/ceph-storage-puppet.yaml-        template: "IP HOST.DOMAIN HOST"
puppet/ceph-storage-puppet.yaml-        params:
puppet/ceph-storage-puppet.yaml-          IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephStorageHostnameResolveNetwork]}]}
--
puppet/cinder-storage-puppet.yaml:  hosts_entry:
puppet/cinder-storage-puppet.yaml-    value:
puppet/cinder-storage-puppet.yaml-      str_replace:
puppet/cinder-storage-puppet.yaml-        template: "IP HOST.DOMAIN HOST"
puppet/cinder-storage-puppet.yaml-        params:
puppet/cinder-storage-puppet.yaml-          IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, BlockStorageHostnameResolveNetwork]}]}
--
puppet/compute-puppet.yaml:  hosts_entry:
puppet/compute-puppet.yaml-    description: >
puppet/compute-puppet.yaml-      Server's IP address and hostname in the /etc/hosts format
puppet/compute-puppet.yaml-    value:
puppet/compute-puppet.yaml-      str_replace:
puppet/compute-puppet.yaml-        template: "IP HOST.DOMAIN HOST"
--
puppet/controller-puppet.yaml:  hosts_entry:
puppet/controller-puppet.yaml-    description: >
puppet/controller-puppet.yaml-      Server's IP address and hostname in the /etc/hosts format
puppet/controller-puppet.yaml-    value:
puppet/controller-puppet.yaml-      str_replace:
puppet/controller-puppet.yaml-        template: IP HOST.localdomain HOST
--
puppet/swift-storage-puppet.yaml:  hosts_entry:
puppet/swift-storage-puppet.yaml-    value:
puppet/swift-storage-puppet.yaml-      str_replace:
puppet/swift-storage-puppet.yaml-        template: "IP HOST.DOMAIN HOST"
puppet/swift-storage-puppet.yaml-        params:
puppet/swift-storage-puppet.yaml-          IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ObjectStorageHostnameResolveNetwork]}]}