From 9cea44c77904ba12ca6c492ccc688293e35c318e Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Mon, 13 May 2019 14:47:24 +0200
Subject: [PATCH] Remove Neutron LBaaS

Removes from upstream Neutron in Train release and will be
removed from puppet-neutron in this [1] commit.

[1] https://review.opendev.org/#/c/658801/

Change-Id: Ica68eacc724dad6207b9f085198f921db0279ef6
---
 README.md            |  1 -
 manifests/neutron.pp | 11 ++---------
 manifests/tempest.pp |  1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 07ca703ef..ab6587484 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,6 @@ scenario](#all-in-one).
 | glance     |     rbd     |     swift   |     file    |  swift+rgw  |    file      |
 | nova       |     rbd     |       X     |       X     |     rbd     |      X       |
 | neutron    |     ovs     |      ovs    | linuxbridge |     ovs     |     ovs      |
-| lbaas      |     v2      |      v2     |     v2      |             |     v2       |
 | cinder     |     rbd     |     iscsi   |             |             |   iscsi      |
 | ceilometer |      X      |             |             |             |              |
 | aodh       |      X      |             |             |             |              |
diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 73376b26c..bf46af14a 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -133,7 +133,7 @@ class openstack_integration::neutron (
     true    => 'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin',
     default => undef,
   }
-  $plugins_list = delete_undef_values(['router', 'metering', 'firewall_v2', 'lbaasv2', 'qos', 'trunk', $bgpvpn_plugin, $l2gw_plugin, $bgp_dr_plugin])
+  $plugins_list = delete_undef_values(['router', 'metering', 'firewall_v2', 'qos', 'trunk', $bgpvpn_plugin, $l2gw_plugin, $bgp_dr_plugin])
 
   if $driver == 'linuxbridge' {
       $global_physnet_mtu    = '1450'
@@ -181,9 +181,7 @@ class openstack_integration::neutron (
     www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
     memcached_servers    => $::openstack_integration::config::memcached_servers,
   }
-  $providers_list = delete_undef_values(['LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',
-                                        'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',
-                                        'FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default',
+  $providers_list = delete_undef_values(['FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default',
                                         $l2gw_provider])
 
   if $::osfamily == 'Debian' {
@@ -203,7 +201,6 @@ class openstack_integration::neutron (
     ensure_dr_package        => $bgp_dragent_enabled,
   }
 
-  class { '::neutron::services::lbaas': }
   class { '::neutron::plugins::ml2':
     type_drivers         => ['vxlan', 'vlan', 'flat'],
     tenant_network_types => ['vxlan', 'vlan', 'flat'],
@@ -230,10 +227,6 @@ class openstack_integration::neutron (
     metadata_host     => $metadata_host,
     metadata_protocol => $metadata_protocol,
   }
-  class { '::neutron::agents::lbaas':
-    interface_driver => $driver,
-    debug            => true,
-  }
   class { '::neutron::agents::l3':
     interface_driver => $driver,
     debug            => true,
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index cc495f198..cd41bc49b 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -228,7 +228,6 @@ class openstack_integration::tempest (
     nova_available                   => $nova,
     neutron_available                => $neutron,
     neutron_bgpvpn_available         => $bgpvpn,
-    neutron_lbaas_available          => true,
     neutron_l2gw_available           => $l2gw,
     neutron_dr_available             => $dr,
     neutron_fwaas_available          => true,