Merge "Make enabling of controller services configurable."
authorJenkins <jenkins@review.openstack.org>
Wed, 2 Dec 2015 14:39:59 +0000 (14:39 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 2 Dec 2015 14:39:59 +0000 (14:39 +0000)
1  2 
puppet/controller.yaml
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge