Merge "Enable Cisco Nexus and UCSM plugins"
authorJenkins <jenkins@review.openstack.org>
Wed, 16 Sep 2015 09:20:43 +0000 (09:20 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 16 Sep 2015 09:20:43 +0000 (09:20 +0000)
1  2 
puppet/controller-puppet.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge