Merge "Don't check haproxy if external load-balancer is used." into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Mon, 3 Apr 2017 14:54:03 +0000 (14:54 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 3 Apr 2017 14:54:03 +0000 (14:54 +0000)

Trivial merge