Merge "Composable roles within services - Redis"

diff --cc environments/puppet-pacemaker.yaml
Simple merge

diff --cc overcloud-resource-registry-puppet.yaml
Simple merge

diff --cc overcloud.yaml
Simple merge

diff --cc puppet/controller.yaml
Simple merge

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

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