Merge "Composable roles within services - NTP"
authorJenkins <jenkins@review.openstack.org>
Tue, 21 Jun 2016 16:19:30 +0000 (16:19 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 21 Jun 2016 16:19:30 +0000 (16:19 +0000)
1  2 
overcloud-resource-registry-puppet.yaml
overcloud.yaml
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

diff --cc overcloud.yaml
Simple merge
Simple merge