openstack/puppet-zaqar
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: I9488652dac89bdb4c9f419c4c65bb3179c39a20c
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-19 22:35:20 +09:00
parent ad48aad2d0
commit 75a8e53fa8
27 changed files with 22 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/cache.pp
View File

@@ -259,7 +259,6 @@ class zaqar::cache (
$dead_timeout = $facts['os_service_default'],
Boolean $manage_backend_package = true,
) {
include zaqar::deps
oslo::cache { 'zaqar_config':

2
manifests/client.pp
View File

@@ -11,7 +11,6 @@
class zaqar::client (
$ensure = 'present'
) {
include zaqar::deps
include zaqar::params
@@ -22,5 +21,4 @@ class zaqar::client (
}
include openstacklib::openstackclient
}

1
manifests/config.pp
View File

@@ -23,7 +23,6 @@
class zaqar::config (
Hash $zaqar_config = {},
) {
include zaqar::deps
create_resources('zaqar_config', $zaqar_config)

1
manifests/cors.pp
View File

@@ -44,7 +44,6 @@ class zaqar::cors (
$allow_methods = $facts['os_service_default'],
$allow_headers = $facts['os_service_default'],
) {
include zaqar::deps
oslo::cors { 'zaqar_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 zaqar::db::mysql(
class zaqar::db::mysql (
String[1] $password,
$dbname = 'zaqar',
$user = 'zaqar',
@@ -42,7 +42,6 @@ class zaqar::db::mysql(
$collate = 'utf8_general_ci',
$allowed_hosts = undef
) {
include zaqar::deps
openstacklib::db::mysql { 'zaqar':
@@ -58,5 +57,4 @@ class zaqar::db::mysql(
Anchor['zaqar::db::begin']
~> Class['zaqar::db::mysql']
~> Anchor['zaqar::db::end']
}

4
manifests/db/postgresql.pp
View File

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

4
manifests/db/sync.pp
View File

@@ -7,10 +7,9 @@
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class zaqar::db::sync(
class zaqar::db::sync (
$db_sync_timeout = 300,
) {
include zaqar::deps
include zaqar::params
@@ -31,5 +30,4 @@ class zaqar::db::sync(
notify => Anchor['zaqar::dbsync::end'],
tag => 'openstack-db',
}
}

4
manifests/init.pp
View File

@@ -77,7 +77,7 @@
# in the zaqar config.
# Defaults to false.
#
class zaqar(
class zaqar (
$auth_strategy = 'keystone',
$admin_mode = $facts['os_service_default'],
$unreliable = $facts['os_service_default'],
@@ -94,7 +94,6 @@ class zaqar(
$package_ensure = 'present',
Boolean $purge_config = false,
) inherits zaqar::params {
include zaqar::deps
resources { 'zaqar_config':
@@ -126,5 +125,4 @@ class zaqar(
'drivers/message_store': value => $message_store;
'drivers/management_store': value => $management_store;
}
}

3
manifests/keystone/auth.pp
View File

@@ -75,7 +75,7 @@
# (Optional) Whether to configure the admin role for the service user.
# Defaults to true
#
class zaqar::keystone::auth(
class zaqar::keystone::auth (
String[1] $password,
$email = 'zaqar@localhost',
$auth_name = 'zaqar',
@@ -95,7 +95,6 @@ class zaqar::keystone::auth(
$configure_service = true,
$service_description = 'OpenStack Messaging Service',
) {
include zaqar::deps
Keystone::Resource::Service_identity['zaqar'] -> Anchor['zaqar::service::end']

3
manifests/keystone/auth_websocket.pp
View File

@@ -40,7 +40,7 @@
# (Optional) Description for keystone service.
# Defaults to 'OpenStack Messaging Websocket Service'.
#
class zaqar::keystone::auth_websocket(
class zaqar::keystone::auth_websocket (
$service_name = 'zaqar-websocket',
$service_type = 'messaging-websocket',
$public_url = 'ws://127.0.0.1:9000',
@@ -51,7 +51,6 @@ class zaqar::keystone::auth_websocket(
$configure_service = true,
$service_description = 'OpenStack Messaging Websocket Service',
) {
include zaqar::deps
Keystone::Resource::Service_identity['zaqar-websocket'] -> Anchor['zaqar::service::end']

3
manifests/keystone/authtoken.pp
View File

@@ -194,7 +194,7 @@
# (Optional) Hash of additional parameters to pass through to the keystone
# authtoken class. Values set here override the individual parameters above.
#
class zaqar::keystone::authtoken(
class zaqar::keystone::authtoken (
String[1] $password,
$username = 'zaqar',
$auth_url = 'http://localhost:5000',
@@ -234,7 +234,6 @@ class zaqar::keystone::authtoken(
$interface = $facts['os_service_default'],
$params = {}
) {
include zaqar::deps
keystone::resource::authtoken {

6
manifests/keystone/trust.pp
View File

@@ -27,7 +27,7 @@
# (Optional) Authentication type to load
# Defaults to 'password'
#
class zaqar::keystone::trust(
class zaqar::keystone::trust (
$password,
$username = 'zaqar',
$auth_url = 'http://localhost:5000',
@@ -35,16 +35,14 @@ class zaqar::keystone::trust(
$auth_section = $facts['os_service_default'],
$auth_type = 'password',
) {
include zaqar::deps
zaqar_config {
'trustee/username': value => $username;
'trustee/password': value => $password, secret =>true;
'trustee/password': value => $password, secret => true;
'trustee/user_domain_name': value => $user_domain_name;
'trustee/auth_url': value => $auth_url;
'trustee/auth_section': value => $auth_section;
'trustee/auth_type': value => $auth_type;
}
}

4
manifests/logging.pp
View File

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

4
manifests/management/mongodb.pp
View File

@@ -57,7 +57,7 @@
# of 2) each time the operation is retried. (floating point value)
# Defaults to $facts['os_service_default'].
#
class zaqar::management::mongodb(
class zaqar::management::mongodb (
$uri,
$ssl_keyfile = $facts['os_service_default'],
$ssl_certfile = $facts['os_service_default'],
@@ -70,7 +70,6 @@ class zaqar::management::mongodb(
$max_reconnect_attempts = $facts['os_service_default'],
$reconnect_sleep = $facts['os_service_default'],
) {
include zaqar::deps
zaqar_config {
@@ -86,5 +85,4 @@ class zaqar::management::mongodb(
'drivers:management_store:mongodb/max_reconnect_attempts': value => $max_reconnect_attempts;
'drivers:management_store:mongodb/reconnect_sleep': value => $reconnect_sleep;
}
}

3
manifests/management/redis.pp
View File

@@ -21,14 +21,13 @@
# (Optional) Manage pyhton-redis package.
# Defaults to true
#
class zaqar::management::redis(
class zaqar::management::redis (
$uri,
$max_reconnect_attempts = $facts['os_service_default'],
$reconnect_sleep = $facts['os_service_default'],
$package_ensure = 'present',
Boolean $manage_package = true,
) {
include zaqar::deps
include zaqar::params

3
manifests/management/sqlalchemy.pp
View File

@@ -7,11 +7,10 @@
# (Optional) Ensure state for package.
# Defaults to present.
#
class zaqar::management::sqlalchemy(
class zaqar::management::sqlalchemy (
$uri,
$package_ensure = 'present',
) {
include zaqar::deps
zaqar_config {

4
manifests/messaging/mongodb.pp
View File

@@ -63,7 +63,7 @@
# deployment. It MUST remain static.
# Defaults to $facts['os_service_default'].
#
class zaqar::messaging::mongodb(
class zaqar::messaging::mongodb (
$uri,
$ssl_keyfile = $facts['os_service_default'],
$ssl_certfile = $facts['os_service_default'],
@@ -77,7 +77,6 @@ class zaqar::messaging::mongodb(
$reconnect_sleep = $facts['os_service_default'],
$partitions = $facts['os_service_default'],
) {
include zaqar::deps
zaqar_config {
@@ -94,5 +93,4 @@ class zaqar::messaging::mongodb(
'drivers:message_store:mongodb/reconnect_sleep': value => $reconnect_sleep;
'drivers:message_store:mongodb/partitions': value => $partitions;
}
}

3
manifests/messaging/redis.pp
View File

@@ -21,14 +21,13 @@
# (Optional) Manage pyhton-redis package.
# Defaults to true
#
class zaqar::messaging::redis(
class zaqar::messaging::redis (
$uri,
$max_reconnect_attempts = $facts['os_service_default'],
$reconnect_sleep = $facts['os_service_default'],
$package_ensure = 'present',
Boolean $manage_package = true,
) {
include zaqar::deps
include zaqar::params

4
manifests/messaging/swift.pp
View File

@@ -23,7 +23,7 @@
# (Optional) The default interface for endpoint URL discovery.
# Default $facts['os_service_default']
#
class zaqar::messaging::swift(
class zaqar::messaging::swift (
$uri,
$auth_url = $facts['os_service_default'],
$project_domain_name = $facts['os_service_default'],
@@ -31,7 +31,6 @@ class zaqar::messaging::swift(
$region_name = $facts['os_service_default'],
$interface = $facts['os_service_default'],
) {
include zaqar::deps
zaqar_config {
@@ -42,5 +41,4 @@ class zaqar::messaging::swift(
'drivers:message_store:swift/region_name': value => $region_name;
'drivers:message_store:swift/interface': value => $interface;
}
}

2
manifests/policy.pp
View File

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

3
manifests/reports.pp
View File

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

5
manifests/server.pp
View File

@@ -20,15 +20,13 @@
# Defaults to '$zaqar::params::service_name'
#
class zaqar::server(
class zaqar::server (
Boolean $manage_service = true,
Boolean $enabled = true,
$service_name = $zaqar::params::service_name,
) inherits zaqar::params {
include zaqar
include zaqar::deps
include zaqar::params
include zaqar::policy
if $manage_service {
@@ -46,7 +44,6 @@ class zaqar::server(
hasstatus => true,
tag => 'zaqar-service',
}
} elsif $service_name == 'httpd' {
service { $zaqar::params::service_name:
ensure => 'stopped',

4
manifests/server_instance.pp
View File

@@ -11,11 +11,10 @@
# (Optional) Service enable state for zaqar-server.
# Defaults to true
#
define zaqar::server_instance(
define zaqar::server_instance (
$transport,
Boolean $enabled = true,
) {
if $name == 'zaqar' {
fail('The name should not be \'zaqar\'. Please use a different name')
}
@@ -43,5 +42,4 @@ define zaqar::server_instance(
Package['zaqar-common'] ~> File["/etc/zaqar/${name}.conf"]
File["/etc/zaqar/${name}.conf"] ~> Service["${zaqar::params::service_name}@${name}"]
}

4
manifests/signed_url.pp
View File

@@ -7,14 +7,12 @@
# [*secret_key*]
# (Required) Secret key used to encrypt pre-signed URLs.
#
class zaqar::signed_url(
class zaqar::signed_url (
$secret_key,
) {
include zaqar::deps
zaqar_config {
'signed_url/secret_key': value => $secret_key, secret => true;
}
}

4
manifests/transport/websocket.pp
View File

@@ -20,14 +20,13 @@
# Port on which the notification server will listen.
# Defaults to $facts['os_service_default'].
#
class zaqar::transport::websocket(
class zaqar::transport::websocket (
$bind = $facts['os_service_default'],
$port = $facts['os_service_default'],
$external_port = $facts['os_service_default'],
$notification_bind = $facts['os_service_default'],
$notification_port = $facts['os_service_default'],
) {
include zaqar::deps
zaqar_config {
@@ -37,5 +36,4 @@ class zaqar::transport::websocket(
'drivers:transport:websocket/notification_bind': value => $notification_bind;
'drivers:transport:websocket/notification_port': value => $notification_port;
}
}

4
manifests/transport/wsgi.pp
View File

@@ -8,16 +8,14 @@
# Port on which the self-hosting server will listen.
# Defaults to $facts['os_service_default'].
#
class zaqar::transport::wsgi(
class zaqar::transport::wsgi (
$bind = $facts['os_service_default'],
$port = $facts['os_service_default'],
) {
include zaqar::deps
zaqar_config {
'drivers:transport:wsgi/bind': value => $bind;
'drivers:transport:wsgi/port': value => $port;
}
}

1
manifests/wsgi/apache.pp
View File

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