From d8f14ec8420e12d85c0bcf074b9d04d6df16303d Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 18 Jan 2016 12:18:40 -0500
Subject: [PATCH] acceptance: enable lbaas service provider

We're testing neutron lbaas.
Since Mitaka [1], we need to load service_provider because the default
value is empty.

We could change the default value of service_providers in
manifests/services/lbaas.pp but that would not fit with what upstream
default in Neutron.

So this patch aims to:
* modify beaker manifests to load HAproxy service provider so LBaaS can
  work.
* add more documentation about it so people who hit this bug will easily
  debug and know they need to pass a service_provider.

[1] https://github.com/openstack/neutron-lbaas/commit/d13d53bce7c0453189a85000a8e015dc75e9c859#diff-f9ccf8f7f0532acb2963d5d00f42dc15L64

Partial-Bug: #1535382
Change-Id: Ia522a0d6b03aa00939a93d18b74862cf760cdd06
---
 manifests/services/lbaas.pp           | 4 ++++
 spec/acceptance/basic_neutron_spec.rb | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/services/lbaas.pp b/manifests/services/lbaas.pp
index 99208696d..6265d7e91 100644
--- a/manifests/services/lbaas.pp
+++ b/manifests/services/lbaas.pp
@@ -28,6 +28,10 @@
 #
 # [*service_providers*]
 #   (optional) Array of allowed service types or '<SERVICE DEFAULT>'.
+#   Note: The default upstream value is empty.
+#         If you plan to activate LBaaS service, you'll need to set this
+#         parameter otherwise neutron-server won't start correctly.
+#         See https://bugs.launchpad.net/puppet-neutron/+bug/1535382/comments/1
 #   Must be in form <service_type>:<name>:<driver>[:default].
 #   Defaults to $::os_service_default
 #
diff --git a/spec/acceptance/basic_neutron_spec.rb b/spec/acceptance/basic_neutron_spec.rb
index ba54e8a63..062c7a24b 100644
--- a/spec/acceptance/basic_neutron_spec.rb
+++ b/spec/acceptance/basic_neutron_spec.rb
@@ -73,7 +73,9 @@ describe 'basic neutron' do
         mechanism_drivers    => ['openvswitch', 'sriovnicswitch']
       }
       class { '::neutron::agents::ml2::sriov': }
-      class { '::neutron::services::lbaas': }
+      class { '::neutron::services::lbaas':
+        service_providers => 'LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',
+      }
       EOS