Prepare for voxpupuli-puppet-lint-plugins

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -42,7 +42,6 @@ class cloudkitty::db::mysql(
$collate = 'utf8_general_ci',
$allowed_hosts = undef
) {
include cloudkitty::deps
openstacklib::db::mysql { 'cloudkitty':
@@ -58,5 +57,4 @@ class cloudkitty::db::mysql(
Anchor['cloudkitty::db::begin']
~> Class['cloudkitty::db::mysql']
~> Anchor['cloudkitty::db::end']
}

View File

@@ -31,7 +31,6 @@ class cloudkitty::db::postgresql(
$encoding = undef,
$privileges = 'ALL',
) {
include cloudkitty::deps
openstacklib::db::postgresql { 'cloudkitty':
@@ -45,5 +44,4 @@ class cloudkitty::db::postgresql(
Anchor['cloudkitty::db::begin']
~> Class['cloudkitty::db::postgresql']
~> Anchor['cloudkitty::db::end']
}

View File

@@ -16,13 +16,12 @@ class cloudkitty::db::sync(
$extra_params = undef,
$db_sync_timeout = 300,
) {
include cloudkitty::deps
include cloudkitty::params
exec { 'cloudkitty-db-sync':
command => "cloudkitty-dbsync upgrade ${extra_params}",
path => [ '/bin', '/usr/bin', ],
path => ['/bin', '/usr/bin'],
user => $cloudkitty::params::user,
refreshonly => true,
try_sleep => 5,

View File

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

View File

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

View File

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

View File

@@ -270,7 +270,6 @@ class cloudkitty(
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) {
include cloudkitty::params
include cloudkitty::db
include cloudkitty::deps

View File

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

View File

@@ -229,7 +229,6 @@ class cloudkitty::keystone::authtoken(
$service_type = $facts['os_service_default'],
$interface = $facts['os_service_default'],
) {
include cloudkitty::deps
keystone::resource::authtoken { 'cloudkitty_config':
@@ -272,4 +271,3 @@ class cloudkitty::keystone::authtoken(
interface => $interface,
}
}

View File

@@ -122,7 +122,6 @@ class cloudkitty::logging(
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
) {
include cloudkitty::deps
oslo::log { 'cloudkitty_config':

View File

@@ -21,7 +21,6 @@ class cloudkitty::orchestrator (
$max_workers = $facts['os_service_default'],
$max_threads = $facts['os_service_default']
) {
include cloudkitty::deps
oslo::coordination { 'cloudkitty_config':

View File

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

View File

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

View File

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

View File

@@ -11,7 +11,6 @@
class cloudkitty::storage (
$extra_params = ''
) {
include cloudkitty::deps
include cloudkitty::params

View File

@@ -22,7 +22,6 @@ class cloudkitty::storage::elasticsearch(
String $cafile = $facts['os_service_default'],
Variant[String[0],Integer] $scroll_duration = $facts['os_service_default'],
) {
include cloudkitty::deps
cloudkitty_config {

View File

@@ -35,7 +35,6 @@ class cloudkitty::storage::influxdb(
Variant[String[0],Boolean] $insecure = $facts['os_service_default'],
String $cafile = $facts['os_service_default'],
) {
include cloudkitty::deps
cloudkitty_config {

View File

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

View File

@@ -26,7 +26,6 @@ class cloudkitty::wsgi::uwsgi (
$threads = 32,
$listen_queue_size = 100,
) {
include cloudkitty::deps
if $facts['os']['name'] != 'Debian' {