Browse code

Merge "make fwaas plugin and driver configurable"

Jenkins authored on 2016/02/11 09:54:15
Showing 1 changed files
... ...
@@ -7,7 +7,8 @@
7 7
 _XTRACE_NEUTRON_FIREWALL=$(set +o | grep xtrace)
8 8
 set +o xtrace
9 9
 
10
-FWAAS_PLUGIN=neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin
10
+FWAAS_PLUGIN=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin}
11
+FWAAS_DRIVER=${FWAAS_DRIVER:-neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver}
11 12
 
12 13
 function neutron_fwaas_configure_common {
13 14
     _neutron_service_plugin_class_add $FWAAS_PLUGIN
... ...
@@ -21,7 +22,7 @@ function neutron_fwaas_configure_driver {
21 21
     cp $NEUTRON_FWAAS_DIR/etc/fwaas_driver.ini.sample $FWAAS_DRIVER_CONF_FILENAME
22 22
 
23 23
     iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas enabled True
24
-    iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas driver "neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver"
24
+    iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas driver "$FWAAS_DRIVER"
25 25
 }
26 26
 
27 27
 function neutron_fwaas_stop {