openstack/puppet-cloudkitty
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: I3c303e2ef3ec45059b295b02d6ec84e006edf724
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-20 00:09:19 +09:00
parent c7aee692bb
commit 2b9ebd90a3
25 changed files with 18 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

@@ -61,7 +61,6 @@ class cloudkitty::api (
$enable_proxy_headers_parsing = $facts['os_service_default'], $enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $facts['os_service_default'], $max_request_body_size = $facts['os_service_default'],
) { ) {
include cloudkitty include cloudkitty
include cloudkitty::deps include cloudkitty::deps
include cloudkitty::params include cloudkitty::params
@@ -118,5 +117,4 @@ class cloudkitty::api (
enable_proxy_headers_parsing => $enable_proxy_headers_parsing, enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
max_request_body_size => $max_request_body_size, max_request_body_size => $max_request_body_size,
} }
} }

2
manifests/client.pp
View File

@@ -11,7 +11,6 @@
class cloudkitty::client ( class cloudkitty::client (
$ensure = 'present' $ensure = 'present'
) { ) {
include cloudkitty::deps include cloudkitty::deps
include cloudkitty::params include cloudkitty::params
@@ -20,5 +19,4 @@ class cloudkitty::client (
name => $cloudkitty::params::client_package_name, name => $cloudkitty::params::client_package_name,
tag => 'openstack', tag => 'openstack',
} }
} }

1
manifests/config.pp
View File

