Merge "loadbalancer: update hiera parameters for HAproxy/keepalived split"
authorJenkins <jenkins@review.openstack.org>
Tue, 31 May 2016 12:40:32 +0000 (12:40 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 31 May 2016 12:40:32 +0000 (12:40 +0000)
1  2 
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge