From 08756a621b1034df6d01442e30b598e6f4aab0b6 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@enovance.com>
Date: Mon, 16 Dec 2013 16:04:44 +0100
Subject: [PATCH] volume: fix backend and lint

---
 roles/volume/volume_controller.pp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/roles/volume/volume_controller.pp b/roles/volume/volume_controller.pp
index 7291d70b..0b99f6a2 100644
--- a/roles/volume/volume_controller.pp
+++ b/roles/volume/volume_controller.pp
@@ -22,7 +22,8 @@ class os_volume_controller(
   $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
   $ks_swift_internal_proto   = $os_params::ks_swift_internal_proto,
   $ks_swift_internal_host    = $os_params::ks_swift_internal_host,
-  $ks_swift_internal_port    = $os_params::ks_swift_internal_port
+  $ks_swift_internal_port    = $os_params::ks_swift_internal_port,
+  $local_ip                  = $ipaddress_eth0,
 ) {
 
   class { 'cinder::scheduler': }
@@ -35,15 +36,15 @@ class os_volume_controller(
   class { 'cinder::backup': }
 
   class { 'cinder::backup::swift':
-    backup_swift_url => "${ks_swift_internal_proto}://${ks_swift_internal_host}:${ks_swift_internal_port}/v1/AUTH_"
+    backup_swift_url => "${ks_swift_internal_proto}://${ks_swift_internal_host}:${ks_swift_internal_port}/v1/AUTH"
   }
 
-  @@haproxy::balancermember{"${fqdn}-cinder_api":
-    listening_service => "cinder_api_cluster",
+  @@haproxy::balancermember{"${::fqdn}-cinder_api":
+    listening_service => 'cinder_api_cluster',
     server_names      => $::hostname,
     ipaddresses       => $local_ip,
     ports             => $ks_cinder_internal_port,
-    options           => "check inter 2000 rise 2 fall 5"
+    options           => 'check inter 2000 rise 2 fall 5'
   }
 
 }