From 337c4847cf90869ed128089ca6c69e64b378e927 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 11 Feb 2014 13:37:14 -0600 Subject: [PATCH] updated Neutron L3 Agent setup * Added guard to recipe "recipes/neutron-l3-agent.rb" which skips the bridge create resource if the external_bridge attribute is nil or an empty string. * Change the default attribute for external_bridge to an empty string as this will provide for the most use cases without overriding the attribute. --- attributes/default.rb | 2 +- recipes/neutron-l3-agent.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 582fa1b..17a8604 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -132,7 +132,7 @@ default["neutron"]["ovs"]["tunnel_ranges"] = "1:1000" # Enumerating ranges of GRE tunnel IDs that are available for tenant network allocation (if GRE) default["neutron"]["ovs"]["integration_bridge"] = "br-int" # Don't change without a good reason.. default["neutron"]["ovs"]["tunnel_bridge"] = "br-tun" # only used if tunnel_ranges is set -default["neutron"]["ovs"]["external_bridge"] = "br-ex" +default["neutron"]["ovs"]["external_bridge"] = "" default["neutron"]["ovs"]["external_interface"] = "eth1" default["neutron"]["ovs"]["network"]="nova" default["neutron"]["ovs"]["firewall_driver"] = diff --git a/recipes/neutron-l3-agent.rb b/recipes/neutron-l3-agent.rb index 6ea8d27..fbe5de8 100644 --- a/recipes/neutron-l3-agent.rb +++ b/recipes/neutron-l3-agent.rb @@ -46,12 +46,16 @@ subscribes :restart, "template[/etc/neutron/l3-agent.ini]", :delayed end + execute "create external bridge" do command "ovs-vsctl add-br #{node["neutron"]["ovs"]["external_bridge"]}" action :run not_if "ovs-vsctl get bridge \"#{node["neutron"]["ovs"]["external_bridge"]}\" name" + not_if { node["neutron"]["ovs"]["external_bridge"].nil? } + not_if { node["neutron"]["ovs"]["external_bridge"].empty? } end + nova_info = get_access_endpoint("nova-api-os-compute", "nova", "api") metadata_ip =