openstack/puppet-ceilometer
Code Issues Proposed changes

Prepare for new lint plugins

Browse Source 
This fixes a few lint warnings/errors detected by the following plugins
we aim to enable soon.
 - puppet-lint-file_ensure-check
 - puppet-lint-trailing_comma-check
 - puppet-lint-topscope-variable-check

Change-Id: I3ec372b6771012ea3b50521f142e5c3411694dca
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-15 19:33:50 +09:00
parent 7af985bb2c
commit 1ebfb2c40e
8 changed files with 62 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/site.pp
View File

@@ -1,13 +1,9 @@
node default { node default {
Exec {
path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin']
}
# Add the base ceilometer class & parameters # Add the base ceilometer class & parameters
# This class is required by ceilometer agents & api classes # This class is required by ceilometer agents & api classes
# The telemetry_secret parameter is mandatory # The telemetry_secret parameter is mandatory
class { 'ceilometer': class { 'ceilometer':
telemetry_secret => 'darksecret' telemetry_secret => 'darksecret',
} }
class { 'ceilometer::db::sync': } class { 'ceilometer::db::sync': }
@@ -19,7 +15,7 @@ node default {
# Set common auth parameters used by all agents (compute/central) # Set common auth parameters used by all agents (compute/central)
class { 'ceilometer::agent::service_credentials': class { 'ceilometer::agent::service_credentials':
auth_url => 'http://localhost:5000/v3', auth_url => 'http://localhost:5000/v3',
password => 'a_big_secret' password => 'a_big_secret',
} }
# Install polling agent # Install polling agent

24
manifests/agent/notification.pp
View File

@@ -128,8 +128,8 @@ class ceilometer::agent::notification (
package { 'ceilometer-notification': package { 'ceilometer-notification':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ceilometer::params::agent_notification_package_name, name => $ceilometer::params::agent_notification_package_name,
tag => ['openstack', 'ceilometer-package'] tag => ['openstack', 'ceilometer-package'],
} }
if $manage_service { if $manage_service {
@@ -141,11 +141,11 @@ class ceilometer::agent::notification (
service { 'ceilometer-agent-notification': service { 'ceilometer-agent-notification':
ensure => $service_ensure, ensure => $service_ensure,
name => $::ceilometer::params::agent_notification_service_name, name => $ceilometer::params::agent_notification_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
tag => 'ceilometer-service' tag => 'ceilometer-service',
} }
} }
@@ -157,17 +157,17 @@ class ceilometer::agent::notification (
} }
file { 'event_pipeline': file { 'event_pipeline':
ensure => present, ensure => file,
path => $::ceilometer::params::event_pipeline, path => $ceilometer::params::event_pipeline,
content => $event_pipeline_content, content => $event_pipeline_content,
mode => '0640', mode => '0640',
owner => 'root', owner => 'root',
group => $::ceilometer::params::group, group => $ceilometer::params::group,
tag => 'ceilometer-yamls', tag => 'ceilometer-yamls',
} }
ceilometer_config { ceilometer_config {
'DEFAULT/event_pipeline_cfg_file': value => $::ceilometer::params::event_pipeline; 'DEFAULT/event_pipeline_cfg_file': value => $ceilometer::params::event_pipeline;
} }
} else { } else {
ceilometer_config { ceilometer_config {
@@ -183,17 +183,17 @@ class ceilometer::agent::notification (
} }
file { 'pipeline': file { 'pipeline':
ensure => present, ensure => file,
path => $::ceilometer::params::pipeline, path => $ceilometer::params::pipeline,
content => $pipeline_content, content => $pipeline_content,
mode => '0640', mode => '0640',
owner => 'root', owner => 'root',
group => $::ceilometer::params::group, group => $ceilometer::params::group,
tag => 'ceilometer-yamls', tag => 'ceilometer-yamls',
} }
ceilometer_config { ceilometer_config {
'DEFAULT/pipeline_cfg_file': value => $::ceilometer::params::pipeline; 'DEFAULT/pipeline_cfg_file': value => $ceilometer::params::pipeline;
} }
} else { } else {
ceilometer_config { ceilometer_config {

38
manifests/agent/polling.pp
View File

@@ -66,7 +66,7 @@
# [*polling_meters*] # [*polling_meters*]
# (Optional) Array of strings with meters to add to # (Optional) Array of strings with meters to add to
# the polling.yaml file, used only if manage_polling is true. # the polling.yaml file, used only if manage_polling is true.
# Defaults to $::ceilometer::params::polling_meters # Defaults to $ceilometer::params::polling_meters
# #
# [*polling_config*] # [*polling_config*]
# (Optional) A hash of the polling.yaml configuration. # (Optional) A hash of the polling.yaml configuration.
@@ -143,7 +143,7 @@ class ceilometer::agent::polling (
$resource_cache_expiry = $facts['os_service_default'], $resource_cache_expiry = $facts['os_service_default'],
Boolean $manage_polling = false, Boolean $manage_polling = false,
$polling_interval = 300, $polling_interval = 300,
Array[String[1]] $polling_meters = $::ceilometer::params::polling_meters, Array[String[1]] $polling_meters = $ceilometer::params::polling_meters,
Optional[Hash] $polling_config = undef, Optional[Hash] $polling_config = undef,
$cfg_file = $facts['os_service_default'], $cfg_file = $facts['os_service_default'],
$batch_size = $facts['os_service_default'], $batch_size = $facts['os_service_default'],
@@ -184,7 +184,7 @@ Use the identity_name_discovery parameter instead.")
# the ceilometer user can access libvirt to gather some metrics. # the ceilometer user can access libvirt to gather some metrics.
$ceilometer_groups = delete_undef_values([ $ceilometer_groups = delete_undef_values([
'nova', 'nova',
$::ceilometer::params::libvirt_group $ceilometer::params::libvirt_group,
]) ])
user { 'ceilometer': user { 'ceilometer':
@@ -196,7 +196,7 @@ Use the identity_name_discovery parameter instead.")
before => Anchor['ceilometer::service::begin'], before => Anchor['ceilometer::service::begin'],
} }
if $::ceilometer::params::libvirt_group { if $ceilometer::params::libvirt_group {
Package <| title == 'libvirt' |> -> User['ceilometer'] Package <| title == 'libvirt' |> -> User['ceilometer']
} }
Package <| title == 'nova-common' |> -> User['ceilometer'] Package <| title == 'nova-common' |> -> User['ceilometer']
@@ -229,7 +229,7 @@ Use the identity_name_discovery parameter instead.")
if $central_namespace { if $central_namespace {
package { 'ceilometer-central': package { 'ceilometer-central':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ceilometer::params::agent_central_package_name, name => $ceilometer::params::agent_central_package_name,
tag => ['openstack', 'ceilometer-package'], tag => ['openstack', 'ceilometer-package'],
} }
} }
@@ -237,7 +237,7 @@ Use the identity_name_discovery parameter instead.")
if $compute_namespace { if $compute_namespace {
package { 'ceilometer-compute': package { 'ceilometer-compute':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ceilometer::params::agent_compute_package_name, name => $ceilometer::params::agent_compute_package_name,
tag => ['openstack', 'ceilometer-package'], tag => ['openstack', 'ceilometer-package'],
} }
} }
@@ -245,7 +245,7 @@ Use the identity_name_discovery parameter instead.")
if $ipmi_namespace { if $ipmi_namespace {
package { 'ceilometer-ipmi': package { 'ceilometer-ipmi':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ceilometer::params::agent_ipmi_package_name, name => $ceilometer::params::agent_ipmi_package_name,
tag => ['openstack', 'ceilometer-package'], tag => ['openstack', 'ceilometer-package'],
} }
} }
@@ -253,7 +253,7 @@ Use the identity_name_discovery parameter instead.")
} else { } else {
package { 'ceilometer-polling': package { 'ceilometer-polling':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ceilometer::params::agent_polling_package_name, name => $ceilometer::params::agent_polling_package_name,
tag => ['openstack', 'ceilometer-package'], tag => ['openstack', 'ceilometer-package'],
} }
} }
@@ -261,16 +261,16 @@ Use the identity_name_discovery parameter instead.")
$namespaces_real = delete_undef_values([ $namespaces_real = delete_undef_values([
$central_namespace_name, $central_namespace_name,
$compute_namespace_name, $compute_namespace_name,
$ipmi_namespace_name $ipmi_namespace_name,
]) ])
if empty($namespaces_real) or $separate_services { if empty($namespaces_real) or $separate_services {
ceilometer_config { ceilometer_config {
'DEFAULT/polling_namespaces': ensure => absent 'DEFAULT/polling_namespaces': ensure => absent;
} }
} else { } else {
ceilometer_config { ceilometer_config {
'DEFAULT/polling_namespaces': value => join($namespaces_real, ',') 'DEFAULT/polling_namespaces': value => join($namespaces_real, ',');
} }
} }
@@ -298,7 +298,7 @@ Use the identity_name_discovery parameter instead.")
if $central_namespace { if $central_namespace {
service { 'ceilometer-central': service { 'ceilometer-central':
ensure => $service_ensure, ensure => $service_ensure,
name => $::ceilometer::params::agent_central_service_name, name => $ceilometer::params::agent_central_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
@@ -308,7 +308,7 @@ Use the identity_name_discovery parameter instead.")
if $compute_namespace { if $compute_namespace {
service { 'ceilometer-compute': service { 'ceilometer-compute':
ensure => $service_ensure, ensure => $service_ensure,
name => $::ceilometer::params::agent_compute_service_name, name => $ceilometer::params::agent_compute_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
@@ -318,7 +318,7 @@ Use the identity_name_discovery parameter instead.")
if $ipmi_namespace { if $ipmi_namespace {
service { 'ceilometer-ipmi': service { 'ceilometer-ipmi':
ensure => $service_ensure, ensure => $service_ensure,
name => $::ceilometer::params::agent_ipmi_service_name, name => $ceilometer::params::agent_ipmi_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
@@ -328,7 +328,7 @@ Use the identity_name_discovery parameter instead.")
} else { } else {
service { 'ceilometer-polling': service { 'ceilometer-polling':
ensure => $service_ensure, ensure => $service_ensure,
name => $::ceilometer::params::agent_polling_service_name, name => $ceilometer::params::agent_polling_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
@@ -345,17 +345,17 @@ Use the identity_name_discovery parameter instead.")
} }
file { 'polling': file { 'polling':
ensure => present, ensure => file,
path => $::ceilometer::params::polling, path => $ceilometer::params::polling,
content => $polling_content, content => $polling_content,
mode => '0640', mode => '0640',
owner => 'root', owner => 'root',
group => $::ceilometer::params::group, group => $ceilometer::params::group,
tag => 'ceilometer-yamls', tag => 'ceilometer-yamls',
} }
ceilometer_config { ceilometer_config {
'polling/cfg_file': value => $::ceilometer::params::polling; 'polling/cfg_file': value => $ceilometer::params::polling;
} }
} else { } else {
ceilometer_config { ceilometer_config {

2
manifests/coordination.pp
View File

@@ -15,7 +15,7 @@ class ceilometer::coordination (
include ceilometer::deps include ceilometer::deps
oslo::coordination{ 'ceilometer_config': oslo::coordination{ 'ceilometer_config':
backend_url => $backend_url backend_url => $backend_url,
} }
# all coordination settings should be applied and all packages should be # all coordination settings should be applied and all packages should be

4
manifests/db/sync.pp
View File

@@ -32,9 +32,9 @@ class ceilometer::db::sync(
} }
exec { 'ceilometer-upgrade': exec { 'ceilometer-upgrade':
command => "${::ceilometer::params::dbsync_command} ${skip_opt}${extra_params}", command => "${ceilometer::params::dbsync_command} ${skip_opt}${extra_params}",
path => '/usr/bin', path => '/usr/bin',
user => $::ceilometer::params::user, user => $ceilometer::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

2
manifests/init.pp
View File

@@ -245,7 +245,7 @@ class ceilometer(
package { 'ceilometer-common': package { 'ceilometer-common':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ceilometer::params::common_package_name, name => $ceilometer::params::common_package_name,
tag => ['openstack', 'ceilometer-package'], tag => ['openstack', 'ceilometer-package'],
} }

32
spec/classes/ceilometer_agent_notification_spec.rb
View File

@@ -112,10 +112,11 @@ describe 'ceilometer::agent::notification' do
) } ) }
it { is_expected.to contain_file('event_pipeline').with( it { is_expected.to contain_file('event_pipeline').with(
'path' => '/etc/ceilometer/event_pipeline.yaml', :ensure => 'file',
'owner' => 'root', :path => '/etc/ceilometer/event_pipeline.yaml',
'group' => 'ceilometer', :owner => 'root',
'mode' => '0640', :group => 'ceilometer',
:mode => '0640',
) } ) }
it { 'configures event_pipeline with the default notifier' it { 'configures event_pipeline with the default notifier'
@@ -176,7 +177,12 @@ describe 'ceilometer::agent::notification' do
)} )}
it { should contain_file('event_pipeline').with( it { should contain_file('event_pipeline').with(
:content => '--- :ensure => 'file',
:path => '/etc/ceilometer/event_pipeline.yaml',
:owner => 'root',
:group => 'ceilometer',
:mode => '0640',
:content => '---
sources: sources:
- name: my_event_source - name: my_event_source
events: events:
@@ -206,10 +212,11 @@ sinks:
) } ) }
it { is_expected.to contain_file('pipeline').with( it { is_expected.to contain_file('pipeline').with(
'path' => '/etc/ceilometer/pipeline.yaml', :ensure => 'file',
'mode' => '0640', :path => '/etc/ceilometer/pipeline.yaml',
'owner' => 'root', :mode => '0640',
'group' => 'ceilometer', :owner => 'root',
:group => 'ceilometer',
) } ) }
it { is_expected.to contain_ceilometer_config('DEFAULT/pipeline_cfg_file').with_value('/etc/ceilometer/pipeline.yaml') } it { is_expected.to contain_ceilometer_config('DEFAULT/pipeline_cfg_file').with_value('/etc/ceilometer/pipeline.yaml') }
end end
@@ -231,7 +238,12 @@ sinks:
)} )}
it { should contain_file('pipeline').with( it { should contain_file('pipeline').with(
:content => '--- :ensure => 'file',
:path => '/etc/ceilometer/pipeline.yaml',
:mode => '0640',
:owner => 'root',
:group => 'ceilometer',
:content => '---
sources: sources:
- name: my_source - name: my_source
meters: meters:

6
spec/classes/ceilometer_agent_polling_spec.rb
View File

@@ -218,7 +218,7 @@ describe 'ceilometer::agent::polling' do
end end
it { should contain_file('polling').with( it { should contain_file('polling').with(
:ensure => 'present', :ensure => 'file',
:path => '/etc/ceilometer/polling.yaml', :path => '/etc/ceilometer/polling.yaml',
:content => '--- :content => '---
sources: sources:
@@ -252,7 +252,7 @@ sources:
end end
it { should contain_file('polling').with( it { should contain_file('polling').with(
:ensure => 'present', :ensure => 'file',
:path => '/etc/ceilometer/polling.yaml', :path => '/etc/ceilometer/polling.yaml',
:content => '--- :content => '---
sources: sources:
@@ -283,7 +283,7 @@ sources:
end end
it { should contain_file('polling').with( it { should contain_file('polling').with(
:ensure => 'present', :ensure => 'file',
:path => '/etc/ceilometer/polling.yaml', :path => '/etc/ceilometer/polling.yaml',
:content => '--- :content => '---
sources: sources: