Merge "puppet: install Horizon on overcloud-controller"

diff --cc controller.yaml
Simple merge

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

diff --cc puppet/all-nodes-config.yaml
Simple merge

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

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

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge