From 212a3e164f457f2e875d35ce28f70a946c5620f9 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 18 Feb 2015 09:13:24 -0500
Subject: [PATCH] Glance-API: add HTTP to glance known stores

In Juno, HTTP store is not enabled by default.
Let's enable HTTP it by default so we can create an image from an URL.

Change-Id: I893d493bac57f21b1a2174a21f8de132bf2bf830
---
 manifests/image/api.pp               | 6 +++---
 spec/classes/cloud_image_api_spec.rb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/image/api.pp b/manifests/image/api.pp
index e6c8101b..a420a3d1 100644
--- a/manifests/image/api.pp
+++ b/manifests/image/api.pp
@@ -106,9 +106,9 @@
 #
 # [*known_stores*]
 #   (optionnal) Tell to Glance API which backends can be used
-#   Can be 'rbd', 'file', or and 'swift'.
+#   Can be 'rbd', 'http', 'file', or and 'swift'.
 #   Should be an array.
-#   Defaults to ['rbd']
+#   Defaults to ['rbd', 'http']
 #
 # [*filesystem_store_datadir*]
 #   (optional) Full path of data directory to store the images.
@@ -157,7 +157,7 @@ class cloud::image::api(
   $log_facility                      = 'LOG_LOCAL0',
   $use_syslog                        = true,
   $backend                           = 'rbd',
-  $known_stores                      = ['rbd'],
+  $known_stores                      = ['rbd', 'http'],
   $filesystem_store_datadir          = '/var/lib/glance/images/',
   $nfs_device                        = false,
   $nfs_options                       = 'defaults',
diff --git a/spec/classes/cloud_image_api_spec.rb b/spec/classes/cloud_image_api_spec.rb
index cb6a59f9..e581c4a2 100644
--- a/spec/classes/cloud_image_api_spec.rb
+++ b/spec/classes/cloud_image_api_spec.rb
@@ -71,7 +71,7 @@ describe 'cloud::image::api' do
         :pipeline                 => 'keystone',
         :log_dir                  => false,
         :log_file                 => false,
-        :known_stores             => ['rbd'],
+        :known_stores             => ['rbd','http'],
       )
     end