Merge "Remove conditional for neutron l3_ha"
authorJenkins <jenkins@review.openstack.org>
Thu, 24 Nov 2016 17:30:28 +0000 (17:30 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 24 Nov 2016 17:30:28 +0000 (17:30 +0000)

Trivial merge