From 57009efc4a916b01a51ad4815f5ca74c3f094f47 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 2 Oct 2015 12:59:38 -0400
Subject: [PATCH] file backend: do not inherit from glance::api

Do not make ::glance::backend::file inherits from ::glance::api because
::glance::api has parameters.
The class was broken until now.

Also, we need to include glance::backend::file to have
'filesystem_store_datadir' parameter in Glance config, since we're using
file backend.

If you don't provide this parameter, Glance fails to start:
glance_store._drivers.filesystem [-] Specify at least
'filesystem_store_datadir' or 'filesystem_store_datadirs' option

Change-Id: Iba6791199f7a2c7fef24b1e8752ed0b564b8512f
---
 manifests/backend/file.pp                | 2 +-
 spec/acceptance/basic_glance_spec.rb     | 1 +
 spec/classes/glance_backend_file_spec.rb | 4 ----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/manifests/backend/file.pp b/manifests/backend/file.pp
index ffc5d2e6..94dc173f 100644
--- a/manifests/backend/file.pp
+++ b/manifests/backend/file.pp
@@ -11,7 +11,7 @@
 #
 class glance::backend::file(
   $filesystem_store_datadir = '/var/lib/glance/images/'
-) inherits glance::api {
+) {
 
   glance_api_config {
     'glance_store/default_store':            value => 'file';
diff --git a/spec/acceptance/basic_glance_spec.rb b/spec/acceptance/basic_glance_spec.rb
index 1f1459b9..c06c8f51 100644
--- a/spec/acceptance/basic_glance_spec.rb
+++ b/spec/acceptance/basic_glance_spec.rb
@@ -73,6 +73,7 @@ describe 'glance class' do
       # Glance resources
       include ::glance
       include ::glance::client
+      include ::glance::backend::file
       class { '::glance::db::mysql':
         # https://bugs.launchpad.net/puppet-glance/+bug/1446375
         collate  => 'utf8_general_ci',
diff --git a/spec/classes/glance_backend_file_spec.rb b/spec/classes/glance_backend_file_spec.rb
index 4566eaeb..6c984816 100644
--- a/spec/classes/glance_backend_file_spec.rb
+++ b/spec/classes/glance_backend_file_spec.rb
@@ -5,10 +5,6 @@ describe 'glance::backend::file' do
     { :osfamily => 'Debian' }
   end
 
-  let :pre_condition do
-    'class { "glance::api": keystone_password => "pass" }'
-  end
-
   it 'configures glance-api.conf' do
     is_expected.to contain_glance_api_config('glance_store/default_store').with_value('file')
     is_expected.to contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')