openstack/puppet-swift
Code Issues Proposed changes

ceilometer: Remove redundant default of nonblocking_notify

Browse Source 
Change-Id: Id83695510c574fc8e9b16fe6b9bd4568461705a0
This commit is contained in:
Takashi Kajinami
2023-12-24 23:07:32 +09:00
parent 3244a67f56
commit a312a03bb8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/proxy/ceilometer.pp
View File

@@ -34,7 +34,7 @@
# #
# [*nonblocking_notify*] # [*nonblocking_notify*]
# Whether to send events to messaging driver in a background thread # Whether to send events to messaging driver in a background thread
# Defaults to false # Defaults to $facts['os_service_default'].
# #
# [*ignore_projects*] # [*ignore_projects*]
# What projects to ignore to send events to ceilometer # What projects to ignore to send events to ceilometer
@@ -167,7 +167,7 @@ class swift::proxy::ceilometer(
$topic = $facts['os_service_default'], $topic = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'], $control_exchange = $facts['os_service_default'],
$ensure = 'present', $ensure = 'present',
$nonblocking_notify = false, $nonblocking_notify = $facts['os_service_default'],
$ignore_projects = ['services'], $ignore_projects = ['services'],
$auth_url = 'http://127.0.0.1:5000', $auth_url = 'http://127.0.0.1:5000',
$auth_type = 'password', $auth_type = 'password',

2
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@@ -29,7 +29,7 @@ describe 'swift::proxy::ceilometer' do
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/driver').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/driver').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/topic').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/topic').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/control_exchange').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/control_exchange').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/nonblocking_notify').with_value('false') } it { is_expected.to contain_swift_proxy_config('filter:ceilometer/nonblocking_notify').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_package('python-ceilometermiddleware').with( it { is_expected.to contain_package('python-ceilometermiddleware').with(
:ensure => 'present', :ensure => 'present',