openstack/puppet-manila
Code Issues Proposed changes

Merge "Prepare for voxpupuli-puppet-lint-plugins"

Browse Source
This commit is contained in:
Zuul
2025-08-23 04:44:01 +00:00
committed by Gerrit Code Review
parent 07f361e4b1 95a3236299
commit e3046a3e25
52 changed files with 14 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/api.pp
View File

@@ -88,7 +88,6 @@ class manila::api (
$service_workers = $facts['os_workers'],
$admin_only_metadata = $facts['os_service_default'],
) inherits manila::params {
include manila::deps
include manila::params
include manila::policy
@@ -126,7 +125,6 @@ class manila::api (
Manila_api_paste_ini<||> ~> Service['manila-api']
# On any uwsgi config change, we must restart Manila API.
Manila_api_uwsgi_config<||> ~> Service['manila-api']
} elsif $service_name == 'httpd' {
# We need to make sure manila-api/eventlet is stopped before trying to
# start apache
@@ -142,7 +140,6 @@ class manila::api (
# On any api-paste.ini config change, we must restart Manila API.
Manila_api_paste_ini<||> ~> Service[$service_name]
} else {
fail("Invalid service_name. Either use manila-api/openstack-manila-api \
for running as a standalone service, or httpd for being run by a httpd \

2
manifests/backend/cephfs.pp
View File

@@ -127,7 +127,6 @@ define manila::backend::cephfs (
$cephfs_ganesha_server_password = undef,
$cephfs_ganesha_path_to_private_key = undef,
) {
include manila::deps
include manila::params
@@ -182,5 +181,4 @@ define manila::backend::cephfs (
})
Package<| title == 'ceph-common' |> { tag +> 'manila-support-package' }
}
}

1
manifests/backend/dellemc_isilon.pp
View File

@@ -74,7 +74,6 @@ define manila::backend::dellemc_isilon (
# DEPRECATED PARAMETERS
$driver_handles_share_servers = undef,
) {
include manila::deps
include manila::params

2
manifests/backend/dellemc_powermax.pp
View File

@@ -101,7 +101,6 @@ define manila::backend::dellemc_powermax (
$reserved_share_extend_percentage = $facts['os_service_default'],
$package_ensure = 'present',
) {
include manila::deps
include manila::params
@@ -132,5 +131,4 @@ define manila::backend::dellemc_powermax (
ensure => $package_ensure,
})
Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' }
}

1
manifests/backend/dellemc_unity.pp
View File

@@ -137,7 +137,6 @@ define manila::backend::dellemc_unity (
$package_ensure = 'present',
Boolean $manage_storops = true,
) {
include manila::deps
include manila::params

3
manifests/backend/dellemc_vnx.pp
View File

@@ -118,7 +118,6 @@ define manila::backend::dellemc_vnx (
# DEPRECATED PARAMETERS
$driver_handles_share_servers = undef,
) {
include manila::deps
include manila::params
@@ -155,6 +154,4 @@ define manila::backend::dellemc_vnx (
ensure => $package_ensure,
})
Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' }
}

3
manifests/backend/flashblade.pp
View File

@@ -71,7 +71,6 @@ define manila::backend::flashblade (
$max_over_subscription_ratio = $facts['os_service_default'],
$package_ensure = 'present',
) {
include manila::deps
include manila::params
@@ -97,6 +96,4 @@ define manila::backend::flashblade (
ensure => $package_ensure,
})
Package<| title == 'nfs-client' |> { tag +> 'manila-support-package' }
}

1
manifests/backend/ganesha.pp
View File

@@ -67,7 +67,6 @@ define manila::backend::ganesha (
$ganesha_rados_export_counter = $facts['os_service_default'],
$ganesha_rados_export_index = $facts['os_service_default'],
) {
include manila::deps
manila_config {

1
manifests/backend/generic.pp
View File

@@ -112,7 +112,6 @@ define manila::backend::generic (
$reserved_share_from_snapshot_percentage = $facts['os_service_default'],
$reserved_share_extend_percentage = $facts['os_service_default'],
) {
include manila::deps
$share_driver = 'manila.share.drivers.generic.GenericShareDriver'

1
manifests/backend/glusterfs.pp
View File

@@ -51,7 +51,6 @@ define manila::backend::glusterfs (
$reserved_share_from_snapshot_percentage = $facts['os_service_default'],
$reserved_share_extend_percentage = $facts['os_service_default'],
) {
include manila::deps
$share_driver = 'manila.share.drivers.glusterfs.GlusterfsShareDriver'

3
manifests/backend/glusternative.pp
View File

@@ -55,7 +55,6 @@ define manila::backend::glusternative (
$reserved_share_extend_percentage = $facts['os_service_default'],
$package_ensure = 'present',
) {
include manila::deps
include manila::params
@@ -75,7 +74,7 @@ define manila::backend::glusternative (
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
stdlib::ensure_packages( [
stdlib::ensure_packages([
$manila::params::gluster_package_name,
$manila::params::gluster_client_package_name,
], {

3
manifests/backend/glusternfs.pp
View File

@@ -64,7 +64,6 @@ define manila::backend::glusternfs (
$reserved_share_extend_percentage = $facts['os_service_default'],
$package_ensure = 'present',
) {
include manila::deps
include manila::params
@@ -86,7 +85,7 @@ define manila::backend::glusternfs (
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
stdlib::ensure_packages( [
stdlib::ensure_packages([
$manila::params::gluster_package_name,
$manila::params::gluster_client_package_name,
], {

1
manifests/backend/hitachi_hnas.pp
View File

@@ -91,7 +91,6 @@ define manila::backend::hitachi_hnas (
$max_over_subscription_ratio = $facts['os_service_default'],
$package_ensure = 'present',
) {
include manila::deps
include manila::params

1
manifests/backend/lvm.pp
View File

@@ -72,7 +72,6 @@ define manila::backend::lvm (
# DEPRECATED PARAMETERS
$driver_handles_share_servers = undef,
) {
include manila::deps
$share_driver = 'manila.share.drivers.lvm.LVMShareDriver'

1
manifests/backend/netapp.pp
View File

@@ -160,7 +160,6 @@ define manila::backend::netapp (
$max_over_subscription_ratio = $facts['os_service_default'],
$package_ensure = 'present',
) {
include manila::deps
include manila::params

1
manifests/backend/service_instance.pp
View File

@@ -94,7 +94,6 @@ define manila::backend::service_instance (
$interface_driver = 'manila.network.linux.interface.OVSInterfaceDriver',
$connect_share_server_to_tenant_network = false,
) {
include manila::deps
if $create_service_image {

2
manifests/backends.pp
View File

@@ -13,12 +13,10 @@
class manila::backends (
Variant[String[1], Array[String[1], 1]] $enabled_share_backends
) {
include manila::deps
# Maybe this could be extended to dynamically find the enabled names
manila_config {
'DEFAULT/enabled_share_backends': value => join(any2array($enabled_share_backends), ',');
}
}

1
manifests/client.pp
View File

@@ -10,7 +10,6 @@
class manila::client (
$package_ensure = 'present'
) {
include manila::deps
include manila::params

1
manifests/compute/nova.pp
View File

@@ -73,7 +73,6 @@ class manila::compute::nova (
$password = $facts['os_service_default'],
$api_microversion = $facts['os_service_default'],
) {
include manila::deps
if is_service_default($system_scope) {

1
manifests/config.pp
View File

@@ -35,7 +35,6 @@ class manila::config (
Hash $api_paste_ini_config = {},
Hash $manila_rootwrap_config = {},
) {
include manila::deps
create_resources('manila_config', $manila_config)

3
manifests/coordination.pp
View File

@@ -11,10 +11,9 @@
class manila::coordination (
$backend_url = $facts['os_service_default'],
) {
include manila::deps
oslo::coordination{ 'manila_config':
oslo::coordination { 'manila_config':
backend_url => $backend_url,
}

1
manifests/cors.pp
View File

@@ -44,7 +44,6 @@ class manila::cors (
$allow_methods = $facts['os_service_default'],
$allow_headers = $facts['os_service_default'],
) {
include manila::deps
oslo::cors { 'manila_config':

1
manifests/cron/db_purge.pp
View File

@@ -70,7 +70,6 @@ class manila::cron::db_purge (
Integer[0] $maxdelay = 0,
Enum['present', 'absent'] $ensure = 'present',
) inherits manila::params {
include manila::deps
if $maxdelay == 0 {

1
manifests/data.pp
View File

@@ -67,7 +67,6 @@ class manila::data (
$backup_share_unmount_template = $facts['os_service_default'],
$backup_ignore_files = $facts['os_service_default'],
) {
include manila::deps
include manila::params

1
manifests/data/backup/nfs.pp
View File

@@ -35,7 +35,6 @@ class manila::data::backup::nfs (
$backup_mount_options = $facts['os_service_default'],
$package_ensure = 'present',
) {
include manila::deps
include manila::params

1
manifests/db.pp
View File

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

1
manifests/db/mysql.pp
View File

@@ -44,7 +44,6 @@ class manila::db::mysql (
$collate = 'utf8_general_ci',
$cluster_id = 'localzone',
) {
include manila::deps
openstacklib::db::mysql { 'manila':

4
manifests/db/postgresql.pp
View File

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

3
manifests/db/sync.pp
View File

@@ -7,10 +7,9 @@
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class manila::db::sync(
class manila::db::sync (
$db_sync_timeout = 300,
) {
include manila::deps
include manila::params

2
manifests/deps.pp
View File

@@ -70,5 +70,3 @@ class manila::deps {
Anchor['manila::install::end'] ~> Anchor['manila::service::begin']
Anchor['manila::config::end'] ~> Anchor['manila::service::begin']
}

1
manifests/ganesha.pp
View File

@@ -38,7 +38,6 @@ class manila::ganesha (
$ganesha_export_dir = $facts['os_service_default'],
$ganesha_export_template_dir = $facts['os_service_default'],
) {
include manila::deps
manila::backend::ganesha { 'DEFAULT':

1
manifests/healthcheck.pp
View File

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

1
manifests/image/glance.pp
View File

@@ -83,7 +83,6 @@ class manila::image::glance (
$username = 'glance',
$password = $facts['os_service_default'],
) {
include manila::deps
if is_service_default($system_scope) {

1
manifests/init.pp
View File

@@ -270,7 +270,6 @@ class manila (
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits manila::params {
include manila::deps
include manila::db

1
manifests/keystone/auth.pp
View File

@@ -150,7 +150,6 @@ class manila::keystone::auth (
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:8786/v1/%(tenant_id)s',
Keystone::EndpointUrl $internal_url_v2 = 'http://127.0.0.1:8786/v2',
) {
include manila::deps
Keystone::Resource::Service_identity['manila'] -> Anchor['manila::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 manila::keystone::authtoken(
class manila::keystone::authtoken (
String[1] $password,
$username = 'manila',
$auth_url = 'http://localhost:5000',
@@ -234,7 +234,6 @@ class manila::keystone::authtoken(
$interface = $facts['os_service_default'],
$params = {}
) {
include manila::deps
keystone::resource::authtoken {

4
manifests/logging.pp
View File

@@ -97,7 +97,7 @@
# Defaults to $facts['os_service_default']
# Example: 'Y-%m-%d %H:%M:%S'
#
class manila::logging(
class manila::logging (
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
$use_journal = $facts['os_service_default'],
@@ -118,7 +118,6 @@ class manila::logging(
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
) {
include manila::deps
oslo::log { 'manila_config':
@@ -142,5 +141,4 @@ class manila::logging(
instance_format => $instance_format,
instance_uuid_format => $instance_uuid_format,
}
}

1
manifests/network/neutron.pp
View File

@@ -83,7 +83,6 @@ class manila::network::neutron (
$network_plugin_ipv4_enabled = $facts['os_service_default'],
$network_plugin_ipv6_enabled = $facts['os_service_default'],
) {
include manila::deps
if is_service_default($system_scope) {

1
manifests/network/neutron_network.pp
View File

@@ -21,6 +21,7 @@ define manila::network::neutron_network (
$network_plugin_ipv4_enabled = $facts['os_service_default'],
$network_plugin_ipv6_enabled = $facts['os_service_default'],
) {
include manila::deps
$neutron_single_plugin_name = 'manila.network.neutron.neutron_network_plugin.NeutronNetworkPlugin'

1
manifests/network/neutron_single_network.pp
View File

@@ -27,6 +27,7 @@ define manila::network::neutron_single_network (
$network_plugin_ipv4_enabled = $facts['os_service_default'],
$network_plugin_ipv6_enabled = $facts['os_service_default'],
) {
include manila::deps
$neutron_single_plugin_name = 'manila.network.neutron.neutron_network_plugin.NeutronSingleNetworkPlugin'

1
manifests/network/standalone.pp
View File

@@ -43,6 +43,7 @@ define manila::network::standalone (
$network_plugin_ipv4_enabled = $facts['os_service_default'],
$network_plugin_ipv6_enabled = $facts['os_service_default'],
) {
include manila::deps
$standalone_plugin_name = 'manila.network.standalone_network_plugin.StandaloneNetworkPlugin'

1
manifests/params.pp
View File

@@ -52,6 +52,5 @@ class manila::params {
default: {
fail("unsupported osfamily ${facts['os']['family']}, currently Debian and Redhat are the only supported platforms")
}
}
}

2
manifests/policy.pp
View File

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

1
manifests/quota.pp
View File

@@ -76,7 +76,6 @@ class manila::quota (
$until_refresh = $facts['os_service_default'],
$max_age = $facts['os_service_default'],
) {
include manila::deps
manila_config {

3
manifests/reports.pp
View File

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

1
manifests/scheduler.pp
View File

@@ -44,7 +44,6 @@ class manila::scheduler (
# DEPRECATED PARAMETERS
$scheduler_driver = undef
) {
include manila::deps
include manila::params

1
manifests/scheduler/filter.pp
View File

@@ -38,7 +38,6 @@ class manila::scheduler::filter (
$pool_weight_multiplier = $facts['os_service_default'],
$capacity_weight_multiplier = $facts['os_service_default'],
) {
include manila::deps
manila_config {

3
manifests/setup_test_volume.pp
View File

@@ -20,13 +20,12 @@
# (Optional) Volume image location.
# Defaults to '/var/lib/manila'.
#
class manila::setup_test_volume(
class manila::setup_test_volume (
String[1] $volume_name = 'lvm-shares',
Stdlib::Absolutepath $volume_path = '/var/lib/manila',
$size = '4G',
$loopback_device = '/dev/loop2'
) {
include manila::deps
stdlib::ensure_packages ( 'lvm2', {

1
manifests/share.pp
View File

@@ -97,7 +97,6 @@ class manila::share (
$driver_backup_continue_update_interval = $facts['os_service_default'],
$driver_restore_continue_update_interval = $facts['os_service_default'],
) {
include manila::deps
include manila::params

1
manifests/volume/cinder.pp
View File

@@ -79,7 +79,6 @@ class manila::volume::cinder (
$http_retries = $facts['os_service_default'],
$cross_az_attach = $facts['os_service_default'],
) {
include manila::deps
if is_service_default($system_scope) {

1
manifests/wsgi/apache.pp
View File

@@ -158,7 +158,6 @@ class manila::wsgi::apache (
$request_headers = undef,
$vhost_custom_fragment = undef,
) {
include manila::deps
include manila::params

5
manifests/wsgi/uwsgi.pp
View File

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