From ea23bbc3ee4cc90280375153d13f59cb85ffe6f2 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 3 Aug 2016 12:25:08 +0900 Subject: [PATCH] devstack: Don't bother to have our own l3 agent config file Instead, simply add our config to Q_L3_CONF_FILE. Closes-Bug: #1608401 Closes-Bug: #1609213 Depends-On: I630969b3556bcffba506cab02a09cc83f4430c88 Change-Id: Ibd186a81c5483ede3f1286e165efb55225198c51 --- devstack/plugin.sh | 10 ++-------- devstack/settings | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index a3073f22a..4ded72571 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -57,14 +57,8 @@ function neutron_fwaas_configure_common { } function neutron_fwaas_configure_driver { - # Uses oslo config generator to generate FWaaS sample configuration files - (cd $NEUTRON_FWAAS_DIR && exec ./tools/generate_config_file_samples.sh) - - cp $NEUTRON_FWAAS_DIR/etc/$FWAAS_DRIVER_CONF_FILENAME.sample $FWAAS_CONF_FILE - - iniset_multiline $FWAAS_CONF_FILE fwaas enabled True - iniset_multiline $FWAAS_CONF_FILE fwaas driver $FWAAS_DRIVER - #iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES + iniset_multiline $Q_L3_CONF_FILE fwaas enabled True + iniset_multiline $Q_L3_CONF_FILE fwaas driver $FWAAS_DRIVER } # check for service enabled diff --git a/devstack/settings b/devstack/settings index f054394f4..26378e47a 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1,4 +1,2 @@ FWAAS_DRIVER=${FWAAS_DRIVER:-iptables} FWAAS_PLUGIN=${FWAAS_PLUGIN:-firewall} -FWAAS_DRIVER_CONF_FILENAME=${FWAAS_DRIVER_CONF_FILENAME:-fwaas_driver.ini} -FWAAS_CONF_FILE=${Q_FWAAS_CONF_FILE:-$NEUTRON_CONF_DIR/$FWAAS_DRIVER_CONF_FILENAME}