openstack/puppet-glance
Code Issues Proposed changes

api: Remove deprecated pipeline parameter

Browse Source 
This parameter was deprecated a few cycles ago[1] and is ready for
removal.

[1] fa5fcb4ab5f861003be7409fdcf71c94120d0b5e

Change-Id: I1ac89aa665a1cef0c94921dcc2a6532caf8d4e8c
This commit is contained in:
Takashi Kajinami 2024-11-23 20:39:57 +09:00
parent ecdb37958b
commit 6dd07c0f91
3 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/api.pp
View File

@ -263,11 +263,6 @@
# (optional) File access permissions for the image files. # (optional) File access permissions for the image files.
# Defaults to undef # Defaults to undef
# #
# [*pipeline*]
# (optional) Partial name of a pipeline in your paste configuration file with the
# service name removed.
# Defaults to undef
#
# [*delayed_delete*] # [*delayed_delete*]
# (optional) Turn on/off delayed delete. # (optional) Turn on/off delayed delete.
# Defaults to undef # Defaults to undef
@ -330,7 +325,6 @@ class glance::api(
$show_multiple_locations = undef, $show_multiple_locations = undef,
$filesystem_store_metadata_file = undef, $filesystem_store_metadata_file = undef,
$filesystem_store_file_perm = undef, $filesystem_store_file_perm = undef,
Optional[String] $pipeline = undef,
$delayed_delete = undef, $delayed_delete = undef,
) inherits glance { ) inherits glance {
@ -551,15 +545,8 @@ enabled_backends instead.')
'inject_metadata_properties/ignore_user_roles': value => $ignore_user_roles; 'inject_metadata_properties/ignore_user_roles': value => $ignore_user_roles;
} }
if $pipeline != undef {
warning('The pipeline parameter has been deprecated. Use the paste_deploy_flavor parmaeter instead.')
$paste_deploy_flavor_real = $pipeline
} else {
$paste_deploy_flavor_real = $paste_deploy_flavor
}
glance_api_config { glance_api_config {
'paste_deploy/flavor': value => $paste_deploy_flavor_real; 'paste_deploy/flavor': value => $paste_deploy_flavor;
'paste_deploy/config_file': value => $paste_deploy_config_file; 'paste_deploy/config_file': value => $paste_deploy_config_file;
} }

4
releasenotes/notes/remove-api-pipeline-d7054e2cd9f1616f.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``glance::api::pipeline`` parameter has been removed.

10
spec/classes/glance_api_spec.rb
View File

@ -247,16 +247,6 @@ describe 'glance::api' do
it { is_expected.to contain_glance_api_config('paste_deploy/flavor').with_value('something') } it { is_expected.to contain_glance_api_config('paste_deploy/flavor').with_value('something') }
end end
describe 'with flavor overridden by the deprecated pipeline parameter' do
let :params do
{
:pipeline => 'something',
}
end
it { is_expected.to contain_glance_api_config('paste_deploy/flavor').with_value('something') }
end
context 'when running glance-api in wsgi' do context 'when running glance-api in wsgi' do
let :params do let :params do
{ {