diff --git a/manifests/api.pp b/manifests/api.pp index d8951b7c..60d28a2d 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -263,11 +263,6 @@ # (optional) File access permissions for the image files. # 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*] # (optional) Turn on/off delayed delete. # Defaults to undef @@ -330,7 +325,6 @@ class glance::api( $show_multiple_locations = undef, $filesystem_store_metadata_file = undef, $filesystem_store_file_perm = undef, - Optional[String] $pipeline = undef, $delayed_delete = undef, ) inherits glance { @@ -551,15 +545,8 @@ enabled_backends instead.') '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 { - 'paste_deploy/flavor': value => $paste_deploy_flavor_real; + 'paste_deploy/flavor': value => $paste_deploy_flavor; 'paste_deploy/config_file': value => $paste_deploy_config_file; } diff --git a/releasenotes/notes/remove-api-pipeline-d7054e2cd9f1616f.yaml b/releasenotes/notes/remove-api-pipeline-d7054e2cd9f1616f.yaml new file mode 100644 index 00000000..2721db2b --- /dev/null +++ b/releasenotes/notes/remove-api-pipeline-d7054e2cd9f1616f.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``glance::api::pipeline`` parameter has been removed. diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index cd2f2bde..678484a4 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -247,16 +247,6 @@ describe 'glance::api' do it { is_expected.to contain_glance_api_config('paste_deploy/flavor').with_value('something') } 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 let :params do {