Browse code
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
Martin Hickey authored on 2015/12/02 07:17:42Showing 1 changed files
| ... | ... |
@@ -14,8 +14,11 @@ function neutron_fwaas_configure_common {
|
| 14 | 14 |
} |
| 15 | 15 |
|
| 16 | 16 |
function neutron_fwaas_configure_driver {
|
| 17 |
+ # Uses oslo config generator to generate FWaaS sample configuration files |
|
| 18 |
+ (cd $NEUTRON_FWAAS_DIR && exec ./tools/generate_config_file_samples.sh) |
|
| 19 |
+ |
|
| 17 | 20 |
FWAAS_DRIVER_CONF_FILENAME=/etc/neutron/fwaas_driver.ini |
| 18 |
- cp $NEUTRON_FWAAS_DIR/etc/fwaas_driver.ini $FWAAS_DRIVER_CONF_FILENAME |
|
| 21 |
+ cp $NEUTRON_FWAAS_DIR/etc/fwaas_driver.ini.sample $FWAAS_DRIVER_CONF_FILENAME |
|
| 19 | 22 |
|
| 20 | 23 |
iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas enabled True |
| 21 | 24 |
iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas driver "neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver" |