openstack/puppet-ceilometer
Code Issues Proposed changes

Use $::os_service_default instead of undef as default value

Browse Source 
... so that we can ensure the parameter is managed and unset by
default.

Change-Id: If3cf0e385befc686fe3ed1b5be6bb63652c9b0f4
This commit is contained in:
Takashi Kajinami 2020-12-20 23:19:10 +09:00
parent 935666dab3
commit ecba97adec
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/agent/polling.pp
View File

@ -30,7 +30,7 @@
# #
# [*coordination_url*] # [*coordination_url*]
# (Optional) The url to use for distributed group membership coordination. # (Optional) The url to use for distributed group membership coordination.
# Defaults to undef. # Defaults to $::os_service_default.
# #
# [*instance_discovery_method*] # [*instance_discovery_method*]
# (Optional) method to discovery instances running on compute node # (Optional) method to discovery instances running on compute node
@ -65,7 +65,7 @@ class ceilometer::agent::polling (
$central_namespace = true, $central_namespace = true,
$compute_namespace = true, $compute_namespace = true,
$ipmi_namespace = true, $ipmi_namespace = true,
$coordination_url = undef, $coordination_url = $::os_service_default,
$instance_discovery_method = $::os_service_default, $instance_discovery_method = $::os_service_default,
$manage_polling = false, $manage_polling = false,
$polling_interval = 600, $polling_interval = 600,
@ -144,10 +144,15 @@ class ceilometer::agent::polling (
tag => 'ceilometer-service', tag => 'ceilometer-service',
} }
if $coordination_url { if $coordination_url == undef {
ceilometer_config { warning('Usage of undef for the coordination_url parameter has been deprecated. \
'coordination/backend_url': value => $coordination_url Use $::os_service_default instead')
$coordination_url_real = $::os_service_default
} else {
$coordination_url_real = $coordination_url
} }
ceilometer_config {
'coordination/backend_url': value => $coordination_url_real
} }
if $manage_polling { if $manage_polling {

13
releasenotes/notes/coordination_url-use-os_service_default-b51796ec9bc99129.yaml Normal file
View File

@ -0,0 +1,13 @@
---
upgrade:
- |
The default value for the ``ceilometer::agent::polling::coordination_url``
parameter has been changed from undef to $::os_service_default. Because
of this change now the ``ceilometer::agent::polling`` class ensures that
the ``coordination/backend_url`` parameter is unset by default.
deprecations:
- |
Usage of ``undef`` for the ``ceilometer::agent::polling::coordination_url``
parameter has been deprecated and will be removed in a future release.
Use ``$::os_service_default`` or any specific value instead.

2
spec/classes/ceilometer_agent_polling_spec.rb
View File

@ -48,7 +48,7 @@ describe 'ceilometer::agent::polling' do
:tag => 'ceilometer-service', :tag => 'ceilometer-service',
)} )}
it { should_not contain_ceilometer_config('coordination/backend_url') } it { should contain_ceilometer_config('coordination/backend_url').with_value('<SERVICE DEFAULT>') }
it { should_not contain_file('polling') } it { should_not contain_file('polling') }
end end