From 9b8717b2bceb5414cbd750fd29fee8cde69152ab Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Thu, 25 Aug 2016 10:55:11 +0200
Subject: [PATCH] Move all lbaas to v2

Upstream has just removed lbaasv1 from openstack-lbaas
(https://review.openstack.org/286381). A full fix will involve
removing all lbaasv1 support from puppet-neutron, but while it is
done we should only use lbaasv2 in puppet-openstack-integration
to avoid CI issues.

Change-Id: If63110644d441bb8b088c93aebc02356b158aebd
---
 README.md               | 2 +-
 fixtures/scenario001.pp | 4 +---
 manifests/neutron.pp    | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0b21c9937..e27febac9 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ scenario](#All-In-One).
 | glance     |     rbd     |     swift   |     file    |     file     |
 | nova       |     rbd     |       X     |       X     |       X      |
 | neutron    |     ovs     |      ovs    | linuxbridge |      ovs     |
-| lbaas      |     v2      |      v1     |     v1      |      v1      |
+| lbaas      |     v2      |      v2     |     v2      |      v2      |
 | cinder     |     rbd     |     iscsi   |             |    iscsi     |
 | ceilometer |      X      |             |             |              |
 | aodh       |      X      |             |             |              |
diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 5585671ab..a6b683716 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -51,9 +51,7 @@ include ::openstack_integration::keystone
 class { '::openstack_integration::glance':
   backend => 'rbd',
 }
-class { '::openstack_integration::neutron':
-  lbaasv2 => true
-}
+include ::openstack_integration::neutron
 class { '::openstack_integration::nova':
   libvirt_rbd => true,
 }
diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 423ef17d8..f5115ac3d 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -7,11 +7,11 @@
 #
 # [*lbaasv2*]
 #  (optional) Configure lbaas v2 instead of v1
-#  Defaults to false
+#  Defaults to true
 #
 class openstack_integration::neutron (
   $driver  = 'openvswitch',
-  $lbaasv2 = false,
+  $lbaasv2 = true,
 ) {
 
   include ::openstack_integration::config