openstack
/
neutron-fwaas
Code Issues Proposed changes

Set NETWORK_API_EXTENSIONS in fwaas devstack plugin 

The NETWORK_API_EXTENSIONS environment variable needs to be controlled
so that the fwaas or fwaas_v2 extensions can be properly added.  This is
necessary because the tempest tests for v1 and v2 trigger based on what
extensions are loaded.  Without this, NETWORK_API_EXTENSIONS would
default to 'all', and the fwaas_v2 tests would run when fwaas v1 is
loaded and vice versa.

Change-Id: I12d765c38c1cfc7c397fef4497e9f11f260f4517
Needed-By: I8b8ddf2a9cc4d2f18c4b32917630c2a26ee0d713
Needed-By: I9fc39c5adcf136fce520c329f48cbad60cd21861
This commit is contained in:
Nate Johnston 2016-11-18 15:35:26 +00:00
parent f7c7d6b6e7
commit 8bf87a0b05
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -39,13 +39,17 @@ function install_fwaas() {
}
function configure_fwaas_v1() {
echo_summary "Configuring q-fwaas for FWaaS v1"
neutron_fwaas_configure_driver fwaas
iniset_multiline $Q_L3_CONF_FILE fwaas agent_version v1
NETWORK_API_EXTENSIONS+=,fwaas,fwaasrouterinsertion
}
function configure_fwaas_v2() {
echo_summary "Configuring q-fwaas for FWaaS v2"
neutron_fwaas_configure_driver fwaas_v2
iniset_multiline $Q_L3_CONF_FILE fwaas agent_version v2
NETWORK_API_EXTENSIONS+=,fwaas_v2
}
function init_fwaas() {
@ -100,13 +104,10 @@ if is_service_enabled q-svc && ( is_service_enabled q-fwaas || is_service_enable
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured
if is_service_enabled q-fwaas-v1; then
echo_summary "Configuring q-fwaas for FWaaS v1"
configure_fwaas_v1
elif is_service_enabled q-fwaas-v2; then
echo_summary "Configuring q-fwaas for FWaaS v2"
configure_fwaas_v2
else
echo_summary "Configuring q-fwaas for FWaaS v1"
configure_fwaas_v1
fi

10
devstack/settings
View File

@ -1,3 +1,13 @@
FWAAS_DRIVER=${FWAAS_DRIVER:-iptables}
FWAAS_PLUGIN_V1=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin}
FWAAS_PLUGIN_V2=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin_v2.FirewallPluginV2}
NETWORK_API_EXTENSIONS=agent,binding,dhcp_agent_scheduler,external-net
NETWORK_API_EXTENSIONS+=,ext-gw-mode,extra_dhcp_opts,quotas,router
NETWORK_API_EXTENSIONS+=,security-group,subnet_allocation
NETWORK_API_EXTENSIONS+=,network-ip-availability,auto-allocated-topology
NETWORK_API_EXTENSIONS+=,timestamp_core,tag,service-type,rbac-policies
NETWORK_API_EXTENSIONS+=,standard-attr-description
NETWORK_API_EXTENSIONS+=,pagination
NETWORK_API_EXTENSIONS+=,sorting
NETWORK_API_EXTENSIONS+=,project-id