openstack/puppet-glance
Code Issues Proposed changes

Merge "Remove deprecated keymgr_* parameters"

Browse Source
This commit is contained in:
Zuul 2022-08-17 09:40:31 +00:00 committed by Gerrit Code Review
commit ae3a220d66
5 changed files with 12 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
manifests/api.pp
View File

@ -247,21 +247,6 @@
# properties.
# Defaults to undef
#
# [*keymgr_backend*]
# (optional) Key Manager service class.
# Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager
# Defaults to undef
#
# [*keymgr_encryption_api_url*]
# (optional) Key Manager service URL
# Example of valid value: https://localhost:9311/v1
# Defaults to undef
#
# [*keymgr_encryption_auth_url*]
# (optional) Auth URL for keymgr authentication. Should be in format
# http://auth_url:5000/v3
# Defaults to undef
#
# [*validate*]
# (optional) Whether to validate the service is working after any service refreshes
# Defaults to undef
@ -362,9 +347,6 @@ class glance::api(
$default_store = undef,
$multi_store = false,
$show_multiple_locations = undef,
$keymgr_backend = undef,
$keymgr_encryption_api_url = undef,
$keymgr_encryption_auth_url = undef,
$validate = undef,
$validation_options = undef,
$scrub_time = undef,
@ -625,18 +607,6 @@ enabled_backends instead.')
max_request_body_size => $max_request_body_size,
}
if $keymgr_backend != undef {
warning('The keymgr_backend parameter is deprecated. Use the glance::key_manager class')
include glance::key_manager
}
['keymgr_encryption_api_url', 'keymgr_encryption_auth_url'].each |String $barbican_opt| {
if getvar("${barbican_opt}") != undef {
warning("The ${barbican_opt} parameter is deprecated. Use the glance::key_manager::barbican class")
}
include glance::key_manager::barbican
}
if $manage_service {
if $enabled {
$service_ensure = 'running'

4
manifests/key_manager.pp
View File

@ -14,9 +14,7 @@ class glance::key_manager (
include glance::deps
$backend_real = pick($glance::api::keymgr_backend, $backend)
oslo::key_manager { 'glance_api_config':
backend => $backend_real,
backend => $backend,
}
}

7
manifests/key_manager/barbican.pp
View File

@ -50,13 +50,10 @@ class glance::key_manager::barbican (
include glance::deps
$barbican_endpoint_real = pick($glance::api::keymgr_encryption_api_url, $barbican_endpoint)
$auth_endpoint_real = pick($glance::api::keymgr_encryption_auth_url, $auth_endpoint)
oslo::key_manager::barbican { 'glance_api_config':
barbican_endpoint => $barbican_endpoint_real,
barbican_endpoint => $barbican_endpoint,
barbican_api_version => $barbican_api_version,
auth_endpoint => $auth_endpoint_real,
auth_endpoint => $auth_endpoint,
retry_delay => $retry_delay,
number_of_retries => $number_of_retries,
barbican_endpoint_type => $barbican_endpoint_type,

9
releasenotes/notes/cleanup-keymgr-85f1f745648d37fd.yaml Normal file
View File

@ -0,0 +1,9 @@
---
upgrade:
- |
The following parameters of the ``glance::api`` class have been removed.
- ``keymgr_backend``
- ``keymgr_encryption_api_url``
- ``keymgr_encryption_auth_url``

15
spec/classes/glance_api_spec.rb
View File

@ -522,21 +522,6 @@ describe 'glance::api' do
is_expected.to contain_glance_api_config('taskflow_executor/conversion_format').with_value('raw')
end
end
describe 'with barbican parameters' do
let :params do
{
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
:keymgr_encryption_api_url => 'https://localhost:9311/v1',
:keymgr_encryption_auth_url => 'https://localhost:5000/v3',
}
end
it 'should set keymgr parameters' do
is_expected.to contain_glance_api_config('key_manager/backend').with_value('castellan.key_manager.barbican_key_manager.BarbicanKeyManager')
is_expected.to contain_glance_api_config('barbican/barbican_endpoint').with_value('https://localhost:9311/v1')
is_expected.to contain_glance_api_config('barbican/auth_endpoint').with_value('https://localhost:5000/v3')
end
end
end
shared_examples_for 'glance::api on Debian' do