@@ -27,7 +27,6 @@ class cloudkitty::config (
Hash $cloudkitty_config = {}, Hash $cloudkitty_config = {},
Hash $cloudkitty_api_paste_ini = {}, Hash $cloudkitty_api_paste_ini = {},
) { ) {
include cloudkitty::deps include cloudkitty::deps
create_resources('cloudkitty_config', $cloudkitty_config) create_resources('cloudkitty_config', $cloudkitty_config)

1
manifests/cors.pp
View File

@@ -44,7 +44,6 @@ class cloudkitty::cors (
$allow_methods = $facts['os_service_default'], $allow_methods = $facts['os_service_default'],
$allow_headers = $facts['os_service_default'], $allow_headers = $facts['os_service_default'],
) { ) {
include cloudkitty::deps include cloudkitty::deps
oslo::cors { 'cloudkitty_config': oslo::cors { 'cloudkitty_config':

1
manifests/db.pp
View File

@@ -54,7 +54,6 @@ class cloudkitty::db (
$database_pool_timeout = $facts['os_service_default'], $database_pool_timeout = $facts['os_service_default'],
$mysql_enable_ndb = $facts['os_service_default'], $mysql_enable_ndb = $facts['os_service_default'],
) { ) {
include cloudkitty::deps include cloudkitty::deps
oslo::db { 'cloudkitty_config': oslo::db { 'cloudkitty_config':

4
manifests/db/mysql.pp
View File

@@ -33,7 +33,7 @@
# Only used with mysql modules >= 2.2. # Only used with mysql modules >= 2.2.
# Defaults to 'utf8_general_ci' # Defaults to 'utf8_general_ci'
# #
class cloudkitty::db::mysql( class cloudkitty::db::mysql (
String[1] $password, String[1] $password,
$dbname = 'cloudkitty', $dbname = 'cloudkitty',
$user = 'cloudkitty', $user = 'cloudkitty',
@@ -42,7 +42,6 @@ class cloudkitty::db::mysql(
$collate = 'utf8_general_ci', $collate = 'utf8_general_ci',
$allowed_hosts = undef $allowed_hosts = undef
) { ) {
include cloudkitty::deps include cloudkitty::deps
openstacklib::db::mysql { 'cloudkitty': openstacklib::db::mysql { 'cloudkitty':
@@ -58,5 +57,4 @@ class cloudkitty::db::mysql(
Anchor['cloudkitty::db::begin'] Anchor['cloudkitty::db::begin']
~> Class['cloudkitty::db::mysql'] ~> Class['cloudkitty::db::mysql']
~> Anchor['cloudkitty::db::end'] ~> Anchor['cloudkitty::db::end']
} }

4
manifests/db/postgresql.pp
View File

@@ -24,14 +24,13 @@
# (Optional) Privileges given to the database user. # (Optional) Privileges given to the database user.
# Default to 'ALL' # Default to 'ALL'
# #
class cloudkitty::db::postgresql( class cloudkitty::db::postgresql (
$password, $password,
$dbname = 'cloudkitty', $dbname = 'cloudkitty',
$user = 'cloudkitty', $user = 'cloudkitty',
$encoding = undef, $encoding = undef,
$privileges = 'ALL', $privileges = 'ALL',
) { ) {
include cloudkitty::deps include cloudkitty::deps
openstacklib::db::postgresql { 'cloudkitty': openstacklib::db::postgresql { 'cloudkitty':
@@ -45,5 +44,4 @@ class cloudkitty::db::postgresql(
Anchor['cloudkitty::db::begin'] Anchor['cloudkitty::db::begin']
~> Class['cloudkitty::db::postgresql'] ~> Class['cloudkitty::db::postgresql']
~> Anchor['cloudkitty::db::end'] ~> Anchor['cloudkitty::db::end']
} }

5
manifests/db/sync.pp
View File

@@ -12,17 +12,16 @@
# (Optional) Timeout for the execution of the db_sync # (Optional) Timeout for the execution of the db_sync
# Defaults to 300 # Defaults to 300
# #
class cloudkitty::db::sync( class cloudkitty::db::sync (
$extra_params = undef, $extra_params = undef,
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include cloudkitty::deps include cloudkitty::deps
include cloudkitty::params include cloudkitty::params
exec { 'cloudkitty-db-sync': exec { 'cloudkitty-db-sync':
command => "cloudkitty-dbsync upgrade ${extra_params}", command => "cloudkitty-dbsync upgrade ${extra_params}",
path => [ '/bin', '/usr/bin', ], path => ['/bin', '/usr/bin'],
user => $cloudkitty::params::user, user => $cloudkitty::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,

1
manifests/deps.pp
View File

@@ -57,5 +57,4 @@ class cloudkitty::deps {
# Installation or config changes will always restart services. # Installation or config changes will always restart services.
Anchor['cloudkitty::install::end'] ~> Anchor['cloudkitty::service::begin'] Anchor['cloudkitty::install::end'] ~> Anchor['cloudkitty::service::begin']
Anchor['cloudkitty::config::end'] ~> Anchor['cloudkitty::service::begin'] Anchor['cloudkitty::config::end'] ~> Anchor['cloudkitty::service::begin']
} }

4
manifests/fetcher/gnocchi.pp
View File

@@ -40,7 +40,7 @@
# value) # value)
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
class cloudkitty::fetcher::gnocchi( class cloudkitty::fetcher::gnocchi (
String $scope_attribute = $facts['os_service_default'], String $scope_attribute = $facts['os_service_default'],
String $resource_types = $facts['os_service_default'], String $resource_types = $facts['os_service_default'],
String $gnocchi_auth_type = $facts['os_service_default'], String $gnocchi_auth_type = $facts['os_service_default'],
@@ -50,7 +50,7 @@ class cloudkitty::fetcher::gnocchi(
String $region_name = $facts['os_service_default'], String $region_name = $facts['os_service_default'],
String $auth_type = $facts['os_service_default'], String $auth_type = $facts['os_service_default'],
String $auth_section = $facts['os_service_default'], String $auth_section = $facts['os_service_default'],
){ ) {
include cloudkitty::deps include cloudkitty::deps
cloudkitty_config { cloudkitty_config {

1
manifests/fetcher/keystone.pp
View File

@@ -67,7 +67,6 @@ class cloudkitty::fetcher::keystone (
$ignore_rating_role = $facts['os_service_default'], $ignore_rating_role = $facts['os_service_default'],
$ignore_disabled_tenants = $facts['os_service_default'], $ignore_disabled_tenants = $facts['os_service_default'],
) { ) {
include cloudkitty::deps include cloudkitty::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {

1
manifests/healthcheck.pp
View File

@@ -46,7 +46,6 @@ class cloudkitty::healthcheck (
$disable_by_file_paths = $facts['os_service_default'], $disable_by_file_paths = $facts['os_service_default'],
$enable_by_file_paths = $facts['os_service_default'], $enable_by_file_paths = $facts['os_service_default'],
) { ) {
include cloudkitty::deps include cloudkitty::deps
oslo::healthcheck { 'cloudkitty_config': oslo::healthcheck { 'cloudkitty_config':

3
manifests/init.pp
View File

@@ -222,7 +222,7 @@
# will be run through a green thread. # will be run through a green thread.
# Defaults to undef # Defaults to undef
# #
class cloudkitty( class cloudkitty (
$package_ensure = 'present', $package_ensure = 'present',
$rabbit_use_ssl = $facts['os_service_default'], $rabbit_use_ssl = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
@@ -270,7 +270,6 @@ class cloudkitty(
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef, $rabbit_heartbeat_in_pthread = undef,
) { ) {
include cloudkitty::params include cloudkitty::params
include cloudkitty::db include cloudkitty::db
include cloudkitty::deps include cloudkitty::deps

2
manifests/keystone/auth.pp
View File

@@ -107,7 +107,6 @@ class cloudkitty::keystone::auth (
Boolean $manage_rating_role = true, Boolean $manage_rating_role = true,
String[1] $rating_role = 'rating', String[1] $rating_role = 'rating',
) { ) {
include cloudkitty::deps include cloudkitty::deps
Keystone::Resource::Service_identity['cloudkitty'] -> Anchor['cloudkitty::service::end'] Keystone::Resource::Service_identity['cloudkitty'] -> Anchor['cloudkitty::service::end']
@@ -138,5 +137,4 @@ class cloudkitty::keystone::auth (
ensure => present, ensure => present,
} }
} }
} }

4
manifests/keystone/authtoken.pp
View File

@@ -190,7 +190,7 @@
# "public", "internal" or "admin". # "public", "internal" or "admin".
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
class cloudkitty::keystone::authtoken( class cloudkitty::keystone::authtoken (
String[1] $password, String[1] $password,
$username = 'cloudkitty', $username = 'cloudkitty',
$auth_url = 'http://localhost:5000', $auth_url = 'http://localhost:5000',
@@ -229,7 +229,6 @@ class cloudkitty::keystone::authtoken(
$service_type = $facts['os_service_default'], $service_type = $facts['os_service_default'],
$interface = $facts['os_service_default'], $interface = $facts['os_service_default'],
) { ) {
include cloudkitty::deps include cloudkitty::deps
keystone::resource::authtoken { 'cloudkitty_config': keystone::resource::authtoken { 'cloudkitty_config':
@@ -272,4 +271,3 @@ class cloudkitty::keystone::authtoken(
interface => $interface, interface => $interface,
} }
} }

3
manifests/logging.pp
View File

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

3
manifests/orchestrator.pp
View File

@@ -21,10 +21,9 @@ class cloudkitty::orchestrator (
$max_workers = $facts['os_service_default'], $max_workers = $facts['os_service_default'],
$max_threads = $facts['os_service_default'] $max_threads = $facts['os_service_default']
) { ) {
include cloudkitty::deps include cloudkitty::deps
oslo::coordination{ 'cloudkitty_config': oslo::coordination { 'cloudkitty_config':
backend_url => $coordination_url, backend_url => $coordination_url,
manage_config => false, manage_config => false,
} }

1
manifests/params.pp
View File

@@ -32,6 +32,5 @@ class cloudkitty::params {
default: { default: {
fail("Unsupported osfamily: ${facts['os']['family']}") fail("Unsupported osfamily: ${facts['os']['family']}")
} }
} }
} }

2
manifests/policy.pp
View File

@@ -54,7 +54,6 @@ class cloudkitty::policy (
$policy_dirs = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include cloudkitty::deps include cloudkitty::deps
include cloudkitty::params include cloudkitty::params
@@ -77,5 +76,4 @@ class cloudkitty::policy (
policy_default_rule => $policy_default_rule, policy_default_rule => $policy_default_rule,
policy_dirs => $policy_dirs, policy_dirs => $policy_dirs,
} }
} }

2
manifests/processor.pp
View File

@@ -66,7 +66,6 @@ class cloudkitty::processor (
$region_name = $facts['os_service_default'], $region_name = $facts['os_service_default'],
$interface = $facts['os_service_default'], $interface = $facts['os_service_default'],
) { ) {
include cloudkitty::deps include cloudkitty::deps
include cloudkitty::params include cloudkitty::params
@@ -112,5 +111,4 @@ class cloudkitty::processor (
'collector_gnocchi/region_name': value => $region_name; 'collector_gnocchi/region_name': value => $region_name;
'collector_gnocchi/interface': value => $interface; 'collector_gnocchi/interface': value => $interface;
} }
} }

5
manifests/storage.pp
View File

@@ -8,10 +8,9 @@
# to the cloudkitty-storage-init command. # to the cloudkitty-storage-init command.
# Defaults to '' # Defaults to ''
# #
class cloudkitty::storage( class cloudkitty::storage (
$extra_params = '' $extra_params = ''
){ ) {
include cloudkitty::deps include cloudkitty::deps
include cloudkitty::params include cloudkitty::params

5
manifests/storage/elasticsearch.pp
View File

@@ -15,14 +15,13 @@
# Duration (in seconds) for which the ES scroll contexts should be kept # Duration (in seconds) for which the ES scroll contexts should be kept
# alive. (interer value) # alive. (interer value)
# #
class cloudkitty::storage::elasticsearch( class cloudkitty::storage::elasticsearch (
String $host = $facts['os_service_default'], String $host = $facts['os_service_default'],
String $index_name = $facts['os_service_default'], String $index_name = $facts['os_service_default'],
Variant[String[0],Boolean] $insecure = $facts['os_service_default'], Variant[String[0],Boolean] $insecure = $facts['os_service_default'],
String $cafile = $facts['os_service_default'], String $cafile = $facts['os_service_default'],
Variant[String[0],Integer] $scroll_duration = $facts['os_service_default'], Variant[String[0],Integer] $scroll_duration = $facts['os_service_default'],
){ ) {
include cloudkitty::deps include cloudkitty::deps
cloudkitty_config { cloudkitty_config {

5
manifests/storage/influxdb.pp
View File

@@ -24,7 +24,7 @@
# Path of the CA certificate to trust for HTTPS # Path of the CA certificate to trust for HTTPS
# connections (string value) # connections (string value)
# #
class cloudkitty::storage::influxdb( class cloudkitty::storage::influxdb (
String $username = $facts['os_service_default'], String $username = $facts['os_service_default'],
String $password = $facts['os_service_default'], String $password = $facts['os_service_default'],
String $database = $facts['os_service_default'], String $database = $facts['os_service_default'],
@@ -34,8 +34,7 @@ class cloudkitty::storage::influxdb(
Variant[String[0],Boolean] $use_ssl = $facts['os_service_default'], Variant[String[0],Boolean] $use_ssl = $facts['os_service_default'],
Variant[String[0],Boolean] $insecure = $facts['os_service_default'], Variant[String[0],Boolean] $insecure = $facts['os_service_default'],
String $cafile = $facts['os_service_default'], String $cafile = $facts['os_service_default'],
){ ) {
include cloudkitty::deps include cloudkitty::deps
cloudkitty_config { cloudkitty_config {

1
manifests/wsgi/apache.pp
View File

@@ -148,7 +148,6 @@ class cloudkitty::wsgi::apache (
$headers = undef, $headers = undef,
$request_headers = undef, $request_headers = undef,
) { ) {
include cloudkitty::deps include cloudkitty::deps
include cloudkitty::params include cloudkitty::params

5
manifests/wsgi/uwsgi.pp
View File

@@ -25,11 +25,10 @@ class cloudkitty::wsgi::uwsgi (
$processes = $facts['os_workers'], $processes = $facts['os_workers'],
$threads = 32, $threads = 32,
$listen_queue_size = 100, $listen_queue_size = 100,
){ ) {
include cloudkitty::deps include cloudkitty::deps
if $facts['os']['name'] != 'Debian'{ if $facts['os']['name'] != 'Debian' {
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.') warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
} }