From f370566c93cd605c63de62b17b68b3752e2511d2 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Fri, 13 Dec 2013 20:45:10 +0100
Subject: [PATCH] Improve Cinder manifests

- Add cinder::backup class
- Add cinder::backup::swift class
- Add cinder::glance class
- Factorize some variables in cinder_config

Part of sprint 22

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 params.pp                         |  1 +
 roles/volume/volume_common.pp     | 17 +++++------------
 roles/volume/volume_controller.pp | 13 +++++++++++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/params.pp b/params.pp
index bbb354b4..be2722f7 100644
--- a/params.pp
+++ b/params.pp
@@ -69,6 +69,7 @@ class os_params {
   $ks_swift_dispersion_password = 'aipee1die1eeSohph9yae8eeluthaleu'
   $ks_swift_internal_host = 'os-ci-test3.enovance.com'
   $ks_swift_internal_port = '8080'
+  $ks_swift_internal_proto = 'http'
   $ks_swift_password = 'cwnu6Eeph4jahsh5wooch5Panahjaidie8'
   $ks_swift_public_host = 'os-ci-test3.enovance.com'
   $ks_swift_public_port = '8080'
diff --git a/roles/volume/volume_common.pp b/roles/volume/volume_common.pp
index 5d5d3ad4..dcbffbf6 100644
--- a/roles/volume/volume_common.pp
+++ b/roles/volume/volume_common.pp
@@ -41,22 +41,15 @@ class os_volume_common(
     rabbit_virtual_host => '/',
     verbose             => $verbose,
     debug               => $debug,
-  }
-
-  class { 'cinder::scheduler': }
-
-  class { 'cinder::api':
-    keystone_password      => $ks_cinder_password,
-    keystone_auth_host     => $ks_keystone_internal_host,
+    log_facility        => 'LOG_LOCAL0',
+    use_syslog          => true
   }
 
   class { 'cinder::ceilometer': }
 
-  cinder_config{
-    'DEFAULT/glance_host':          value => "${ks_glance_internal_host}:9292";
-    'DEFAULT/syslog_log_facility':  value => 'LOG_LOCAL0';
-    'DEFAULT/use_syslog':           value => 'yes';
-    'DEFAULT/idle_timeout':         value => '60';
+  class { 'cinder::glance':
+    glance_api_servers     => $ks_glance_internal_host,
+    glance_request_timeout => '10'
   }
 
 }
diff --git a/roles/volume/volume_controller.pp b/roles/volume/volume_controller.pp
index a71a4d7c..c364bedf 100644
--- a/roles/volume/volume_controller.pp
+++ b/roles/volume/volume_controller.pp
@@ -20,13 +20,22 @@ class os_volume_controller(
   $ks_cinder_internal_port   = $os_params::ks_cinder_internal_port,
   $ks_cinder_password        = $os_params::ks_cinder_password,
   $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,
 ) {
 
   class { 'cinder::scheduler': }
 
   class { 'cinder::api':
-    keystone_password      => $os_params::ks_cinder_password,
-    keystone_auth_host     => $os_params::ks_keystone_internal_host,
+    keystone_password      => $ks_cinder_password,
+    keystone_auth_host     => $ks_keystone_internal_host,
+  }
+
+  class { 'cinder::backup': }
+
+  class { 'cinder::backup::swift':
+    backup_swift_url => "${ks_swift_internal_proto}://${ks_swift_internal_host}:${ks_swift_internal_port}/v1/AUTH_'
   }
 
   @@haproxy::balancermember{"${fqdn}-cinder_api":