From 4b80bc25e8f21e0caadd875b00da2c8f9df70b50 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Mon, 1 Feb 2016 18:22:21 -0800 Subject: [PATCH] make fwaas plugin and driver configurable user can pass fwaas plugin and driver from localrc (cherry-picked from commit 8eab6ad31b7d34f26c912e7c1e60d39bf596124a) Change-Id: Id956d4d7e62ba81f77319c199c9cb9f354b13d12 --- lib/neutron_plugins/services/firewall | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/neutron_plugins/services/firewall b/lib/neutron_plugins/services/firewall index 61a148e596..76f6f06960 100644 --- a/lib/neutron_plugins/services/firewall +++ b/lib/neutron_plugins/services/firewall @@ -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 {