@@ -107,7 +107,6 @@ GITDIR["python-neutronclient"]=$DEST/python-neutronclient

 NEUTRON_DIR=$DEST/neutron

 NEUTRON_FWAAS_DIR=$DEST/neutron-fwaas

-NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas

 NEUTRON_VPNAAS_DIR=$DEST/neutron-vpnaas

 NEUTRON_AUTH_CACHE_DIR=${NEUTRON_AUTH_CACHE_DIR:-/var/cache/neutron}

@@ -122,9 +121,6 @@ NEUTRON_CONF_DIR=/etc/neutron

 NEUTRON_CONF=$NEUTRON_CONF_DIR/neutron.conf

 export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}

-# Default provider for load balancer service

-DEFAULT_LB_PROVIDER=LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default

-

 # Default provider for VPN service

 DEFAULT_VPN_PROVIDER=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default

@@ -347,12 +343,6 @@ if [ -f $TOP_DIR/lib/neutron_plugins/$Q_PLUGIN ]; then

     source $TOP_DIR/lib/neutron_plugins/$Q_PLUGIN

 fi

-# Agent loadbalancer service plugin functions

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

-

-# Hardcoding for 1 service plugin for now

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

-

 # Agent metering service plugin functions

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

@@ -442,10 +432,6 @@ function configure_neutron {

     iniset_rpc_backend neutron $NEUTRON_CONF

     # goes before q-svc to init Q_SERVICE_PLUGIN_CLASSES

-    if is_service_enabled q-lbaas; then

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

-        _configure_neutron_lbaas

-    fi

     if is_service_enabled q-metering; then

         _configure_neutron_metering

     fi

@@ -657,10 +643,6 @@ function install_neutron {

         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

-    fi

     if is_service_enabled q-vpn; then

         git_clone $NEUTRON_VPNAAS_REPO $NEUTRON_VPNAAS_DIR $NEUTRON_VPNAAS_BRANCH

         setup_develop $NEUTRON_VPNAAS_DIR

@@ -704,10 +686,6 @@ function install_neutron_agent_packages {

     if is_service_enabled q-agt q-dhcp q-l3; then

         neutron_plugin_install_agent_packages

     fi

-

-    if is_service_enabled q-lbaas; then

-        neutron_agent_lbaas_install_agent_packages

-    fi

 }

 # Start running processes, including screen

@@ -770,7 +748,6 @@ function start_neutron_other_agents {

     fi

     run_process q-meta "$AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file=$Q_META_CONF_FILE"

-    run_process q-lbaas "$AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"

     run_process q-metering "$AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME"

     if [ "$VIRT_DRIVER" = 'xenserver' ]; then

@@ -809,9 +786,6 @@ function stop_neutron_other {

         stop_process q-meta

     fi

-    if is_service_enabled q-lbaas; then

-        neutron_lbaas_stop

-    fi

     if is_service_enabled q-fwaas; then

         neutron_fwaas_stop

     fi

@@ -916,7 +890,7 @@ function cleanup_neutron {

     fi

     # delete all namespaces created by neutron

-    for ns in $(sudo ip netns list | grep -o -E '(qdhcp|qrouter|qlbaas|fip|snat)-[0-9a-f-]*'); do

+    for ns in $(sudo ip netns list | grep -o -E '(qdhcp|qrouter|fip|snat)-[0-9a-f-]*'); do

         sudo ip netns delete ${ns}

     done

 }

@@ -1109,18 +1083,6 @@ function _configure_neutron_ceilometer_notifications {

     iniset $NEUTRON_CONF oslo_messaging_notifications driver messaging

 }

-function _configure_neutron_lbaas {

-    # Uses oslo config generator to generate LBaaS sample configuration files

-    (cd $NEUTRON_LBAAS_DIR && exec ./tools/generate_config_file_samples.sh)

-

-    if [ -f $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf.sample ]; then

-        cp $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf.sample $NEUTRON_CONF_DIR/neutron_lbaas.conf

-        iniset $NEUTRON_CONF_DIR/neutron_lbaas.conf service_providers service_provider $DEFAULT_LB_PROVIDER

-    fi

-    neutron_agent_lbaas_configure_common

-    neutron_agent_lbaas_configure_agent

-}

-

 function _configure_neutron_metering {

     neutron_agent_metering_configure_common

     neutron_agent_metering_configure_agent

deleted file mode 100644

@@ -1,51 +0,0 @@

-#!/bin/bash

-

-# Neutron loadbalancer plugin

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

-

-# Save trace setting

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

-set +o xtrace

-

-

-AGENT_LBAAS_BINARY="$NEUTRON_BIN_DIR/neutron-lbaas-agent"

-LBAAS_PLUGIN=neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin

-

-function neutron_agent_lbaas_install_agent_packages {

-    if is_ubuntu || is_fedora || is_suse; then

-        install_package haproxy

-    fi

-}

-

-function neutron_agent_lbaas_configure_common {

-    _neutron_service_plugin_class_add $LBAAS_PLUGIN

-    _neutron_deploy_rootwrap_filters $NEUTRON_LBAAS_DIR

-}

-

-function neutron_agent_lbaas_configure_agent {

-    LBAAS_AGENT_CONF_PATH=/etc/neutron/services/loadbalancer/haproxy

-    mkdir -p $LBAAS_AGENT_CONF_PATH

-

-    LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini"

-

-    cp $NEUTRON_LBAAS_DIR/etc/lbaas_agent.ini.sample $LBAAS_AGENT_CONF_FILENAME

-

-    # ovs_use_veth needs to be set before the plugin configuration

-    # occurs to allow plugins to override the setting.

-    iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT ovs_use_veth $Q_OVS_USE_VETH

-

-    neutron_plugin_setup_interface_driver $LBAAS_AGENT_CONF_FILENAME

-

-    if is_fedora; then

-        iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT user_group "nobody"

-        iniset $LBAAS_AGENT_CONF_FILENAME haproxy user_group "nobody"

-    fi

-}

-

-function neutron_lbaas_stop {

-    pids=$(ps aux | awk '/haproxy/ { print $2 }')

-    [ ! -z "$pids" ] && sudo kill $pids || true

-}

-

-# Restore xtrace

-$_XTRACE_NEUTRON_LB

@@ -238,10 +238,6 @@ NEUTRON_BRANCH=${NEUTRON_BRANCH:-master}

 NEUTRON_FWAAS_REPO=${NEUTRON_FWAAS_REPO:-${GIT_BASE}/openstack/neutron-fwaas.git}

 NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-master}

-# neutron lbaas service

-NEUTRON_LBAAS_REPO=${NEUTRON_LBAAS_REPO:-${GIT_BASE}/openstack/neutron-lbaas.git}

-NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-master}

-

 # neutron vpnaas service

 NEUTRON_VPNAAS_REPO=${NEUTRON_VPNAAS_REPO:-${GIT_BASE}/openstack/neutron-vpnaas.git}

 NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-master}