From a2ed055810bc3ef22b91faffb7f6308908527be3 Mon Sep 17 00:00:00 2001 From: "Sean M. Collins" Date: Wed, 11 May 2016 15:35:10 -0400 Subject: [PATCH] Fix _configure_neutron_l3_agent I goofed when moving it over, and it looks like the calls to _move_neutron_addresses_route got clobbered. Changes like a0d1b0151a9d9e169e6342f36a073e8154119924 ended up getting dropped on the floor, so let's reintroduce them. Change-Id: I3bbfbc56e2c663c47a03659a1dff96443c13af47 --- lib/neutron_plugins/services/l3 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/neutron_plugins/services/l3 b/lib/neutron_plugins/services/l3 index 177dc1f028..4c4730e125 100644 --- a/lib/neutron_plugins/services/l3 +++ b/lib/neutron_plugins/services/l3 @@ -90,29 +90,25 @@ function _determine_config_l3 { } function _configure_neutron_l3_agent { - local cfg_file Q_L3_ENABLED=True cp $NEUTRON_DIR/etc/l3_agent.ini.sample $Q_L3_CONF_FILE iniset $Q_L3_CONF_FILE DEFAULT verbose True iniset $Q_L3_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL - iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE - iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" + iniset $Q_L3_CONF_FILE AGENT root_helper "$Q_RR_COMMAND" if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then - iniset $Q_L3_CONF_FILE agent root_helper_daemon "$Q_RR_DAEMON_COMMAND" + iniset $Q_L3_CONF_FILE AGENT root_helper_daemon "$Q_RR_DAEMON_COMMAND" fi _neutron_setup_interface_driver $Q_L3_CONF_FILE neutron_plugin_configure_l3_agent - if [[ $(ip -f inet a s dev "$PUBLIC_INTERFACE" | grep -c 'global') != 0 ]]; then - _move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" True "inet" - fi + _move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" True False "inet" if [[ $(ip -f inet6 a s dev "$PUBLIC_INTERFACE" | grep -c 'global') != 0 ]]; then - _move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" False "inet6" + _move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" False False "inet6" fi }