From 2eb64f148871ea1f55b1369d8771921c66058640 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Mon, 26 Sep 2016 11:13:59 -0400
Subject: [PATCH] Fix LBaaSv2 deployment

Review https://review.openstack.org/#/c/374229/ fixed some
issues for lbaasv2 but some more changes are needed to make
it work properly.

Change-Id: Ia727748498c81cf0e5c1e9fe1afd771ed0c44767
---
 packstack/plugins/neutron_350.py                             | 5 ++++-
 packstack/puppet/modules/packstack/manifests/horizon.pp      | 1 -
 packstack/puppet/modules/packstack/manifests/neutron/api.pp  | 5 +++++
 .../puppet/modules/packstack/manifests/neutron/lbaas.pp      | 4 ----
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py
index db559c334..fa212b26d 100644
--- a/packstack/plugins/neutron_350.py
+++ b/packstack/plugins/neutron_350.py
@@ -600,8 +600,11 @@ def create_manifests(config, messages):
     service_plugins = []
     service_providers = []
     if config['CONFIG_LBAAS_INSTALL'] == 'y':
+        lbaas_plugin = ('neutron_lbaas.services.loadbalancer.plugin.'
+                        'LoadBalancerPluginv2')
+        service_plugins.append(lbaas_plugin)
         lbaas_sp = ('LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.'
-                    'plugin_driver.HaproxyOnHostPluginDriver')
+                    'plugin_driver.HaproxyOnHostPluginDriver:default')
         service_providers.append(lbaas_sp)
 
     # ML2 uses the L3 Router service plugin to implement l3 agent
diff --git a/packstack/puppet/modules/packstack/manifests/horizon.pp b/packstack/puppet/modules/packstack/manifests/horizon.pp
index c3664b8d3..7f01ad53a 100644
--- a/packstack/puppet/modules/packstack/manifests/horizon.pp
+++ b/packstack/puppet/modules/packstack/manifests/horizon.pp
@@ -34,7 +34,6 @@ class packstack::horizon ()
       horizon_key           => hiera('CONFIG_HORIZON_SSL_KEY', undef),
       horizon_ca            => hiera('CONFIG_HORIZON_SSL_CACERT', undef),
       neutron_options       => {
-        'enable_lb'       => hiera('CONFIG_HORIZON_NEUTRON_LB'),
         'enable_firewall' => hiera('CONFIG_HORIZON_NEUTRON_FW'),
         'enable_vpn'      => hiera('CONFIG_HORIZON_NEUTRON_VPN'),
       },
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
index f8fb3a305..b494dbfbf 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
@@ -10,6 +10,7 @@ class packstack::neutron::api ()
     $neutron_user_password   = hiera('CONFIG_NEUTRON_KS_PW')
     $neutron_fwaas_enabled   = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
     $neutron_vpnaas_enabled  = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
+    $neutron_lbaas_enabled   = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
 
     class { '::neutron::server':
       database_connection   => $neutron_sql_connection,
@@ -30,5 +31,9 @@ class packstack::neutron::api ()
       mode    => '0640',
     }
 
+    if $neutron_lbaas_enabled {
+       class { '::neutron::services::lbaas': }
+    }
+
     Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
 }
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp b/packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp
index 65e1822a5..4596a9bfd 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp
@@ -8,8 +8,4 @@ class packstack::neutron::lbaas ()
       enable_v2        => true,
       debug            => hiera('CONFIG_DEBUG_MODE'),
     }
-
-    class {'::neutron::services::lbaas':
-      service_providers => 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver',
-    }
 }