From 68291df8ac7a4dd391c74746e59fb440a8abd558 Mon Sep 17 00:00:00 2001
From: Alan Bishop <abishop@redhat.com>
Date: Fri, 5 Jun 2020 09:21:17 -0700
Subject: [PATCH] Remove obsolete 'http' backend from glance configuration

Glance has a read-only 'http' backend that is obsolete now that tripleo
supports glance multi-store (multiple backends). Glance's web-download
import method no longer relies on the 'http' backend, so tripleo should
no longer include 'http' in the list of enabled backends.

Change-Id: I64ee3a3c8f0dabdeab16968c39ea00b8879f5405
(cherry picked from commit a2a04ed48874ecc343c5b6c2ef6a2166f909004a)
(cherry picked from commit b1b435e95d35e81b187bdb07e05a7cc9fb10df73)
---
 manifests/profile/base/glance/api.pp                 | 2 +-
 spec/classes/tripleo_profile_base_glance_api_spec.rb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index 764395924..b2336d7eb 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -196,7 +196,7 @@ class tripleo::profile::base::glance::api (
       "${backend_config[0]}:${backend_config[1]['GlanceBackend']}"
     }
 
-    $enabled_backends = ["${glance_backend_id}:${glance_backend}", 'http:http'] + $multistore_backends
+    $enabled_backends = ["${glance_backend_id}:${glance_backend}"] + $multistore_backends
 
     include ::glance
     include ::glance::config
diff --git a/spec/classes/tripleo_profile_base_glance_api_spec.rb b/spec/classes/tripleo_profile_base_glance_api_spec.rb
index 58f85e24e..ec8663262 100644
--- a/spec/classes/tripleo_profile_base_glance_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_glance_api_spec.rb
@@ -101,7 +101,7 @@ describe 'tripleo::profile::base::glance::api' do
         is_expected.to contain_class('glance::config')
         is_expected.to contain_class('glance::api::logging')
         is_expected.to contain_class('glance::api').with(
-          :enabled_backends => ['default_backend:swift', 'http:http'],
+          :enabled_backends => ['default_backend:swift'],
           :default_backend  => 'default_backend',
         )
         is_expected.to_not contain_class('tripleo::profile::base::glance::backend::cinder')
@@ -147,7 +147,6 @@ describe 'tripleo::profile::base::glance::api' do
           is_expected.to contain_class('glance::api').with(
             :enabled_backends => [
               'my_cinder:cinder',
-              'http:http',
               'my_file:file',
               'rbd1:rbd',
               'rbd2:rbd',