openstack/puppet-gnocchi
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: I438e1cdb3d275a364718fa0f924ab62f1045ca0f
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-15 19:55:01 +09:00
parent e0e434277b
commit 8fbaed2a43
11 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/site.pp
View File

@@ -5,7 +5,7 @@ class { 'gnocchi::keystone::auth':
internal_url => 'http://10.0.0.1:8041', internal_url => 'http://10.0.0.1:8041',
public_url => 'http://10.0.0.1:8041', public_url => 'http://10.0.0.1:8041',
password => 'verysecrete', password => 'verysecrete',
region => 'OpenStack' region => 'OpenStack',
} }
class { 'gnocchi': class { 'gnocchi':
@@ -15,7 +15,7 @@ class { 'gnocchi':
class { 'gnocchi::api': class { 'gnocchi::api':
bind_host => '10.0.0.1', bind_host => '10.0.0.1',
identity_uri => 'https://identity.openstack.org:5000', identity_uri => 'https://identity.openstack.org:5000',
keystone_password => 'verysecrete' keystone_password => 'verysecrete',
} }
class { 'gnocchi::statsd': class { 'gnocchi::statsd':

12
manifests/api.pp
View File

@@ -26,7 +26,7 @@
# service, and you must use another class to configure that # service, and you must use another class to configure that
# web service. For example, use class { 'gnocchi::wsgi::apache'...} # web service. For example, use class { 'gnocchi::wsgi::apache'...}
# to make gnocchi-api be a web app using apache mod_wsgi. # to make gnocchi-api be a web app using apache mod_wsgi.
# Defaults to '$::gnocchi::params::api_service_name' # Defaults to '$gnocchi::params::api_service_name'
# #
# [*sync_db*] # [*sync_db*]
# (optional) Run gnocchi-upgrade db sync on api nodes after installing the package. # (optional) Run gnocchi-upgrade db sync on api nodes after installing the package.
@@ -60,7 +60,7 @@ class gnocchi::api (
Boolean $enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
$max_limit = $facts['os_service_default'], $max_limit = $facts['os_service_default'],
$service_name = $::gnocchi::params::api_service_name, $service_name = $gnocchi::params::api_service_name,
Boolean $sync_db = false, Boolean $sync_db = false,
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$paste_config = $facts['os_service_default'], $paste_config = $facts['os_service_default'],
@@ -74,7 +74,7 @@ class gnocchi::api (
package { 'gnocchi-api': package { 'gnocchi-api':
ensure => $package_ensure, ensure => $package_ensure,
name => $::gnocchi::params::api_package_name, name => $gnocchi::params::api_package_name,
tag => ['openstack', 'gnocchi-package'], tag => ['openstack', 'gnocchi-package'],
} }
@@ -89,10 +89,10 @@ class gnocchi::api (
$service_ensure = 'stopped' $service_ensure = 'stopped'
} }
if $service_name == $::gnocchi::params::api_service_name { if $service_name == $gnocchi::params::api_service_name {
service { 'gnocchi-api': service { 'gnocchi-api':
ensure => $service_ensure, ensure => $service_ensure,
name => $::gnocchi::params::api_service_name, name => $gnocchi::params::api_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
@@ -107,7 +107,7 @@ class gnocchi::api (
} elsif $service_name == 'httpd' { } elsif $service_name == 'httpd' {
service { 'gnocchi-api': service { 'gnocchi-api':
ensure => 'stopped', ensure => 'stopped',
name => $::gnocchi::params::api_service_name, name => $gnocchi::params::api_service_name,
enable => false, enable => false,
tag => ['gnocchi-service', 'gnocchi-db-sync-service'], tag => ['gnocchi-service', 'gnocchi-db-sync-service'],
} }

2
manifests/client.pp
View File

@@ -14,7 +14,7 @@ class gnocchi::client (
package { 'python-gnocchiclient': package { 'python-gnocchiclient':
ensure => $ensure, ensure => $ensure,
name => $::gnocchi::params::client_package_name, name => $gnocchi::params::client_package_name,
tag => 'openstack', tag => 'openstack',
} }

4
manifests/db/sync.pp
View File

@@ -3,7 +3,7 @@
# #
# [*user*] # [*user*]
# (Optional) User to run dbsync command. # (Optional) User to run dbsync command.
# Defaults to $::gnocchi::params::user # Defaults to $gnocchi::params::user
# #
# [*extra_opts*] # [*extra_opts*]
# (Optional) String of extra command line parameters to append # (Optional) String of extra command line parameters to append
@@ -15,7 +15,7 @@
# Defaults to 300 # Defaults to 300
# #
class gnocchi::db::sync ( class gnocchi::db::sync (
$user = $::gnocchi::params::user, $user = $gnocchi::params::user,
$extra_opts = undef, $extra_opts = undef,
$db_sync_timeout = 300, $db_sync_timeout = 300,
) inherits gnocchi::params { ) inherits gnocchi::params {

2
manifests/init.pp
View File

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

4
manifests/metricd.pp
View File

@@ -64,7 +64,7 @@ class gnocchi::metricd (
package { 'gnocchi-metricd': package { 'gnocchi-metricd':
ensure => $package_ensure, ensure => $package_ensure,
name => $::gnocchi::params::metricd_package_name, name => $gnocchi::params::metricd_package_name,
tag => ['openstack', 'gnocchi-package'], tag => ['openstack', 'gnocchi-package'],
} }
@@ -77,7 +77,7 @@ class gnocchi::metricd (
service { 'gnocchi-metricd': service { 'gnocchi-metricd':
ensure => $service_ensure, ensure => $service_ensure,
name => $::gnocchi::params::metricd_service_name, name => $gnocchi::params::metricd_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,

2
manifests/policy.pp
View File

@@ -62,7 +62,7 @@ class gnocchi::policy (
policies => $policies, policies => $policies,
policy_path => $policy_path, policy_path => $policy_path,
file_user => 'root', file_user => 'root',
file_group => $::gnocchi::params::group, file_group => $gnocchi::params::group,
file_format => 'yaml', file_format => 'yaml',
purge_config => $purge_config, purge_config => $purge_config,
} }

4
manifests/statsd.pp
View File

@@ -53,7 +53,7 @@ class gnocchi::statsd (
package { 'gnocchi-statsd': package { 'gnocchi-statsd':
ensure => $package_ensure, ensure => $package_ensure,
name => $::gnocchi::params::statsd_package_name, name => $gnocchi::params::statsd_package_name,
tag => ['openstack', 'gnocchi-package'], tag => ['openstack', 'gnocchi-package'],
} }
@@ -66,7 +66,7 @@ class gnocchi::statsd (
service { 'gnocchi-statsd': service { 'gnocchi-statsd':
ensure => $service_ensure, ensure => $service_ensure,
name => $::gnocchi::params::statsd_service_name, name => $gnocchi::params::statsd_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,

2
manifests/storage/ceph.pp
View File

@@ -91,7 +91,7 @@ class gnocchi::storage::ceph(
if $manage_rados { if $manage_rados {
stdlib::ensure_packages('python-rados', { stdlib::ensure_packages('python-rados', {
'ensure' => $package_ensure, 'ensure' => $package_ensure,
'name' => $::gnocchi::params::rados_package_name, 'name' => $gnocchi::params::rados_package_name,
'tag' => ['openstack','gnocchi-package'], 'tag' => ['openstack','gnocchi-package'],
}) })
} }

2
manifests/storage/s3.pp
View File

@@ -49,7 +49,7 @@ class gnocchi::storage::s3(
if $manage_boto3 { if $manage_boto3 {
stdlib::ensure_packages('python-boto3', { stdlib::ensure_packages('python-boto3', {
'ensure' => $package_ensure, 'ensure' => $package_ensure,
'name' => $::gnocchi::params::boto3_package_name, 'name' => $gnocchi::params::boto3_package_name,
'tag' => ['openstack','gnocchi-package'], 'tag' => ['openstack','gnocchi-package'],
}) })
} }

8
manifests/wsgi/apache.pp
View File

@@ -175,7 +175,7 @@ class gnocchi::wsgi::apache (
openstacklib::wsgi::apache { 'gnocchi_wsgi': openstacklib::wsgi::apache { 'gnocchi_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => $::gnocchi::params::group, group => $gnocchi::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
@@ -188,15 +188,15 @@ class gnocchi::wsgi::apache (
ssl_crl_path => $ssl_crl_path, ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key, ssl_key => $ssl_key,
threads => $threads, threads => $threads,
user => $::gnocchi::params::user, user => $gnocchi::params::user,
vhost_custom_fragment => $vhost_custom_fragment, vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'gnocchi', wsgi_daemon_process => 'gnocchi',
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'gnocchi', wsgi_process_group => 'gnocchi',
wsgi_script_dir => $::gnocchi::params::gnocchi_wsgi_script_path, wsgi_script_dir => $gnocchi::params::gnocchi_wsgi_script_path,
wsgi_script_file => 'app', wsgi_script_file => 'app',
wsgi_script_source => $::gnocchi::params::gnocchi_wsgi_script_source, wsgi_script_source => $gnocchi::params::gnocchi_wsgi_script_source,
headers => $headers, headers => $headers,
request_headers => $request_headers, request_headers => $request_headers,
custom_wsgi_process_options => $custom_wsgi_process_options, custom_wsgi_process_options => $custom_wsgi_process_options,