Merge pull request rcbops-cookbooks#120 from cloudnull/l3-agent-ex-br

Merged automatically by jenkins after successful build test
claco · Feb 11, 2014 · 491cb31 · 491cb31
2 parents d8bc62e + 337c484
commit 491cb31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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 =