openstack/puppet-ceilometer
Code Issues Proposed changes

Remove parameters for [hardware] options

Browse Source 
... because these parameters were deprecated during the previous
cycle[1] and the feature has been removed from Ceilometer already.

[1] e5ce40b16d7534a917416cb2e5f3669336fc816f

Change-Id: Ibaba550aa9a13c7b1afb62970e391c1d4beb2f08
This commit is contained in:
Takashi Kajinami 2022-11-15 11:13:31 +09:00
parent 2abdae02d9
commit 6d78011587
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/init.pp
View File

@ -208,16 +208,6 @@
# IP address. # IP address.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# DEPRECATED PARAMETERS
#
# [*snmpd_readonly_username*]
# (Optional) User name for snmpd authentication
# Defaults to undef
#
# [*snmpd_readonly_user_password*]
# (Optional) Password for snmpd authentication
# Defaults to undef
#
class ceilometer( class ceilometer(
$http_timeout = $::os_service_default, $http_timeout = $::os_service_default,
$max_parallel_requests = $::os_service_default, $max_parallel_requests = $::os_service_default,
@ -263,18 +253,11 @@ class ceilometer(
$amqp_password = $::os_service_default, $amqp_password = $::os_service_default,
$purge_config = false, $purge_config = false,
$host = $::os_service_default, $host = $::os_service_default,
# DEPRECATED PARAMETERS
$snmpd_readonly_username = undef,
$snmpd_readonly_user_password = undef,
) { ) {
include ceilometer::deps include ceilometer::deps
include ceilometer::params include ceilometer::params
if $snmpd_readonly_username != undef or $snmpd_readonly_user_password != undef {
warning('The snmpd_readonly_* parameters have been deprecated and have no effect.')
}
package { 'ceilometer-common': package { 'ceilometer-common':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ceilometer::params::common_package_name, name => $::ceilometer::params::common_package_name,
@ -329,11 +312,6 @@ class ceilometer(
'DEFAULT/host' : value => $host; 'DEFAULT/host' : value => $host;
'publisher/telemetry_secret' : value => $telemetry_secret, secret => true; 'publisher/telemetry_secret' : value => $telemetry_secret, secret => true;
} }
# TODO(tkajinam): Remove this after Zed
ceilometer_config {
'hardware/readonly_user_name' : ensure => absent;
'hardware/readonly_user_password': ensure => absent, secret => true;
}
oslo::messaging::notifications { 'ceilometer_config': oslo::messaging::notifications { 'ceilometer_config':
transport_url => $notification_transport_url, transport_url => $notification_transport_url,

8
releasenotes/notes/remove-hardware-opts-88e4b49767d7b185.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The following parameters of the ``ceilometer`` class have been removed.
- ``snmpd_readonly_user_name``
- ``snmpd_readonly_user_password``