openstack
/
puppet-tripleo
Code Issues Proposed changes

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 a2a04ed488)
(cherry picked from commit b1b435e95d)
This commit is contained in:
Alan Bishop 2020-06-05 09:21:17 -07:00
parent 2a2deaa726
commit 68291df8ac
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/glance/api.pp
View File

@ -196,7 +196,7 @@ class tripleo::profile::base::glance::api (
"${backend_config[0]}:${backend_config[1]['GlanceBackend']}" "${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
include ::glance::config include ::glance::config

3
spec/classes/tripleo_profile_base_glance_api_spec.rb
View File

@ -101,7 +101,7 @@ describe 'tripleo::profile::base::glance::api' do
is_expected.to contain_class('glance::config') is_expected.to contain_class('glance::config')
is_expected.to contain_class('glance::api::logging') is_expected.to contain_class('glance::api::logging')
is_expected.to contain_class('glance::api').with( is_expected.to contain_class('glance::api').with(
:enabled_backends => ['default_backend:swift', 'http:http'], :enabled_backends => ['default_backend:swift'],
:default_backend => 'default_backend', :default_backend => 'default_backend',
) )
is_expected.to_not contain_class('tripleo::profile::base::glance::backend::cinder') 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( is_expected.to contain_class('glance::api').with(
:enabled_backends => [ :enabled_backends => [
'my_cinder:cinder', 'my_cinder:cinder',
'http:http',
'my_file:file', 'my_file:file',
'rbd1:rbd', 'rbd1:rbd',
'rbd2:rbd', 'rbd2:rbd',