openstack
/
puppet-cinder
Code Issues Proposed changes

Remove the deprecated keymgr_* parameters of cinder::api 

... because these parameters were deprecated during the previous cycle.

Change-Id: I836db974b6e3e7d6573213f8bcab1b563983b0c2
This commit is contained in:
Takashi Kajinami 2021-01-23 10:34:52 +09:00
parent 467bc71d72
commit 4d8daebe5f
3 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/api.pp
View File

@ -104,23 +104,6 @@
# will also need to be changed to match.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*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
#
# [*keymgr_backend*]
# (optional) Key Manager service class.
# Example of valid value: barbican
# Defaults to undef
#
# [*os_region_name*]
# (optional) Some operations require cinder to make API requests
# to Nova. This sets the keystone region to be used for these
@ -152,9 +135,6 @@ class cinder::api (
$auth_strategy = 'keystone',
$osapi_volume_listen_port = $::os_service_default,
# DEPRECATED PARAMETERS
$keymgr_backend = undef,
$keymgr_encryption_api_url = undef,
$keymgr_encryption_auth_url = undef,
$os_region_name = undef
) inherits cinder::params {
@ -162,12 +142,6 @@ class cinder::api (
include cinder::params
include cinder::policy
['keymgr_backend', 'keymgr_encryption_api_url', 'keymgr_encryption_auth_url'].each |String $keymgr_var| {
if getvar("${keymgr_var}") != undef {
warning("cinder::api::${keymgr_var} is deprecated, use cinder::${keymgr_var} instead.")
}
}
if $os_region_name != undef {
warning('cinder::api::os_region_name is deprecated and has no effect. \
Use cinder::nova::region_name instead')

13
manifests/init.pp
View File

@ -451,13 +451,6 @@ removed in a future realse. Use cinder::db::database_max_overflow instead')
$default_availability_zone_real = $default_availability_zone
}
# NOTE(abishop): Remove the picks when cinder::api::keymgr_* are removed.
$keymgr_backend_real = pick($cinder::api::keymgr_backend, $keymgr_backend)
$keymgr_encryption_api_url_real = pick($cinder::api::keymgr_encryption_api_url,
$keymgr_encryption_api_url)
$keymgr_encryption_auth_url_real = pick($cinder::api::keymgr_encryption_auth_url,
$keymgr_encryption_auth_url)
cinder_config {
'DEFAULT/report_interval': value => $report_interval;
'DEFAULT/service_down_time': value => $service_down_time;
@ -469,9 +462,9 @@ removed in a future realse. Use cinder::db::database_max_overflow instead')
'DEFAULT/host': value => $host;
'DEFAULT/enable_new_services': value => $enable_new_services;
'DEFAULT/enable_force_upload': value => $enable_force_upload;
'key_manager/backend': value => $keymgr_backend_real;
'barbican/barbican_endpoint': value => $keymgr_encryption_api_url_real;
'barbican/auth_endpoint': value => $keymgr_encryption_auth_url_real;
'key_manager/backend': value => $keymgr_backend;
'barbican/barbican_endpoint': value => $keymgr_encryption_api_url;
'barbican/auth_endpoint': value => $keymgr_encryption_auth_url;
# NOTE(abishop): $backend_host is not written here because it is not a valid
# DEFAULT option. It is only recognized in the backend sections. Instead,
# for backward compatibility, backends.pp references this parameter.

9
releasenotes/notes/api-keymgr-cleanup-2fd57dc60c2c0288.yaml Normal file
View File

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