Merge "Composable Sahara services"
authorJenkins <jenkins@review.openstack.org>
Thu, 2 Jun 2016 15:04:49 +0000 (15:04 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Jun 2016 15:04:49 +0000 (15:04 +0000)
1  2 
overcloud.yaml
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

diff --cc overcloud.yaml
Simple merge
Simple merge