openstack/puppet-ceilometer
Code Issues Proposed changes

Prepare for voxpupuli-puppet-lint-plugins

Browse Source 
Fix new lint errors detected when full of the voxpupili lint plugins
are enabled.

Change-Id: I28c786acfaf5034b8105cfd3da13ac79e580ebce
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-19 21:52:14 +09:00
parent 743c74f2a1
commit bb7054abe7
16 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/site.pp
View File

@@ -43,7 +43,5 @@ node default {
}
# Install notification agent
class { 'ceilometer::agent::notification':
}
class { 'ceilometer::agent::notification': }
}

1
manifests/agent/notification.pp
View File

@@ -122,7 +122,6 @@ class ceilometer::agent::notification (
Array[String[1]] $pipeline_publishers = ['gnocchi://'],
$pipeline_cfg_file = $facts['os_service_default'],
) {
include ceilometer::deps
include ceilometer::params

2
manifests/agent/polling.pp
View File

@@ -159,7 +159,6 @@ class ceilometer::agent::polling (
# DEPRECATED PARAMETERS
$tenant_name_discovery = undef,
) inherits ceilometer {
include ceilometer::deps
include ceilometer::params
@@ -249,7 +248,6 @@ Use the identity_name_discovery parameter instead.")
tag => ['openstack', 'ceilometer-package'],
}
}
} else {
package { 'ceilometer-polling':
ensure => $package_ensure,

1
manifests/agent/polling/rgw.pp
View File

@@ -21,7 +21,6 @@ class ceilometer::agent::polling::rgw (
$secret_key = $facts['os_service_default'],
$implicit_tenants = $facts['os_service_default'],
) {
include ceilometer::deps
ceilometer_config {

1
manifests/agent/polling/service_types.pp
View File

@@ -36,7 +36,6 @@ class ceilometer::agent::polling::service_types (
$cinder = $facts['os_service_default'],
$radosgw = $facts['os_service_default'],
) {
include ceilometer::deps
ceilometer_config {

1
manifests/agent/service_credentials.pp
View File

@@ -62,7 +62,6 @@ class ceilometer::agent::service_credentials (
$project_domain_name = 'Default',
$auth_type = 'password',
) {
include ceilometer::deps
if is_service_default($system_scope) {

1
manifests/cache.pp
View File

@@ -259,7 +259,6 @@ class ceilometer::cache (
$dead_timeout = $facts['os_service_default'],
Boolean $manage_backend_package = true,
) {
include ceilometer::deps
oslo::cache { 'ceilometer_config':

2
manifests/config.pp
View File

@@ -29,10 +29,8 @@ class ceilometer::config (
Hash $ceilometer_config = {},
Hash $ceilometer_rootwrap_config = {},
) {
include ceilometer::deps
create_resources('ceilometer_config', $ceilometer_config)
create_resources('ceilometer_rootwrap_config', $ceilometer_rootwrap_config)
}

3
manifests/coordination.pp
View File

@@ -11,10 +11,9 @@
class ceilometer::coordination (
$backend_url = $facts['os_service_default'],
) {
include ceilometer::deps
oslo::coordination{ 'ceilometer_config':
oslo::coordination { 'ceilometer_config':
backend_url => $backend_url,
}

4
manifests/db/sync.pp
View File

@@ -17,12 +17,11 @@
# (Optional) Skip gnocchi resource-types upgrade.
# Defaults to false
#
class ceilometer::db::sync(
class ceilometer::db::sync (
$extra_params = undef,
$db_sync_timeout = 300,
Boolean $skip_gnocchi_resource_types = false,
) {
include ceilometer::deps
include ceilometer::params
@@ -48,5 +47,4 @@ class ceilometer::db::sync(
notify => Anchor['ceilometer::dbsync::end'],
tag => 'openstack-db',
}
}

1
manifests/deps.pp
View File

@@ -3,7 +3,6 @@
# Ceilometer anchors and dependency management
#
class ceilometer::deps {
assert_private()
# Setup anchors for install, config and service phases of the module. These

5
manifests/init.pp
View File

@@ -194,7 +194,7 @@
# (Optional) Timeout seconds for HTTP requests.
# Defaults to undef
#
class ceilometer(
class ceilometer (
$telemetry_secret,
$max_parallel_requests = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'],
@@ -235,7 +235,6 @@ class ceilometer(
$rabbit_heartbeat_in_pthread = undef,
$http_timeout = undef,
) {
include ceilometer::deps
include ceilometer::params
@@ -253,7 +252,7 @@ class ceilometer(
purge => $purge_config,
}
oslo::messaging::rabbit {'ceilometer_config':
oslo::messaging::rabbit { 'ceilometer_config':
rabbit_ha_queues => $rabbit_ha_queues,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate,

1
manifests/keystone/auth.pp
View File

@@ -61,7 +61,6 @@ class ceilometer::keystone::auth (
$system_scope = 'all',
$system_roles = [],
) {
include ceilometer::deps
# NOTE(tkajinam): ceilometer does not have api service, so we can use

3
manifests/logging.pp
View File

@@ -97,7 +97,7 @@
# Defaults to $facts['os_service_default'].
# Example: 'Y-%m-%d %H:%M:%S'
#
class ceilometer::logging(
class ceilometer::logging (
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
$use_journal = $facts['os_service_default'],
@@ -118,7 +118,6 @@ class ceilometer::logging(
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
) {
include ceilometer::deps
oslo::log { 'ceilometer_config':

1
manifests/params.pp
View File

@@ -4,7 +4,6 @@
# should be considered to be constant
#
class ceilometer::params {
assert_private()
include openstacklib::defaults

3
manifests/reports.pp
View File

@@ -17,12 +17,11 @@
# is set.
# Defaults to $facts['os_service_default']
#
class ceilometer::reports(
class ceilometer::reports (
$log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'],
) {
include ceilometer::deps
oslo::reports { 'ceilometer_config':