Merge "composable neutron server"
authorJenkins <jenkins@review.openstack.org>
Fri, 10 Jun 2016 14:46:34 +0000 (14:46 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 10 Jun 2016 14:46:35 +0000 (14:46 +0000)
commita671a30b5196aa5953576928be526d70aed265fe
tree0b5e3280f91691601f133b5425d1df86899063cd
parentdae80694cbd9dee56ea9a530c421b6a2f456a691
parent08a201e23853455ffce6ff0d6c72163547ae7c06
Merge "composable neutron server"
overcloud-resource-registry-puppet.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp