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:
parent
211e00d811
commit
ea23bbc3ee
|
@ -57,14 +57,8 @@ function neutron_fwaas_configure_common {
|
||||||
}
|
}
|
||||||
|
|
||||||
function neutron_fwaas_configure_driver {
|
function neutron_fwaas_configure_driver {
|
||||||
# Uses oslo config generator to generate FWaaS sample configuration files
|
iniset_multiline $Q_L3_CONF_FILE fwaas enabled True
|
||||||
(cd $NEUTRON_FWAAS_DIR && exec ./tools/generate_config_file_samples.sh)
|
iniset_multiline $Q_L3_CONF_FILE fwaas driver $FWAAS_DRIVER
|
||||||
|
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# check for service enabled
|
# check for service enabled
|
||||||
|
|
|
@ -1,4 +1,2 @@
|
||||||
FWAAS_DRIVER=${FWAAS_DRIVER:-iptables}
|
FWAAS_DRIVER=${FWAAS_DRIVER:-iptables}
|
||||||
FWAAS_PLUGIN=${FWAAS_PLUGIN:-firewall}
|
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}
|
|
||||||
|
|
Loading…
Reference in New Issue