summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-30 09:35:19 +0000
committerGerrit Code Review <review@openstack.org>2016-03-30 09:35:19 +0000
commitcccb984eb76febfedfe7118e27d3d82f31a224e2 (patch)
tree340d8e3d8cbee01b47c1e6c423ff14c898bd1d1c
parent014bc12e8def6b97fa7581bf28d3e5ccd0d49bad (diff)
parentbc00cf7e99e68b61450234de1ecfb4aa96aec174 (diff)
Merge "compute: restart OVS agent on neutron.conf changes"
-rw-r--r--puppet/manifests/overcloud_compute.pp10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index ee77518e..cc58cb14 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -168,6 +168,16 @@ elsif hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plug
}
else {
+ # NOTE: this code won't live in puppet-neutron until Neutron OVS agent
+ # can be gracefully restarted. See https://review.openstack.org/#/c/297211
+ # In the meantime, it's safe to restart the agent on each change in neutron.conf,
+ # because Puppet changes are supposed to be done during bootstrap and upgrades.
+ # Some resource managed by Neutron_config (like messaging and logging options) require
+ # a restart of OVS agent. This code does it.
+ # In Newton, OVS agent will be able to be restarted gracefully so we'll drop the code
+ # from here and fix it in puppet-neutron.
+ Neutron_config<||> ~> Service['neutron-ovs-agent-service']
+
include ::neutron::plugins::ml2
include ::neutron::agents::ml2::ovs