Merge "Rename controller_admin_vip to controller_admin_host"
authorJenkins <jenkins@review.openstack.org>
Fri, 27 Jan 2017 18:59:25 +0000 (18:59 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 27 Jan 2017 18:59:25 +0000 (18:59 +0000)

Trivial merge