openstack
/
puppet-trove
Code Issues Proposed changes

Deprecate support for [DEFAULT] default_password_length 

This option was deprecated[1] in favor of the datastore-specific
options.

[1] f4cbaf6ccd3c6de14837fcf9532e44de1265bdf6

Change-Id: I4f89dcc5f70e03e210d038e80adba3002c5dc9c9
This commit is contained in:
Takashi Kajinami 2023-02-20 20:04:07 +09:00
parent 12131677e9
commit 019c9b1a43
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/guestagent.pp
View File

@ -68,10 +68,6 @@
# (optional) Permissions to grant "root" user option.
# Defaults to $::os_service_default.
#
# [*default_password_length*]
# (optional) Default password Length for root password.
# Defaults to $::os_service_default.
#
# [*container_registry*]
# (optional) URL to the registry.
# Defaults to $::os_service_default.
@ -86,6 +82,10 @@
#
# DEPRECATED PARAMETERS
#
# [*default_password_length*]
# (optional) Default password Length for root password.
# Defaults to undef
#
# [*backup_aes_cbc_key*]
# (optional) Default OpenSSL aes_cbc key
# Defaults to undef
@ -105,11 +105,11 @@ class trove::guestagent(
$rabbit_use_ssl = $::trove::rabbit_use_ssl,
$root_grant = $::os_service_default,
$root_grant_option = $::os_service_default,
$default_password_length = $::os_service_default,
$container_registry = $::os_service_default,
$container_registry_username = $::os_service_default,
$container_registry_password = $::os_service_default,
# DEPRECATED PARAMETERS
$default_password_length = undef,
$backup_aes_cbc_key = undef,
) inherits trove {
@ -127,7 +127,7 @@ class trove::guestagent(
'DEFAULT/swift_service_type': value => $swift_service_type;
'DEFAULT/root_grant': value => $root_grant;
'DEFAULT/root_grant_option': value => $root_grant_option;
'DEFAULT/default_password_length': value => $default_password_length;
'DEFAULT/default_password_length': value => pick($default_password_length, $::os_service_default);
'DEFAULT/backup_aes_cbc_key': value => pick($backup_aes_cbc_key, $::os_service_default);
}

5
releasenotes/notes/deprecate-default_password_length-cb13316b55232a7e.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``trove::guestagent::default_password_length`` parameter has been
deprecated.