diff --git a/manifests/init.pp b/manifests/init.pp index f890e750..c374025d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -208,16 +208,6 @@ # IP address. # 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( $http_timeout = $::os_service_default, $max_parallel_requests = $::os_service_default, @@ -263,18 +253,11 @@ class ceilometer( $amqp_password = $::os_service_default, $purge_config = false, $host = $::os_service_default, - # DEPRECATED PARAMETERS - $snmpd_readonly_username = undef, - $snmpd_readonly_user_password = undef, ) { include ceilometer::deps 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': ensure => $package_ensure, name => $::ceilometer::params::common_package_name, @@ -329,11 +312,6 @@ class ceilometer( 'DEFAULT/host' : value => $host; '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': transport_url => $notification_transport_url, diff --git a/releasenotes/notes/remove-hardware-opts-88e4b49767d7b185.yaml b/releasenotes/notes/remove-hardware-opts-88e4b49767d7b185.yaml new file mode 100644 index 00000000..e210d394 --- /dev/null +++ b/releasenotes/notes/remove-hardware-opts-88e4b49767d7b185.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The following parameters of the ``ceilometer`` class have been removed. + + - ``snmpd_readonly_user_name`` + - ``snmpd_readonly_user_password`` +