Remove deprecated keymgr_* parameters
These were deprecated during Xena cycle in favor of the new separate
classes to customize key manager[1].
[1] bc7651fa5f
Change-Id: Id3395fd58cbdd7e686a08c8369cd38c3e322628b
This commit is contained in:
parent
b91d905887
commit
3aa1e7697d
|
@ -247,21 +247,6 @@
|
||||||
# properties.
|
# properties.
|
||||||
# Defaults to undef
|
# 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*]
|
# [*validate*]
|
||||||
# (optional) Whether to validate the service is working after any service refreshes
|
# (optional) Whether to validate the service is working after any service refreshes
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
|
@ -362,9 +347,6 @@ class glance::api(
|
||||||
$default_store = undef,
|
$default_store = undef,
|
||||||
$multi_store = false,
|
$multi_store = false,
|
||||||
$show_multiple_locations = undef,
|
$show_multiple_locations = undef,
|
||||||
$keymgr_backend = undef,
|
|
||||||
$keymgr_encryption_api_url = undef,
|
|
||||||
$keymgr_encryption_auth_url = undef,
|
|
||||||
$validate = undef,
|
$validate = undef,
|
||||||
$validation_options = undef,
|
$validation_options = undef,
|
||||||
$scrub_time = undef,
|
$scrub_time = undef,
|
||||||
|
@ -625,18 +607,6 @@ enabled_backends instead.')
|
||||||
max_request_body_size => $max_request_body_size,
|
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 $manage_service {
|
||||||
if $enabled {
|
if $enabled {
|
||||||
$service_ensure = 'running'
|
$service_ensure = 'running'
|
||||||
|
|
|
@ -14,9 +14,7 @@ class glance::key_manager (
|
||||||
|
|
||||||
include glance::deps
|
include glance::deps
|
||||||
|
|
||||||
$backend_real = pick($glance::api::keymgr_backend, $backend)
|
|
||||||
|
|
||||||
oslo::key_manager { 'glance_api_config':
|
oslo::key_manager { 'glance_api_config':
|
||||||
backend => $backend_real,
|
backend => $backend,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,13 +50,10 @@ class glance::key_manager::barbican (
|
||||||
|
|
||||||
include glance::deps
|
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':
|
oslo::key_manager::barbican { 'glance_api_config':
|
||||||
barbican_endpoint => $barbican_endpoint_real,
|
barbican_endpoint => $barbican_endpoint,
|
||||||
barbican_api_version => $barbican_api_version,
|
barbican_api_version => $barbican_api_version,
|
||||||
auth_endpoint => $auth_endpoint_real,
|
auth_endpoint => $auth_endpoint,
|
||||||
retry_delay => $retry_delay,
|
retry_delay => $retry_delay,
|
||||||
number_of_retries => $number_of_retries,
|
number_of_retries => $number_of_retries,
|
||||||
barbican_endpoint_type => $barbican_endpoint_type,
|
barbican_endpoint_type => $barbican_endpoint_type,
|
||||||
|
|
|
@ -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``
|
||||||
|
|
|
@ -522,21 +522,6 @@ describe 'glance::api' do
|
||||||
is_expected.to contain_glance_api_config('taskflow_executor/conversion_format').with_value('raw')
|
is_expected.to contain_glance_api_config('taskflow_executor/conversion_format').with_value('raw')
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|
||||||
shared_examples_for 'glance::api on Debian' do
|
shared_examples_for 'glance::api on Debian' do
|
||||||
|
|
Loading…
Reference in New Issue