From 1671d283af852b75bb5e1ce65470d08e86a9adf8 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 19 Jan 2015 15:53:09 -0500 Subject: [PATCH] glance/api: add known_stores parameter In Juno, known_stores is required to have backend working correctly. Let's follow default backend (rbd) to ensure this parameters is managed. Change-Id: Ia8b8724c7442439112f3f399a816c45c8d713e61 --- manifests/image/api.pp | 8 ++++++++ spec/classes/cloud_image_api_spec.rb | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/manifests/image/api.pp b/manifests/image/api.pp index 1955cf79..6579aca9 100644 --- a/manifests/image/api.pp +++ b/manifests/image/api.pp @@ -104,6 +104,12 @@ # Can be 'rbd', 'file', 'nfs' or 'swift' # Defaults to 'rbd' # +# [*known_stores*] +# (optionnal) Tell to Glance API which backends can be used +# Can be 'rbd', 'file', or and 'swift'. +# Should be an array. +# Defaults to ['rbd'] +# # [*filesystem_store_datadir*] # (optional) Full path of data directory to store the images. # Defaults to '/var/lib/glance/images/' @@ -151,6 +157,7 @@ class cloud::image::api( $log_facility = 'LOG_LOCAL0', $use_syslog = true, $backend = 'rbd', + $known_stores = ['rbd'], $filesystem_store_datadir = '/var/lib/glance/images/', $nfs_device = false, $nfs_options = 'defaults', @@ -199,6 +206,7 @@ class cloud::image::api( bind_port => $ks_glance_api_internal_port, use_syslog => $use_syslog, pipeline => 'keystone', + known_stores => $known_stores, } # TODO(EmilienM) Disabled for now diff --git a/spec/classes/cloud_image_api_spec.rb b/spec/classes/cloud_image_api_spec.rb index a28f95f2..0c6295ca 100644 --- a/spec/classes/cloud_image_api_spec.rb +++ b/spec/classes/cloud_image_api_spec.rb @@ -70,7 +70,8 @@ describe 'cloud::image::api' do :use_syslog => true, :pipeline => 'keystone', :log_dir => false, - :log_file => false + :log_file => false, + :known_stores => ['rbd'], ) end