Merge "Allow control of hostname formatting"

diff --cc controller.yaml
Simple merge

diff --cc overcloud-without-mergepy.yaml
Simple merge

diff --cc puppet/ceph-storage-puppet.yaml
Simple merge

diff --cc puppet/cinder-storage-puppet.yaml
Simple merge

diff --cc puppet/compute-puppet.yaml
Simple merge

diff --cc puppet/controller-puppet.yaml
Simple merge

diff --cc puppet/swift-storage-puppet.yaml
Simple merge