Merge "Move Keepalived/HAproxy settings out of controller"
authorJenkins <jenkins@review.openstack.org>
Wed, 24 Aug 2016 18:55:45 +0000 (18:55 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 24 Aug 2016 18:55:45 +0000 (18:55 +0000)

Trivial merge