openstack/puppet-magnum
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: I3109b052d5eb21f6f26174390a9d5bf2756c6ec2
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-20 00:04:40 +09:00
parent f1b90ab3f7
commit e14a87dbb1
38 changed files with 27 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/magnum.pp
View File

@@ -44,7 +44,7 @@
class { 'magnum':
default_transport_url => 'rabbit://magnum:an_even_bigger_secret@127.0.0.1:5672',
rabbit_use_ssl => false,
rabbit_use_ssl => false,
notification_driver => 'messagingv2',
}
@@ -57,4 +57,3 @@
class { 'magnum::certificates':
cert_manager_type => 'local',
}

7
manifests/api.pp
View File

@@ -69,7 +69,7 @@
# middleware should parse the proxy headers or not.(boolean value)
# Defaults to $facts['os_service_default']
#
class magnum::api(
class magnum::api (
$package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
@@ -85,7 +85,6 @@ class magnum::api(
$workers = $facts['os_workers'],
$enable_proxy_headers_parsing = $facts['os_service_default'],
) inherits magnum::params {
include magnum::deps
include magnum::params
include magnum::policy
@@ -144,7 +143,6 @@ class magnum::api(
# On any uwsgi config change, we must restart Magnum API.
Magnum_api_uwsgi_config<||> ~> Service['magnum-api']
} elsif $service_name == 'httpd' {
service { 'magnum-api':
ensure => 'stopped',
@@ -165,8 +163,7 @@ class magnum::api(
include magnum::keystone::authtoken
}
oslo::middleware {'magnum_config':
oslo::middleware { 'magnum_config':
enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
}
}

4
manifests/capi_helm.pp
View File

@@ -123,7 +123,6 @@ class magnum::capi_helm (
String[1] $csi_cinder_availability_zone = $facts['os_service_default'],
String[1] $app_cred_interface_type = $facts['os_service_default'],
) inherits magnum::params {
include magnum::deps
magnum_config {
@@ -145,7 +144,7 @@ class magnum::capi_helm (
}
if $kubeconfig_file and $kubeconfig {
file{ $kubeconfig_file:
file { $kubeconfig_file:
owner => $kubeconfig_owner,
group => $kubeconfig_group,
mode => $kubeconfig_mode,
@@ -155,4 +154,3 @@ class magnum::capi_helm (
}
}
}

3
manifests/certificates.pp
View File

@@ -16,13 +16,10 @@ class magnum::certificates (
$cert_manager_type = $facts['os_service_default'],
$storage_path = $facts['os_service_default'],
) {
include magnum::deps
magnum_config {
'certificates/cert_manager_type': value => $cert_manager_type;
'certificates/storage_path': value => $storage_path;
}
}

3
manifests/cinder.pp
View File

@@ -26,7 +26,6 @@ class magnum::cinder (
$default_boot_volume_type = $facts['os_service_default'],
$default_boot_volume_size = $facts['os_service_default'],
) {
include magnum::deps
magnum_config {
@@ -35,6 +34,4 @@ class magnum::cinder (
'cinder/default_boot_volume_type': value => $default_boot_volume_type;
'cinder/default_boot_volume_size': value => $default_boot_volume_size;
}
}

2
manifests/client.pp
View File

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

3
manifests/clients/barbican.pp
View File

@@ -14,11 +14,10 @@
# communication with the OpenStack service.
# Defaults to publicURL
class magnum::clients::barbican(
class magnum::clients::barbican (
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
) inherits magnum::clients {
include magnum::deps
include magnum::params

3
manifests/clients/cinder.pp
View File

@@ -34,7 +34,7 @@
# (optional) If set, then the server's certificate will not be verified.
# Defaults to false
#
class magnum::clients::cinder(
class magnum::clients::cinder (
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$api_version = $facts['os_service_default'],
@@ -43,7 +43,6 @@ class magnum::clients::cinder(
$key_file = $magnum::clients::key_file,
$insecure = $magnum::clients::insecure
) inherits magnum::clients {
include magnum::deps
include magnum::params

4
manifests/clients/glance.pp
View File

@@ -34,8 +34,7 @@
# (optional) If set, then the server's certificate will not be verified.
# Defaults to false
#
class magnum::clients::glance(
class magnum::clients::glance (
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$api_version = $facts['os_service_default'],
@@ -44,7 +43,6 @@ class magnum::clients::glance(
$key_file = $magnum::clients::key_file,
$insecure = $magnum::clients::insecure
) inherits magnum::clients {
include magnum::deps
include magnum::params

4
manifests/clients/heat.pp
View File

@@ -34,8 +34,7 @@
# (optional) If set, then the server's certificate will not be verified.
# Defaults to false
#
class magnum::clients::heat(
class magnum::clients::heat (
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$api_version = $facts['os_service_default'],
@@ -44,7 +43,6 @@ class magnum::clients::heat(
$key_file = $magnum::clients::key_file,
$insecure = $magnum::clients::insecure
) inherits magnum::clients {
include magnum::deps
include magnum::params

5
manifests/clients/magnum.pp
View File

@@ -13,12 +13,11 @@
# (optional) Type of endpoint in Identity service catalog to use for
# communication with the OpenStack service.
# Defaults to publicURL
class magnum::clients::magnum(
#
class magnum::clients::magnum (
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
) inherits magnum::clients {
include magnum::deps
include magnum::params

3
manifests/clients/neutron.pp
View File

@@ -30,7 +30,7 @@
# (optional) If set, then the server's certificate will not be verified.
# Defaults to false
#
class magnum::clients::neutron(
class magnum::clients::neutron (
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$ca_file = $magnum::clients::ca_file,
@@ -38,7 +38,6 @@ class magnum::clients::neutron(
$key_file = $magnum::clients::key_file,
$insecure = $magnum::clients::insecure
) inherits magnum::clients {
include magnum::deps
include magnum::params

5
manifests/clients/nova.pp
View File

@@ -34,8 +34,8 @@
# (optional) If set, then the server's certificate will not be verified.
# Defaults to false
#
class magnum::clients::nova(
#
class magnum::clients::nova (
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$api_version = $facts['os_service_default'],
@@ -44,7 +44,6 @@ class magnum::clients::nova(
$key_file = $magnum::clients::key_file,
$insecure = $magnum::clients::insecure
) inherits magnum::clients {
include magnum::deps
include magnum::params

3
manifests/clients/octavia.pp
View File

@@ -30,7 +30,7 @@
# (optional) If set, then the server's certificate will not be verified.
# Defaults to false
#
class magnum::clients::octavia(
class magnum::clients::octavia (
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$ca_file = $magnum::clients::ca_file,
@@ -38,7 +38,6 @@ class magnum::clients::octavia(
$key_file = $magnum::clients::key_file,
$insecure = $magnum::clients::insecure,
) inherits magnum::clients {
include magnum::deps
include magnum::params

1
manifests/cluster.pp
View File

@@ -28,7 +28,6 @@ class magnum::cluster (
$temp_cache_dir = $facts['os_service_default'],
$pre_delete_lb_timeout = $facts['os_service_default'],
) {
include magnum::deps
magnum_config {

1
manifests/cluster_template.pp
View File

@@ -16,7 +16,6 @@ class magnum::cluster_template (
$kubernetes_allowed_network_drivers = $facts['os_service_default'],
$kubernetes_default_network_driver = $facts['os_service_default'],
) {
include magnum::deps
magnum_config {

3
manifests/conductor.pp
View File

@@ -24,14 +24,13 @@
# (optional) Number of conductor workers.
# Defaults to $facts['os_workers']
#
class magnum::conductor(
class magnum::conductor (
Boolean $enabled = true,
Boolean $manage_service = true,
$package_ensure = 'present',
$auth_strategy = 'keystone',
$workers = $facts['os_workers'],
) {
include magnum::db
include magnum::deps
include magnum::params

1
manifests/config.pp
View File

@@ -27,7 +27,6 @@ class magnum::config (
Hash $magnum_config = {},
Hash $magnum_api_paste_ini = {},
) {
include magnum::deps
create_resources('magnum_config', $magnum_config)

1
manifests/db.pp
View File

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

4
manifests/db/mysql.pp
View File

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

4
manifests/db/postgresql.pp
View File

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

4
manifests/db/sync.pp
View File

@@ -16,12 +16,11 @@
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class magnum::db::sync(
class magnum::db::sync (
$user = 'magnum',
$extra_params = '',
$db_sync_timeout = 300,
) {
include magnum::deps
include magnum::params
@@ -42,5 +41,4 @@ class magnum::db::sync(
notify => Anchor['magnum::dbsync::end'],
tag => 'openstack-db',
}
}

1
manifests/docker_registry.pp
View File

@@ -17,6 +17,7 @@ class magnum::docker_registry (
$swift_region = $facts['os_service_default'],
$swift_registry_container = $facts['os_service_default'],
) {
include magnum::deps
magnum_config {
'docker_registry/swift_region': value => $swift_region;

1
manifests/drivers.pp
View File

@@ -28,7 +28,6 @@ class magnum::drivers (
Variant[Array, Openstacklib::ServiceDefault] $disabled_drivers = $facts['os_service_default'],
Variant[Array, Openstacklib::ServiceDefault] $enabled_beta_drivers = $facts['os_service_default'],
) {
include magnum::deps
magnum_config {

1
manifests/healthcheck.pp
View File

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

4
manifests/init.pp
View File

@@ -174,7 +174,7 @@
# will be run through a green thread.
# Defaults to undef
#
class magnum(
class magnum (
$package_ensure = 'present',
$notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'],
@@ -210,7 +210,6 @@ class magnum(
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) {
include magnum::deps
include magnum::params
include magnum::policy
@@ -265,5 +264,4 @@ class magnum(
topics => $notification_topics,
retry => $notification_retry,
}
}

2
manifests/keystone/auth.pp
View File

@@ -97,7 +97,6 @@ class magnum::keystone::auth (
Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:9511/v1',
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:9511/v1',
) {
include magnum::deps
$real_service_name = pick($service_name, $auth_name)
@@ -124,5 +123,4 @@ class magnum::keystone::auth (
internal_url => $internal_url,
admin_url => $admin_url,
}
}

3
manifests/keystone/authtoken.pp
View File

@@ -189,7 +189,7 @@
# "public", "internal" or "admin".
# Defaults to $facts['os_service_default'].
#
class magnum::keystone::authtoken(
class magnum::keystone::authtoken (
String[1] $password,
$username = 'magnum',
$auth_url = 'http://localhost:5000',
@@ -228,7 +228,6 @@ class magnum::keystone::authtoken(
$service_type = $facts['os_service_default'],
$interface = $facts['os_service_default'],
) {
include magnum::deps
keystone::resource::authtoken { 'magnum_config':

2
manifests/keystone/domain.pp
View File

@@ -88,7 +88,6 @@ class magnum::keystone::domain (
$domain_admin_id = undef,
$domain_admin_domain_id = undef,
) {
include magnum::deps
include magnum::params
@@ -142,5 +141,4 @@ class magnum::keystone::domain (
'trust/trustee_keystone_interface': value => $keystone_interface;
'trust/trustee_keystone_region_name': value => $keystone_region_name;
}
}

3
manifests/keystone/keystone_auth.pp
View File

@@ -53,7 +53,7 @@
# against any certificate authorities.
# Defaults to $facts['os_service_default']
#
class magnum::keystone::keystone_auth(
class magnum::keystone::keystone_auth (
$password,
$username = 'magnum',
$auth_url = 'http://localhost:5000',
@@ -67,7 +67,6 @@ class magnum::keystone::keystone_auth(
$certfile = $facts['os_service_default'],
$insecure = $facts['os_service_default'],
) {
include magnum::deps
if is_service_default($system_scope) {

4
manifests/logging.pp
View File

@@ -101,7 +101,7 @@
# Defaults to $facts['os_service_default']
# Example: 'Y-%m-%d %H:%M:%S'
#
class magnum::logging(
class magnum::logging (
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
$use_journal = $facts['os_service_default'],
@@ -122,7 +122,6 @@ class magnum::logging(
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
) {
include magnum::deps
oslo::log { 'magnum_config':
@@ -146,5 +145,4 @@ class magnum::logging(
instance_format => $instance_format,
instance_uuid_format => $instance_uuid_format,
}
}

1
manifests/params.pp
View File

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

2
manifests/policy.pp
View File

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

1
manifests/quota.pp
View File

@@ -11,6 +11,7 @@
class magnum::quota (
$max_clusters_per_project = $facts['os_service_default']
) {
include magnum::deps
magnum_config {
'quotas/max_clusters_per_project': value => $max_clusters_per_project;

3
manifests/reports.pp
View File

@@ -17,12 +17,11 @@
# is set.
# Defaults to $facts['os_service_default']
#
class magnum::reports(
class magnum::reports (
$log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'],
) {
include magnum::deps
oslo::reports { 'magnum_config':

1
manifests/wsgi/apache.pp
View File

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

5
manifests/wsgi/uwsgi.pp
View File

@@ -25,11 +25,10 @@ class magnum::wsgi::uwsgi (
$processes = $facts['os_workers'],
$threads = 32,
$listen_queue_size = 100,
){
) {
include magnum::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.')
}

3
manifests/x509.pp
View File

@@ -31,7 +31,6 @@ class magnum::x509 (
$term_of_validity = $facts['os_service_default'],
$rsa_key_size = $facts['os_service_default'],
) {
include magnum::deps
magnum_config {
@@ -41,6 +40,4 @@ class magnum::x509 (
'x509/term_of_validity': value => $term_of_validity;
'x509/rsa_key_size': value => $rsa_key_size;
}
}