Merge "Move neutron settings out of puppet/compute.yaml"
authorJenkins <jenkins@review.openstack.org>
Tue, 16 Aug 2016 21:58:09 +0000 (21:58 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 16 Aug 2016 21:58:09 +0000 (21:58 +0000)

Trivial merge