Reintroduce l3 router/gateway settings in l3 agent

This partially reverts commits f37dc6e, e969a6f Issue rcbops/chef-cookbooks#933 (cherry picked from commit 5712592)
claco · May 27, 2014 · 7811c63 · 7811c63
1 parent 7df0dd7
commit 7811c63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/recipes/neutron-l3-agent.rb b/recipes/neutron-l3-agent.rb
@@ -70,6 +70,8 @@
     "neutron_external_bridge" => node["neutron"][plugin]["external_bridge"],
     "nova_metadata_ip" => metadata_ip,
     "neutron_plugin" => node["neutron"]["plugin"],
+    "l3_router_id" => (node["neutron"]["l3"]["router_id"] rescue nil),
+    "l3_gateway_net_id" => (node["neutron"]["l3"]["gateway_external_net_id"] rescue nil),
     "send_arp_for_ha" => node["neutron"]["send_arp_for_ha"]
   )
   notifies :restart, "service[neutron-l3-agent]", :delayed

diff --git a/templates/default/l3_agent.ini.erb b/templates/default/l3_agent.ini.erb
@@ -1,6 +1,10 @@
 [DEFAULT]
 external_network_bridge = <%= @neutron_external_bridge %>
 
+# Once networks are created please update the environment variables neutron[l3][router_id], neutron[l3][gateway_external_net_id]
+router_id = <%= @l3_router_id %>
+gateway_external_network_id = <%= @l3_gateway_net_id %>
+
 metadata_ip = <%= @nova_metadata_ip %>
 metadata_port = 8775