openstack
/
puppet-trove
Code Issues Proposed changes

Merge "guestagent: Deprecate the backup_aes_cbc_key parameter"

This commit is contained in:
Zuul 2022-03-18 09:29:05 +00:00 committed by Gerrit Code Review
parent b732428800 977c0dc0e5
commit e6686c48a9
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/guestagent.pp
View File

@ -72,16 +72,16 @@
# (optional) Default password Length for root password. # (optional) Default password Length for root password.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# [*backup_aes_cbc_key*]
# (optional) Default OpenSSL aes_cbc key
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*control_exchange*] # [*control_exchange*]
# (Optional) Moved to init.pp. The default exchange to scope topics. # (Optional) Moved to init.pp. The default exchange to scope topics.
# Defaults to undef. # Defaults to undef.
# #
# [*backup_aes_cbc_key*]
# (optional) Default OpenSSL aes_cbc key
# Defaults to undef
#
class trove::guestagent( class trove::guestagent(
$enabled = false, $enabled = false,
$manage_service = true, $manage_service = true,
@ -98,9 +98,9 @@ class trove::guestagent(
$root_grant = $::os_service_default, $root_grant = $::os_service_default,
$root_grant_option = $::os_service_default, $root_grant_option = $::os_service_default,
$default_password_length = $::os_service_default, $default_password_length = $::os_service_default,
$backup_aes_cbc_key = $::os_service_default,
#Deprecated #Deprecated
$control_exchange = undef, $control_exchange = undef,
$backup_aes_cbc_key = undef,
) inherits trove { ) inherits trove {
include trove::deps include trove::deps
@ -112,6 +112,10 @@ class trove::guestagent(
trove::control_exchange instead.") trove::control_exchange instead.")
} }
if $backup_aes_cbc_key != undef {
warning('The parameter backup_aes_cbc_key is deprecated for removal')
}
# basic service config # basic service config
trove_guestagent_config { trove_guestagent_config {
'DEFAULT/swift_url': value => $swift_url; 'DEFAULT/swift_url': value => $swift_url;
@ -119,7 +123,7 @@ trove::control_exchange instead.")
'DEFAULT/root_grant': value => $root_grant; 'DEFAULT/root_grant': value => $root_grant;
'DEFAULT/root_grant_option': value => $root_grant_option; 'DEFAULT/root_grant_option': value => $root_grant_option;
'DEFAULT/default_password_length': value => $default_password_length; 'DEFAULT/default_password_length': value => $default_password_length;
'DEFAULT/backup_aes_cbc_key': value => $backup_aes_cbc_key; 'DEFAULT/backup_aes_cbc_key': value => pick($backup_aes_cbc_key, $::os_service_default);
} }
oslo::messaging::default { 'trove_guestagent_config': oslo::messaging::default { 'trove_guestagent_config':

5
releasenotes/notes/deprecate-guestagent-backup_aes_cbc_key-84ed0dd16e26c8b9.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``trove::guestagent::backup_aes_cbc_key`` parameter has been deprecated
because the actual parameter in Trove was already deprecated.