Merge "Enable Equallogic Backends in Cinder"
authorJenkins <jenkins@review.openstack.org>
Wed, 6 Jan 2016 16:40:40 +0000 (16:40 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 6 Jan 2016 16:40:40 +0000 (16:40 +0000)
1  2 
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge