openstack/cookbook-openstack-network
Code Issues Proposed changes

Make sure the linuxbridge agent can be restarted

Browse Source 
Add notifier to restart linuxbridge-agent when linuxbridge plugin
configuration file is updated.

Closes-bug: #1254981

Change-Id: I67e071d35c77f6ec36c8f2fd2bea34616801a486
This commit is contained in:
gengjh
2013-11-26 17:54:13 +08:00
parent 802bb695c4
commit 3e2d344df0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
recipes/common.rb
View File

@@ -271,6 +271,7 @@ when "hyperv"
when "linuxbridge" when "linuxbridge"
template_file = "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" template_file = "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini"
template "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" do template "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" do
source "plugins/linuxbridge/linuxbridge_conf.ini.erb" source "plugins/linuxbridge/linuxbridge_conf.ini.erb"
owner node["openstack"]["network"]["platform"]["user"] owner node["openstack"]["network"]["platform"]["user"]
@@ -281,6 +282,10 @@ when "linuxbridge"
) )
notifies :restart, "service[neutron-server]", :delayed notifies :restart, "service[neutron-server]", :delayed
if node.run_list.expand(node.chef_environment).recipes.include?("openstack-network::linuxbridge")
notifies :restart, "service[neutron-plugin-linuxbridge-agent]", :delayed
end
end end
when "midonet" when "midonet"
@@ -332,11 +337,6 @@ when "openvswitch"
template_file = "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" template_file = "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
service "neutron-plugin-openvswitch-agent" do
service_name platform_options["neutron_openvswitch_agent_service"]
action :nothing
end
template "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" do template "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" do
source "plugins/openvswitch/ovs_neutron_plugin.ini.erb" source "plugins/openvswitch/ovs_neutron_plugin.ini.erb"
owner node["openstack"]["network"]["platform"]["user"] owner node["openstack"]["network"]["platform"]["user"]