From fe39edd577ee9f281853e6e59dd6c212652f495e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne@iweb.com>
Date: Tue, 2 Jul 2013 19:19:09 -0400
Subject: [PATCH] Configure glance-cache.conf with file backend

glance::backend::file was not properly configuring
filesystem_store_datadir in /etc/glance/glance-cache.conf
when using file backend.

Change-Id: Ie8d3259de429089f2f00fbafd2e5cbf90c069263
---
 manifests/backend/file.pp                |  5 ++++-
 spec/classes/glance_backend_file_spec.rb | 23 +++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/manifests/backend/file.pp b/manifests/backend/file.pp
index be229214..9c27719b 100644
--- a/manifests/backend/file.pp
+++ b/manifests/backend/file.pp
@@ -9,8 +9,11 @@ class glance::backend::file(
 ) inherits glance::api {
 
   glance_api_config {
-    'DEFAULT/default_store':  value => 'file';
+    'DEFAULT/default_store':            value => 'file';
     'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
   }
 
+  glance_cache_config {
+    'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
+  }
 }
diff --git a/spec/classes/glance_backend_file_spec.rb b/spec/classes/glance_backend_file_spec.rb
index 8e6408af..fac7fcf4 100644
--- a/spec/classes/glance_backend_file_spec.rb
+++ b/spec/classes/glance_backend_file_spec.rb
@@ -2,22 +2,33 @@ require 'spec_helper'
 
 describe 'glance::backend::file' do
   let :facts do
-    {
-      :osfamily => 'Debian'
-    }
+    { :osfamily => 'Debian' }
   end
 
   let :pre_condition do
     'class { "glance::api": keystone_password => "pass" }'
   end
 
-  it { should contain_glance_api_config('DEFAULT/default_store').with_value('file') }
-  it { should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/') }
+  it 'configures glance-api.conf' do
+    should contain_glance_api_config('DEFAULT/default_store').with_value('file')
+    should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
+  end
+
+  it 'configures glance-cache.conf' do
+    should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
+  end
 
   describe 'when overriding datadir' do
     let :params do
       {:filesystem_store_datadir => '/tmp/'}
     end
-    it { should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/') }
+
+    it 'configures glance-api.conf' do
+      should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
+    end
+
+    it 'configures glance-cache.conf' do
+      should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
+    end
   end
 end