openstack/puppet-cinder
Code Issues Proposed changes

Validate ensure parameter for package resources

Browse Source 
The minimum version of puppetlabs-stdlib has been bumped globally, so
now we can use the common type definition.

Change-Id: I9331265b23fbe6df905e83a0dc07e9d84f6544cf
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-23 17:16:22 +09:00
parent 0b65e1bf37
commit 20ceacaa51
9 changed files with 145 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/api.pp
View File

@@ -107,14 +107,13 @@
#
class cinder::api (
$service_workers = $facts['os_workers'],
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
$bind_host = $facts['os_service_default'],
Boolean $enabled = true,
Boolean $manage_service = true,
$ratelimits = $facts['os_service_default'],
$default_volume_type = $facts['os_service_default'],
$ratelimits_factory =
'cinder.api.v2.limits:RateLimitingMiddleware.factory',
$ratelimits_factory = 'cinder.api.v2.limits:RateLimitingMiddleware.factory',
Boolean $sync_db = true,
$public_endpoint = $facts['os_service_default'],
$osapi_volume_base_url = $facts['os_service_default'],

10
manifests/backend/emc_vnx.pp
View File

@@ -58,10 +58,6 @@
# (optional) Default max number of LUNs in a storage group.
# Defaults to: '256'
#
# [*package_ensure*]
# (optional) The state of the package
# Defaults to: 'present'
#
# [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza
# Defaults to: {}
@@ -126,6 +122,10 @@
# (optional) Naviseccli Path.
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) The state of the package
# Defaults to: 'present'
#
# [*manage_volume_type*]
# (Optional) Whether or not manage Cinder Volume type.
# If set to true, a Cinder Volume type will be created
@@ -138,7 +138,6 @@ define cinder::backend::emc_vnx (
$storage_vnx_pool_names,
$default_timeout = '10',
$max_luns_per_storage_group = '256',
$package_ensure = 'present',
$san_login = 'admin',
$volume_backend_name = $name,
$backend_availability_zone = $facts['os_service_default'],
@@ -161,6 +160,7 @@ define cinder::backend::emc_vnx (
$storage_vnx_auth_type = $facts['os_service_default'],
$storage_vnx_security_file_dir = $facts['os_service_default'],
$naviseccli_path = $facts['os_service_default'],
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_volume_type = false,
) {
include cinder::deps

5
manifests/backend/nfs.pp
View File

@@ -100,7 +100,8 @@
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'.
# (optional) Ensure state for package.
# Defaults to 'present'.
#
# [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza
@@ -127,7 +128,7 @@ define cinder::backend::nfs (
$nas_secure_file_permissions = $facts['os_service_default'],
$nfs_snapshot_support = $facts['os_service_default'],
$nfs_qcow2_volumes = $facts['os_service_default'],
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_volume_type = false,
Hash $extra_options = {},
) {

2
manifests/backup.pp
View File

@@ -60,7 +60,7 @@
class cinder::backup (
Boolean $enabled = true,
Boolean $manage_service = true,
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
$backup_manager = $facts['os_service_default'],
$backup_api_class = $facts['os_service_default'],
$backup_name_template = $facts['os_service_default'],

5
manifests/backup/nfs.pp
View File

@@ -48,7 +48,8 @@
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'.
# (optional) Ensure state for package.
# Defaults to 'present'.
#
# === Author(s)
#
@@ -81,7 +82,7 @@ class cinder::backup::nfs (
$backup_mount_options = $facts['os_service_default'],
$backup_container = $facts['os_service_default'],
$backup_compression_algorithm = $facts['os_service_default'],
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
) {
include cinder::deps
include cinder::params

2
manifests/client.pp
View File

@@ -9,7 +9,7 @@
# Defaults to 'present'.
#
class cinder::client (
$package_ensure = 'present'
Stdlib::Ensure::Package $package_ensure = 'present',
) {
include cinder::deps
include cinder::params

2
manifests/init.pp
View File

@@ -245,6 +245,7 @@
# Defaults to $facts['os_service_default'].
#
class cinder (
Stdlib::Ensure::Package $package_ensure = 'present',
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
@@ -278,7 +279,6 @@ class cinder (
$kombu_compression = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$amqp_auto_delete = $facts['os_service_default'],
$package_ensure = 'present',
$api_paste_config = '/etc/cinder/api-paste.ini',
$storage_availability_zone = $facts['os_service_default'],
$default_availability_zone = $facts['os_service_default'],

2
manifests/scheduler.pp
View File

@@ -44,7 +44,7 @@ class cinder::scheduler (
$driver_init_wait_time = $facts['os_service_default'],
$host_manager = $facts['os_service_default'],
$max_attempts = $facts['os_service_default'],
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
# DEPRECATED PARAMETERS

2
manifests/volume.pp
View File

@@ -58,7 +58,7 @@
# Defaults to $facts['os_service_default'].
#
class cinder::volume (
$package_ensure = 'present',
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $enabled = true,
Boolean $manage_service = true,
$cluster = $facts['os_service_default'],