Merge "Add net_vip_map_external to be used for an external balancer"
authorJenkins <jenkins@review.openstack.org>
Thu, 26 Nov 2015 10:31:31 +0000 (10:31 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 26 Nov 2015 10:31:31 +0000 (10:31 +0000)
1  2 
overcloud-resource-registry-puppet.yaml
overcloud-without-mergepy.yaml

Simple merge