From ee6c7376b35cfc305f50efa84f8b29a1c9223848 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Wed, 29 Jan 2014 15:34:26 +0100
Subject: [PATCH] volume: disable cinder::glance

Duplicate declaration: Cinder_config[DEFAULT/glance_api_version] is declared in file cinder/manifests/glance.pp and cinder/manifests/backend/rbd.pp

While https://review.openstack.org/#/c/69756/ got merged, this patch fix
the issue.

Close #111

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/volume/controller.pp               | 24 ++++++++++++--------
 spec/classes/cloud_volume_controller_spec.rb | 14 ++++++++----
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp
index cf5e0871..86fea252 100644
--- a/manifests/volume/controller.pp
+++ b/manifests/volume/controller.pp
@@ -23,8 +23,8 @@ class cloud::volume::controller(
   $ks_glance_internal_host   = $os_params::ks_glance_internal_host,
   $api_eth                   = $os_params::api_eth,
   # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
-  #$backup_ceph_pool          = $os_params::cinder_rbd_backup_pool,
-  #$backup_ceph_user          = $os_params::cinder_rbd_backup_user
+  # $backup_ceph_pool          = $os_params::cinder_rbd_backup_pool,
+  # $backup_ceph_user          = $os_params::cinder_rbd_backup_user
 ) {
 
   include 'cloud::volume'
@@ -40,14 +40,20 @@ class cloud::volume::controller(
   class { 'cinder::backup': }
 
   # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
-  #class { 'cinder::backup::ceph':
-  #  backup_ceph_user => $backup_ceph_user,
-  #  backup_ceph_pool => $backup_ceph_pool
-  #}
+  # class { 'cinder::backup::ceph':
+  #   backup_ceph_user => $backup_ceph_user,
+  #   backup_ceph_pool => $backup_ceph_pool
+  # }
 
-  class { 'cinder::glance':
-    glance_api_servers     => $ks_glance_internal_host,
-    glance_request_timeout => '10'
+  # TODO(EmilienM) Disabled for now: http://git.io/uM5sgg
+  # class { 'cinder::glance':
+  #   glance_api_servers     => $ks_glance_internal_host,
+  #   glance_request_timeout => '10'
+  # }
+  # Replaced by:
+  cinder_config {
+    'DEFAULT/glance_api_servers':     value => $ks_glance_internal_host;
+    'DEFAULT/glance_request_timeout': value => '10';
   }
 
   @@haproxy::balancermember{"${::fqdn}-cinder_api":
diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb
index 48072747..20755ef7 100644
--- a/spec/classes/cloud_volume_controller_spec.rb
+++ b/spec/classes/cloud_volume_controller_spec.rb
@@ -66,11 +66,17 @@ describe 'cloud::volume::controller' do
       should contain_class('cinder::scheduler')
     end
 
+    # TODO(Emilien) Disabled for now: http://git.io/uM5sgg
+    # it 'configure cinder glance backend' do
+    #   should contain_class('cinder::glance').with(
+    #       :glance_api_servers     => '10.0.0.1',
+    #       :glance_request_timeout => '10'
+    #     )
+    # end
+    # Replaced by:
     it 'configure cinder glance backend' do
-      should contain_class('cinder::glance').with(
-          :glance_api_servers     => '10.0.0.1',
-          :glance_request_timeout => '10'
-        )
+      should contain_cinder_config('DEFAULT/glance_api_servers').with('value' => '10.0.0.1')
+      should contain_cinder_config('DEFAULT/glance_request_timeout').with('value' => '10')
     end
 
     it 'configure cinder api' do