Merge "puppet: run keystone in wsgi"
authorJenkins <jenkins@review.openstack.org>
Thu, 11 Feb 2016 20:22:31 +0000 (20:22 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 11 Feb 2016 20:22:31 +0000 (20:22 +0000)
1  2 
puppet/hieradata/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge