From cdbef7b45ee041045a68691909fe4f38bdc47eda Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Wed, 4 Dec 2013 00:45:21 +0100
Subject: [PATCH] Continue LB support

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 params.pp                        |  5 +++++
 roles/load-balancer/lb_server.pp | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/params.pp b/params.pp
index 25305c42..10d77254 100644
--- a/params.pp
+++ b/params.pp
@@ -117,9 +117,14 @@ class os_params {
   # Neutron
   $external_int = 'eth1'
   $ks_neutron_admin_host = 'os-ci-test3.enovance.com'
+  $ks_neutron_admin_port = '9696'
+  $ks_neutron_admin_proto = 'http'
   $ks_neutron_internal_host = 'os-ci-test3.enovance.com'
+  $ks_neutron_internal_port = '9696'
+  $ks_neutron_internal_proto = 'http'
   $ks_neutron_password = 'AJJTg2fSWrE4X4L1rhKJI74njLpFB0'
   $ks_neutron_public_host = 'os-ci-test3.enovance.com'
+  $ks_neutron_public_port = '9696'
   $ks_neutron_public_proto = 'http'
   $neutron_allowed_hosts = ['os-ci-test%', '10.60.0.%']
   $neutron_db_host = '10.68.0.47'
diff --git a/roles/load-balancer/lb_server.pp b/roles/load-balancer/lb_server.pp
index ecba59ab..73c7f4cb 100644
--- a/roles/load-balancer/lb_server.pp
+++ b/roles/load-balancer/lb_server.pp
@@ -16,11 +16,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
+#
 # HAproxy nodes
+#
 
-
-class os_role_loadbalancer(
+class os_lb_server(
   $keepalived_localhost_ip = $ipaddress_eth0,
   $keepalived_interface = 'eth0',
   $keepalived_ipvs = [],
@@ -35,14 +35,16 @@ class os_role_loadbalancer(
   $horizon = false,
   $heat_api = false,
   $local_ip = $ipaddress_eth0,
+  $keepalived_smtp = os_params::keepalived_smtp,
+  $keepalived_email = os_params::keepalived_email,
 ){
 
   class { 'haproxy': }
-  class { 'keepalived':
-    notification_email_to => [ $os_params::keepalived_email ],
-    smtp_server           => $os_params::keepalived_smtp,
-  }
 
+  class { 'keepalived':
+    notification_email_to => $keepalived_email,
+    smtp_server           => $keepalived_smtp,
+  }
 
   $monitors_data = inline_template('
 <%- if @swift_api -%>