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)
commitbcd726f1242d78169e6a5687e998473c1043c622
tree789a1805d1d9488029c5b6596c2c570371f57a65
parent006daae9253b6545fab708c204c30325318554f2
parentd9409b48ad6c9052defa05c79f0d28535d6ba933
Merge "Composable Sahara services"
overcloud.yaml
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp