Merge "Nova now requires an api database to be created"
authorJenkins <jenkins@review.openstack.org>
Fri, 12 Feb 2016 13:19:44 +0000 (13:19 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 12 Feb 2016 13:19:44 +0000 (13:19 +0000)
1  2 
puppet/controller.yaml
puppet/hieradata/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge
Simple merge