openstack/devstack
Code Issues Proposed changes

make fwaas plugin and driver configurable

Browse Source 
user can pass fwaas plugin and driver from localrc

(cherry-picked from commit 8eab6ad31b)
Change-Id: Id956d4d7e62ba81f77319c199c9cb9f354b13d12
This commit is contained in:
Jerry Zhao
2016-02-01 18:22:21 -08:00
committed by Ian Wienand
parent bbcc74abcc
commit 4b80bc25e8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/neutron_plugins/services/firewall
View File

@@ -5,7 +5,8 @@
FW_XTRACE=$(set +o | grep xtrace)
set +o xtrace
FWAAS_PLUGIN=neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin
FWAAS_PLUGIN=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin}
FWAAS_DRIVER=${FWAAS_DRIVER:-neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver}
function neutron_fwaas_configure_common {
_neutron_service_plugin_class_add $FWAAS_PLUGIN
@@ -16,7 +17,7 @@ function neutron_fwaas_configure_driver {
cp $NEUTRON_FWAAS_DIR/etc/fwaas_driver.ini $FWAAS_DRIVER_CONF_FILENAME
iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas enabled True
iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas driver "neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver"
iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas driver "$FWAAS_DRIVER"
}
function neutron_fwaas_stop {