openstack/puppet-vitrage
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: Id2341c783cb3ff30859c26f6b0695f5a93dec60b
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-20 13:11:33 +09:00
parent 1140fa6fd6
commit 6dcb92e4d8
19 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/api.pp
View File

@@ -50,9 +50,7 @@ class vitrage::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'],
) inherits vitrage::params { ) inherits vitrage::params {
include vitrage::deps include vitrage::deps
include vitrage::params
include vitrage::policy include vitrage::policy
package { 'vitrage-api': package { 'vitrage-api':
@@ -102,5 +100,4 @@ as a standalone service, or httpd for being run by a httpd server")
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,
} }
} }

3
manifests/client.pp
View File

@@ -9,7 +9,6 @@
class vitrage::client ( class vitrage::client (
$ensure = 'present' $ensure = 'present'
) { ) {
include vitrage::deps include vitrage::deps
include vitrage::params include vitrage::params
@@ -18,6 +17,4 @@ class vitrage::client (
name => $vitrage::params::client_package_name, name => $vitrage::params::client_package_name,
tag => 'openstack', tag => 'openstack',
} }
} }

1
manifests/config.pp
View File

@@ -27,7 +27,6 @@ class vitrage::config (
Hash $vitrage_config = {}, Hash $vitrage_config = {},
Hash $vitrage_api_paste_ini = {}, Hash $vitrage_api_paste_ini = {},
) { ) {
include vitrage::deps include vitrage::deps
create_resources('vitrage_config', $vitrage_config) create_resources('vitrage_config', $vitrage_config)

1
manifests/coordination.pp
View File

@@ -11,7 +11,6 @@
class vitrage::coordination ( class vitrage::coordination (
$backend_url = $facts['os_service_default'], $backend_url = $facts['os_service_default'],
) { ) {
include vitrage::deps include vitrage::deps
oslo::coordination { 'vitrage_config': oslo::coordination { 'vitrage_config':

2
manifests/db.pp
View File

@@ -54,7 +54,6 @@ class vitrage::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 vitrage::deps include vitrage::deps
oslo::db { 'vitrage_config': oslo::db { 'vitrage_config':
@@ -68,5 +67,4 @@ class vitrage::db (
pool_timeout => $database_pool_timeout, pool_timeout => $database_pool_timeout,
mysql_enable_ndb => $mysql_enable_ndb, mysql_enable_ndb => $mysql_enable_ndb,
} }
} }

2
manifests/db/mysql.pp
View File

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

2
manifests/db/postgresql.pp
View File

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

2
manifests/db/sync.pp
View File

@@ -16,7 +16,6 @@ class vitrage::db::sync(
$extra_params = undef, $extra_params = undef,
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include vitrage::deps include vitrage::deps
include vitrage::params include vitrage::params
@@ -37,5 +36,4 @@ class vitrage::db::sync(
notify => Anchor['vitrage::dbsync::end'], notify => Anchor['vitrage::dbsync::end'],
tag => 'openstack-db', tag => 'openstack-db',
} }
} }

1
manifests/graph.pp
View File

@@ -18,7 +18,6 @@ class vitrage::graph (
Boolean $enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include vitrage::deps include vitrage::deps
include vitrage::params include vitrage::params

2
manifests/init.pp
View File

@@ -215,7 +215,6 @@ class vitrage (
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef, $rabbit_heartbeat_in_pthread = undef,
) inherits vitrage::params { ) inherits vitrage::params {
include vitrage::deps include vitrage::deps
package { 'vitrage': package { 'vitrage':
@@ -272,4 +271,3 @@ class vitrage (
'datasources/types': value => join(any2array($types), ','); 'datasources/types': value => join(any2array($types), ',');
} }
} }

2
manifests/keystone/auth.pp
View File

@@ -98,7 +98,6 @@ class vitrage::keystone::auth (
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:8999', Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:8999',
Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:8999', Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:8999',
) { ) {
include vitrage::deps include vitrage::deps
$real_service_name = pick($service_name, $auth_name) $real_service_name = pick($service_name, $auth_name)
@@ -125,5 +124,4 @@ class vitrage::keystone::auth (
internal_url => $internal_url, internal_url => $internal_url,
admin_url => $admin_url, admin_url => $admin_url,
} }
} }

2
manifests/keystone/authtoken.pp
View File

@@ -229,7 +229,6 @@ class vitrage::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 vitrage::deps include vitrage::deps
keystone::resource::authtoken { 'vitrage_config': keystone::resource::authtoken { 'vitrage_config':
@@ -272,4 +271,3 @@ class vitrage::keystone::authtoken(
interface => $interface, interface => $interface,
} }
} }

1
manifests/logging.pp
View File

@@ -120,7 +120,6 @@ class vitrage::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 vitrage::deps include vitrage::deps
oslo::log { 'vitrage_config': oslo::log { 'vitrage_config':

1
manifests/notifier.pp
View File

@@ -23,7 +23,6 @@ class vitrage::notifier (
$package_ensure = 'present', $package_ensure = 'present',
$notifiers = $facts['os_service_default'], $notifiers = $facts['os_service_default'],
) { ) {
include vitrage::deps include vitrage::deps
include vitrage::params include vitrage::params

1
manifests/params.pp
View File

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

1
manifests/persistor.pp
View File

@@ -18,7 +18,6 @@ class vitrage::persistor (
Boolean $enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include vitrage::deps include vitrage::deps
include vitrage::params include vitrage::params

2
manifests/policy.pp
View File

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

1
manifests/service_credentials.pp
View File

@@ -60,7 +60,6 @@ class vitrage::service_credentials (
$cacert = $facts['os_service_default'], $cacert = $facts['os_service_default'],
$interface = $facts['os_service_default'], $interface = $facts['os_service_default'],
) { ) {
include vitrage::deps include vitrage::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {

1
manifests/wsgi/apache.pp
View File

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