Merge "Use service-specific servernames for haproxy"
authorJenkins <jenkins@review.openstack.org>
Wed, 5 Oct 2016 13:22:50 +0000 (13:22 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 5 Oct 2016 13:22:50 +0000 (13:22 +0000)

Trivial merge