Merge "horizon: be more flexible in hiera neutron"
authorJenkins <jenkins@review.openstack.org>
Fri, 27 Jan 2017 04:51:38 +0000 (04:51 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 27 Jan 2017 04:51:38 +0000 (04:51 +0000)

Trivial merge