openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Remove obsolete 'http' backend from glance configuration"

This commit is contained in:
Zuul 2020-06-06 04:48:37 +00:00 committed by Gerrit Code Review
parent 525feb9f16 a2a04ed488
commit 4647c28654
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']}"
}
$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

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::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',