From 7811c637db1ee7d0c96208779331d3d635449035 Mon Sep 17 00:00:00 2001 From: "Christopher H. Laco" Date: Tue, 27 May 2014 19:23:38 -0400 Subject: [PATCH] Reintroduce l3 router/gateway settings in l3 agent This partially reverts commits f37dc6e037450a1c6dd0d20e05f99185efa6124f, e969a6f69eefc722c6fcd5d41ddbd6c30d36ce5b Issue rcbops/chef-cookbooks#933 (cherry picked from commit 571259236b88652a4eef2185c5542b238a652f63) --- recipes/neutron-l3-agent.rb | 2 ++ templates/default/l3_agent.ini.erb | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/recipes/neutron-l3-agent.rb b/recipes/neutron-l3-agent.rb index ea6fa43..be1df64 100644 --- 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 index c2c9ce5..8842217 100644 --- 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