Merge "Enable NetApp Backends in Cinder"
authorJenkins <jenkins@review.openstack.org>
Mon, 8 Jun 2015 15:31:29 +0000 (15:31 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 8 Jun 2015 15:31:29 +0000 (15:31 +0000)
1  2 
overcloud-resource-registry-puppet.yaml
puppet/controller-puppet.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge