openstack
/
neutron-fwaas
Code Issues Proposed changes

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
This commit is contained in:
YAMAMOTO Takashi 2016-08-03 12:25:08 +09:00 committed by Cao Xuan Hoang
parent 211e00d811
commit ea23bbc3ee
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/plugin.sh
View File

@ -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

2
devstack/settings
View File

@ -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}