From e016a4bb234fc4ae2d6a0e6ea9665e1a83832867 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Wed, 3 May 2017 12:23:15 -0400 Subject: [PATCH] Expose snmpd auth params Change-Id: I55ac06e1a561d29d7e1c928a1684989c9654b95d --- manifests/init.pp | 12 ++++++++++++ spec/classes/ceilometer_init_spec.rb | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 9ef5551..84c5dbe 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -206,6 +206,14 @@ # (Optional) Password for message broker authentication # Defaults to $::os_service_default. # +# [*snmpd_readonly_username*] +# (Optional) User name for snmpd authentication +# Defaults to $::os_service_default. +# +# [*snmpd_readonly_user_password*] +# (Optional) Password for snmpd authentication +# Defaults to $::os_service_default. +# # [*purge_config*] # (optional) Whether to set only the specified config options # in the ceilometer config. @@ -291,6 +299,8 @@ class ceilometer( $amqp_sasl_config_name = $::os_service_default, $amqp_username = $::os_service_default, $amqp_password = $::os_service_default, + $snmpd_readonly_username = $::os_service_default, + $snmpd_readonly_user_password = $::os_service_default, $purge_config = false, # DEPRECATED PARAMETERS $alarm_history_time_to_live = undef, @@ -408,6 +418,8 @@ deprecated. Please use ceilometer::default_transport_url instead.") 'publisher/telemetry_secret' : value => $telemetry_secret_real, secret => true; 'database/event_time_to_live' : value => $event_time_to_live; 'database/metering_time_to_live' : value => $metering_time_to_live; + 'hardware/readonly_user_name' : value => $snmpd_readonly_username; + 'hardware/readonly_user_password' : value => $snmpd_readonly_user_password; } oslo::messaging::notifications { 'ceilometer_config': diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb index 011d9bb..644979a 100644 --- a/spec/classes/ceilometer_init_spec.rb +++ b/spec/classes/ceilometer_init_spec.rb @@ -134,6 +134,11 @@ describe 'ceilometer' do is_expected.to contain_ceilometer_config('oslo_messaging_notifications/transport_url').with_value('') end + it 'configures snmpd auth' do + is_expected.to contain_ceilometer_config('hardware/readonly_user_name').with_value('') + is_expected.to contain_ceilometer_config('hardware/readonly_user_password').with_value('') + end + context 'with rabbitmq durable queues configured' do before { params.merge!( :amqp_durable_queues => true ) } it_configures 'rabbit with durable queues' -- 2.45.2