Make telemetry_secret actually required

... as is described. This option should be set to an appropriate key
value and the previous default (False) is not suitable for production
use.

Change-Id: Ic54025f2b6c1d023a8458491e3f26dda8adbceb0
This commit is contained in:
Takashi Kajinami 2023-12-06 01:53:08 +09:00
parent 2d8c944172
commit c6a7b16567
3 changed files with 5 additions and 10 deletions

View File

@ -5,6 +5,9 @@
#
# === Parameters:
#
# [*telemetry_secret*]
# (Required) Secret key for signing messages.
#
# [*http_timeout*]
# (Optional) Timeout seconds for HTTP requests.
# Defaults to $facts['os_service_default']
@ -14,9 +17,6 @@
# the same time.
# Defaults to $facts['os_service_default']
#
# [*telemetry_secret*]
# (Required) Secret key for signing messages.
#
# [*notification_topics*]
# (Optional) AMQP topic used for OpenStack notifications (list value)
# Defaults to 'notifications'.
@ -227,9 +227,9 @@
# Defaults to $facts['os_service_default'].
#
class ceilometer(
$telemetry_secret,
$http_timeout = $facts['os_service_default'],
$max_parallel_requests = $facts['os_service_default'],
$telemetry_secret = false,
$notification_topics = ['notifications'],
$notification_driver = $facts['os_service_default'],
$package_ensure = 'present',

View File

@ -2,10 +2,6 @@ require 'spec_helper'
describe 'ceilometer::agent::service_credentials' do
let :pre_condition do
"class { 'ceilometer': telemetry_secret => 's3cr3t' }"
end
let :params do
{ :password => 'password' }
end

View File

@ -74,8 +74,7 @@ describe 'ceilometer' do
end
it 'configures required telemetry_secret' do
is_expected.to contain_ceilometer_config('publisher/telemetry_secret').with_value('metering-s3cr3t')
is_expected.to contain_ceilometer_config('publisher/telemetry_secret').with_value( params[:telemetry_secret] ).with_secret(true)
is_expected.to contain_ceilometer_config('publisher/telemetry_secret').with_value(params[:telemetry_secret]).with_secret(true)
end
context 'without the required telemetry_secret' do