openstack/puppet-magnum
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: I90d1f1b4b6e090ce48bc23efa44ad642bab7e59d
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-15 19:57:29 +09:00
parent 52e8d302ab
commit 3fdd3980a2
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/magnum.pp
+1 -1
View File
@@ -55,6 +55,6 @@
}
class { 'magnum::certificates':
cert_manager_type => 'local'
cert_manager_type => 'local',
}
manifests/api.pp
+7 -7
View File
@@ -23,7 +23,7 @@
# service, and you must use another class to configure that
# web service. For example, use class { 'magnum::wsgi::apache'...}
# to make magnum-api be a web app using apache mod_wsgi.
# Defaults to $::magnum::params::api_service
# Defaults to $magnum::params::api_service
#
# [*port*]
# (Optional) The port for the Magnum API server.
@@ -73,7 +73,7 @@ class magnum::api(
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$service_name = $::magnum::params::api_service,
$service_name = $magnum::params::api_service,
$port = '9511',
$host = '127.0.0.1',
$max_limit = '1000',
@@ -115,10 +115,10 @@ class magnum::api(
}
# Install package
if $::magnum::params::api_package {
if $magnum::params::api_package {
package { 'magnum-api':
ensure => $package_ensure,
name => $::magnum::params::api_package,
name => $magnum::params::api_package,
tag => ['openstack', 'magnum-package'],
}
}
@@ -130,10 +130,10 @@ class magnum::api(
$ensure = 'stopped'
}
if $service_name == $::magnum::params::api_service {
if $service_name == $magnum::params::api_service {
service { 'magnum-api':
ensure => $ensure,
name => $::magnum::params::api_service,
name => $magnum::params::api_service,
enable => $enabled,
hasstatus => true,
tag => 'magnum-service',
@@ -148,7 +148,7 @@ class magnum::api(
} elsif $service_name == 'httpd' {
service { 'magnum-api':
ensure => 'stopped',
name => $::magnum::params::api_service,
name => $magnum::params::api_service,
enable => false,
hasstatus => true,
tag => 'magnum-service',
manifests/capi_helm.pp
+2 -2
View File
@@ -105,8 +105,8 @@
class magnum::capi_helm (
Optional[Stdlib::Absolutepath] $kubeconfig_file = undef,
Optional[Hash] $kubeconfig = undef,
String[1] $kubeconfig_owner = $::magnum::params::user,
String[1] $kubeconfig_group = $::magnum::params::group,
String[1] $kubeconfig_owner = $magnum::params::user,
String[1] $kubeconfig_group = $magnum::params::group,
Stdlib::Filemode $kubeconfig_mode = '0400',
String[1] $namespace_prefix = $facts['os_service_default'],
String[1] $helm_chart_repo = $facts['os_service_default'],
manifests/client.pp
+1 -1
View File
@@ -17,7 +17,7 @@ class magnum::client (
package { 'python-magnumclient':
ensure => $package_ensure,
name => $::magnum::params::client_package,
name => $magnum::params::client_package,
tag => 'openstack',
}
manifests/conductor.pp
+3 -3
View File
@@ -39,8 +39,8 @@ class magnum::conductor(
# Install package
package { 'magnum-conductor':
ensure => $package_ensure,
name => $::magnum::params::conductor_package,
tag => ['openstack', 'magnum-package']
name => $magnum::params::conductor_package,
tag => ['openstack', 'magnum-package'],
}
if $manage_service {
@@ -53,7 +53,7 @@ class magnum::conductor(
# Manage service
service { 'magnum-conductor':
ensure => $service_ensure,
name => $::magnum::params::conductor_package,
name => $magnum::params::conductor_package,
enable => $enabled,
hasstatus => true,
tag => 'magnum-service',
manifests/db/sync.pp
+1 -1
View File
@@ -28,7 +28,7 @@ class magnum::db::sync(
exec { 'magnum-db-sync':
command => "magnum-db-manage ${extra_params} upgrade head",
path => ['/bin', '/usr/bin'],
user => $::magnum::params::user,
user => $magnum::params::user,
refreshonly => true,
try_sleep => 5,
tries => 10,
manifests/init.pp
+1 -1
View File
@@ -218,7 +218,7 @@ class magnum(
package { 'magnum-common':
ensure => $package_ensure,
name => $::magnum::params::common_package,
name => $magnum::params::common_package,
tag => ['openstack', 'magnum-package'],
}
manifests/policy.pp
+1 -1
View File
@@ -62,7 +62,7 @@ class magnum::policy (
policies => $policies,
policy_path => $policy_path,
file_user => 'root',
file_group => $::magnum::params::group,
file_group => $magnum::params::group,
file_format => 'yaml',
purge_config => $purge_config,
tag => 'magnum',
manifests/wsgi/apache.pp
+4 -4
View File
@@ -155,7 +155,7 @@ class magnum::wsgi::apache (
openstacklib::wsgi::apache { 'magnum_wsgi':
bind_host => $bind_host,
bind_port => $port,
group => $::magnum::params::group,
group => $magnum::params::group,
path => $path,
priority => $priority,
servername => $servername,
@@ -168,14 +168,14 @@ class magnum::wsgi::apache (
ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key,
threads => $threads,
user => $::magnum::params::user,
user => $magnum::params::user,
workers => $workers,
wsgi_daemon_process => 'magnum',
wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'magnum',
wsgi_script_dir => $::magnum::params::wsgi_script_path,
wsgi_script_dir => $magnum::params::wsgi_script_path,
wsgi_script_file => 'app',
wsgi_script_source => $::magnum::params::wsgi_script_source,
wsgi_script_source => $magnum::params::wsgi_script_source,
headers => $headers,
request_headers => $request_headers,
custom_wsgi_process_options => $custom_wsgi_process_options,