From 7b7101f1c5ccd4d0722245613df8c8f7a67e79b9 Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Tue, 1 Dec 2015 22:17:42 +0000 Subject: [PATCH] Neutron FWaaS: Use generated configuration files if available Generate the Neutron FWaaS sample config files by using the oslo generator. The files are generated with a .sample extension and replace the static example configuration files. Once the generation code is delivered, the static config files will be removed. Change-Id: Ic8208850a27408c8fbeed80ecdb43345aa7dfaa4 Related-blueprint: autogen-neutron-conf-file Partial-bug: #1199963 Depends-On: I8e9113dfb88e5290f6eedd012d1a52fc35c3c88c --- lib/neutron_plugins/services/firewall | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/neutron_plugins/services/firewall b/lib/neutron_plugins/services/firewall index 1d81a21825..2b7f32d233 100644 --- a/lib/neutron_plugins/services/firewall +++ b/lib/neutron_plugins/services/firewall @@ -14,8 +14,11 @@ function neutron_fwaas_configure_common { } function neutron_fwaas_configure_driver { + # Uses oslo config generator to generate FWaaS sample configuration files + (cd $NEUTRON_FWAAS_DIR && exec ./tools/generate_config_file_samples.sh) + FWAAS_DRIVER_CONF_FILENAME=/etc/neutron/fwaas_driver.ini - cp $NEUTRON_FWAAS_DIR/etc/fwaas_driver.ini $FWAAS_DRIVER_CONF_FILENAME + cp $NEUTRON_FWAAS_DIR/etc/fwaas_driver.ini.sample $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"