openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "compute: restart OVS agent on neutron.conf changes"

This commit is contained in:
Jenkins 2016-03-30 09:35:19 +00:00 committed by Gerrit Code Review
parent 014bc12e8d bc00cf7e99
commit cccb984eb7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet/manifests/overcloud_compute.pp
View File

@ -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