Browse code

Merge "make fwaas plugin and driver configurable" into stable/liberty

Jenkins authored on 2016/02/27 01:34:47
Showing 1 changed files
... ...
@@ -5,7 +5,8 @@
5 5
 FW_XTRACE=$(set +o | grep xtrace)
6 6
 set +o xtrace
7 7
 
8
-FWAAS_PLUGIN=neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin
8
+FWAAS_PLUGIN=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin}
9
+FWAAS_DRIVER=${FWAAS_DRIVER:-neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver}
9 10
 
10 11
 function neutron_fwaas_configure_common {
11 12
     _neutron_service_plugin_class_add $FWAAS_PLUGIN
... ...
@@ -16,7 +17,7 @@ function neutron_fwaas_configure_driver {
16 16
     cp $NEUTRON_FWAAS_DIR/etc/fwaas_driver.ini $FWAAS_DRIVER_CONF_FILENAME
17 17
 
18 18
     iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas enabled True
19
-    iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas driver "neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver"
19
+    iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas driver "$FWAAS_DRIVER"
20 20
 }
21 21
 
22 22
 function neutron_fwaas_stop {