Merge "composable neutron ml2 and ovs agent"
authorJenkins <jenkins@review.openstack.org>
Fri, 10 Jun 2016 14:47:19 +0000 (14:47 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 10 Jun 2016 14:47:19 +0000 (14:47 +0000)
commitd7fd9b075fad85efe4ab7809d4e1e66b3ae6c196
tree45f8ca781df16a4e68489bd9aefb337d000adbc5
parenta671a30b5196aa5953576928be526d70aed265fe
parent89fbd07afef275e0f818d3575fd0be4a1d4248cf
Merge "composable neutron ml2 and ovs agent"
overcloud-resource-registry-puppet.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp