openstack
/
puppet-nova
Code Issues Proposed changes

Remove deprecated cinder parameters 

This change removes the deprecated cinder parameters from the nova
classes, because these were all deprecated before Zed release.

This also makes the nova::cinder class removes all credential
parameters in case the password parameter is unset, because these are
useless unless the password parameter is given.

Change-Id: I4fbd1c23c1fec1310675dd69491626c0f98e3dda
This commit is contained in:
Takashi Kajinami 2022-11-21 14:25:43 +09:00
parent 69d4a6d51d
commit c5fd57ddba
3 changed files with 38 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
manifests/cinder.pp
View File

@ -77,14 +77,14 @@
#
class nova::cinder (
$password = $::os_service_default,
$auth_type = undef,
$auth_url = undef,
$auth_type = 'password',
$auth_url = 'http://127.0.0.1:5000/',
$timeout = $::os_service_default,
$project_name = undef,
$project_domain_name = undef,
$system_scope = undef,
$username = undef,
$user_domain_name = undef,
$project_name = 'services',
$project_domain_name = 'Default',
$system_scope = $::os_service_default,
$username = 'cinder',
$user_domain_name = 'Default',
$os_region_name = $::os_service_default,
$catalog_info = $::os_service_default,
$http_retries = $::os_service_default,
@ -94,31 +94,31 @@ class nova::cinder (
include nova::deps
$os_region_name_real = pick($::nova::os_region_name, $os_region_name)
$catalog_info_real = pick($::nova::cinder_catalog_info, $catalog_info)
$cross_az_attach_real = pick($::nova::cross_az_attach, $cross_az_attach)
if is_service_default($password) {
$auth_type_real = pick($auth_type, $::os_service_default)
$auth_url_real = pick($auth_url, $::os_service_default)
$project_name_real = pick($project_name, $::os_service_default)
$project_domain_name_real = pick($project_domain_name, $::os_service_default)
$system_scope_real = pick($system_scope, $::os_service_default)
$username_real = pick($username, $::os_service_default)
$user_domain_name_real = pick($user_domain_name, $::os_service_default)
# Controller nodes do not require the admin credential while controller
# nodes require it. We keep the credential optional here to avoid
# requiring unnecessary credential.
$auth_type_real = $::os_service_default
$auth_url_real = $::os_service_default
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
$system_scope_real = $::os_service_default
$username_real = $::os_service_default
$user_domain_name_real = $::os_service_default
} else {
$system_scope_real = pick($system_scope, $::os_service_default)
if is_service_default($system_scope_real) {
$project_name_real = pick($project_name, 'services')
$project_domain_name_real = pick($project_domain_name, 'Default')
$auth_type_real = $auth_type
$auth_url_real = $auth_url
$username_real = $username
$user_domain_name_real = $user_domain_name
$system_scope_real = $system_scope
if is_service_default($system_scope) {
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
}
$auth_type_real = pick($auth_type, 'password')
$auth_url_real = pick($auth_url, 'http://127.0.0.1:5000/')
$username_real = pick($username, 'cinder')
$user_domain_name_real = pick($user_domain_name, 'Default')
}
nova_config {
@ -131,10 +131,10 @@ class nova::cinder (
'cinder/system_scope': value => $system_scope_real;
'cinder/username': value => $username_real;
'cinder/user_domain_name': value => $user_domain_name_real;
'cinder/os_region_name': value => $os_region_name_real;
'cinder/catalog_info': value => $catalog_info_real;
'cinder/os_region_name': value => $os_region_name;
'cinder/catalog_info': value => $catalog_info;
'cinder/http_retries': value => $http_retries;
'cinder/cross_az_attach': value => $cross_az_attach_real;
'cinder/cross_az_attach': value => $cross_az_attach;
'cinder/debug': value => $debug;
}
}

36
manifests/init.pp
View File

@ -362,24 +362,6 @@
# (optional) The strategy to use for auth: noauth or keystone.
# Defaults to undef
#
# [*os_region_name*]
# (optional) Sets the os_region_name flag. For environments with
# more than one endpoint per service, this is required to make
# things such as cinder volume attach work. If you don't set this
# and you have multiple endpoints, you will get AmbiguousEndpoint
# exceptions in the nova API service.
# Defaults to undef
#
# [*cinder_catalog_info*]
# (optional) Info to match when looking for cinder in the service
# catalog. Format is: separated values of the form:
# <service_type>:<service_name>:<endpoint_type>
# Defaults to undef
#
# [*cross_az_attach*]
# (optional) Allow attach between instance and volume in different availability zones.
# Defaults to undef
#
# [*upgrade_level_cert*]
# (optional) Sets a version cap for messages sent to cert services
# Defaults to undef
@ -461,9 +443,6 @@ class nova(
$dhcp_domain = $::os_service_default,
# DEPRECATED PARAMETERS
$auth_strategy = undef,
$os_region_name = undef,
$cinder_catalog_info = undef,
$cross_az_attach = undef,
$upgrade_level_cert = undef,
) inherits nova::params {
@ -475,21 +454,6 @@ class nova(
warning('enabled_ssl_apis is empty but use_ssl is set to true')
}
if $os_region_name != undef {
warning('The os_region_name parameter is deprecated and will be removed \
in a future release. Use nova::cinder::os_region_name instead')
}
if $cinder_catalog_info != undef {
warning('The catalog_info parameter is deprecated and will be removed \
in a future release. Use nova::cinder::catalog_info instead')
}
if $cross_az_attach != undef {
warning('The cross_az_attach parameter is deprecated. \
Use nova::cinder::cross_az_attach instead.')
}
if $upgrade_level_cert != undef {
warning('The upgrade_level_cert parameter is deprecated and will be removed \
in a future release.')

9
releasenotes/notes/remove-cinder-opts-fa152e7b58c61bd8.yaml Normal file
View File

@ -0,0 +1,9 @@
---
upgrade:
- |
The following parameters have been removed. Use the ``nova::cinder`` class
parameters instead.
- ``nova::os_region_name``
- ``nova::cinder_catalog_info``
- ``nova::cross_az_attach``