Merge "updating enable_ceph conditions for controller"
authorJenkins <jenkins@review.openstack.org>
Thu, 7 Jan 2016 23:59:30 +0000 (23:59 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 7 Jan 2016 23:59:30 +0000 (23:59 +0000)
commit7c7a604893b4f0e9345dc93e6c80ebe916e0cb59
treecef574cc5bee624c7e7b3b7bb5e8e91a8093e679
parente1484c6e2fc4052a51e07b9e1847777d57d2ccda
parenta27cca0ec38131dad67f6277f13114685b96d9f7
Merge "updating enable_ceph conditions for controller"
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp