Merge "puppet/loadbalancer: use puppet-tripleo"
authorJenkins <jenkins@review.openstack.org>
Wed, 18 Mar 2015 15:50:09 +0000 (15:50 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 18 Mar 2015 15:50:09 +0000 (15:50 +0000)
1  2 
puppet/controller-puppet.yaml
puppet/manifests/overcloud_controller.pp

Simple merge