@@ -101,7 +101,6 @@ AGENT_META_BINARY="$NEUTRON_BIN_DIR/neutron-metadata-agent"

 # loaded from per-plugin  scripts in lib/neutron_plugins/

 Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini

 Q_L3_CONF_FILE=$NEUTRON_CONF_DIR/l3_agent.ini

-Q_FWAAS_CONF_FILE=$NEUTRON_CONF_DIR/fwaas_driver.ini

 Q_META_CONF_FILE=$NEUTRON_CONF_DIR/metadata_agent.ini

 # Default name for Neutron database

@@ -265,13 +264,8 @@ source $TOP_DIR/lib/neutron_plugins/services/loadbalancer

 # Hardcoding for 1 service plugin for now

 source $TOP_DIR/lib/neutron_plugins/services/metering

-# Firewall Service Plugin functions

-# ---------------------------------

-source $TOP_DIR/lib/neutron_plugins/services/firewall

-

 # L3 Service functions

 source $TOP_DIR/lib/neutron_plugins/services/l3

-

 # Use security group or not

 if has_neutron_plugin_security_group; then

     Q_USE_SECGROUP=${Q_USE_SECGROUP:-True}

@@ -332,10 +326,6 @@ function configure_mutnauq {

     if is_service_enabled q-metering; then

         _configure_neutron_metering

     fi

-    if is_service_enabled q-fwaas; then

-        deprecated "Configuring q-fwaas through devstack is deprecated"

-        _configure_neutron_fwaas

-    fi

     if is_service_enabled q-agt q-svc; then

         _configure_neutron_service

     fi

@@ -431,10 +421,6 @@ function install_mutnauq {

     git_clone $NEUTRON_REPO $NEUTRON_DIR $NEUTRON_BRANCH

     setup_develop $NEUTRON_DIR

-    if is_service_enabled q-fwaas; then

-        git_clone $NEUTRON_FWAAS_REPO $NEUTRON_FWAAS_DIR $NEUTRON_FWAAS_BRANCH

-        setup_develop $NEUTRON_FWAAS_DIR

-    fi

     if is_service_enabled q-lbaas; then

         git_clone $NEUTRON_LBAAS_REPO $NEUTRON_LBAAS_DIR $NEUTRON_LBAAS_BRANCH

         setup_develop $NEUTRON_LBAAS_DIR

@@ -576,9 +562,6 @@ function stop_mutnauq_other {

     if is_service_enabled q-lbaas; then

         neutron_lbaas_stop

     fi

-    if is_service_enabled q-fwaas; then

-        neutron_fwaas_stop

-    fi

     if is_service_enabled q-metering; then

         neutron_metering_stop

     fi

@@ -853,14 +836,6 @@ function _configure_neutron_metering {

     neutron_agent_metering_configure_agent

 }

-function _configure_neutron_fwaas {

-    if [ -f $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf ]; then

-        cp $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf $NEUTRON_CONF_DIR

-    fi

-    neutron_fwaas_configure_common

-    neutron_fwaas_configure_driver

-}

-

 function _configure_dvr {

     iniset $NEUTRON_CONF DEFAULT router_distributed True

     iniset $Q_L3_CONF_FILE DEFAULT agent_mode $Q_DVR_MODE

deleted file mode 100644

@@ -1,33 +0,0 @@

-#!/bin/bash

-

-# Neutron firewall plugin

-# ---------------------------

-

-# Save trace setting

-_XTRACE_NEUTRON_FIREWALL=$(set +o | grep xtrace)

-set +o xtrace

-

-FWAAS_PLUGIN=${FWAAS_PLUGIN:-neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin}

-FWAAS_DRIVER=${FWAAS_DRIVER:-neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver}

-

-function neutron_fwaas_configure_common {

-    _neutron_service_plugin_class_add $FWAAS_PLUGIN

-}

-

-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.sample $FWAAS_DRIVER_CONF_FILENAME

-

-    iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas enabled True

-    iniset_multiline $FWAAS_DRIVER_CONF_FILENAME fwaas driver "$FWAAS_DRIVER"

-}

-

-function neutron_fwaas_stop {

-    :

-}

-

-# Restore xtrace

-$_XTRACE_NEUTRON_FIREWALL