From 1ab8ba671d2e89c5a7f3aa00d78fce8a040a4e2e Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Fri, 16 Dec 2016 13:57:41 +0800
Subject: [PATCH] Remove enable_v1 and enable_v2 parameters for lbaas

1) enable_v1 and enable_v2 parameters are deprecated and will be
   removed in Ocata, so we can remove them.
2) Fix firewall_driver option value.
3) Fix the annotation of driver parameter.

Change-Id: Icb74bac3e56aa92288b4137e0f0f77da75c23f33
---
 manifests/neutron.pp | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 4756a3b15..dd6c46ab2 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -3,15 +3,10 @@
 # [*driver*]
 #   (optional) Neutron Driver to test
 #   Can be: openvswitch or linuxbridge.
-#   Defaults to 'ml2_ovs'.
-#
-# [*lbaasv2*]
-#  (optional) Configure lbaas v2 instead of v1
-#  Defaults to true
+#   Defaults to 'openvswitch'.
 #
 class openstack_integration::neutron (
-  $driver  = 'openvswitch',
-  $lbaasv2 = true,
+  $driver = 'openvswitch',
 ) {
 
   include ::openstack_integration::config
@@ -73,7 +68,7 @@ class openstack_integration::neutron (
         bridge_mappings => ['external:br-ex'],
         manage_vswitch  => false,
       }
-      $firewall_driver         = 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
+      $firewall_driver  = 'iptables_hybrid'
     }
     'linuxbridge': {
       exec { 'create_dummy_iface':
@@ -88,7 +83,7 @@ class openstack_integration::neutron (
         physical_interface_mappings => ['external:loop0'],
       }
       $external_network_bridge = ''
-      $firewall_driver         = 'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver'
+      $firewall_driver         = 'iptables'
     }
     default: {
       fail("Unsupported neutron driver (${driver})")
@@ -152,19 +147,9 @@ class openstack_integration::neutron (
     shared_secret    => 'a_big_secret',
     metadata_workers => 2,
   }
-  if $lbaasv2 {
-    $lbaasv1       = false
-    $device_driver = 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver'
-  } else {
-    $lbaasv1       = true
-    $device_driver = 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver'
-  }
   class { '::neutron::agents::lbaas':
     interface_driver => $driver,
-    enable_v1        => $lbaasv1,
-    enable_v2        => $lbaasv2,
     debug            => true,
-    device_driver    => $device_driver
   }
   class { '::neutron::agents::l3':
     interface_driver        => $driver,