From 6d3abccd29f023fbef576fbdb71dc546cb7294ad Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 23 Sep 2025 21:38:50 +0900 Subject: [PATCH] Validate ensure parameter for package resources The minimum version of puppetlabs-stdlib has been bumped globally, so now we can use the common type definition. Change-Id: Icdc8d5235a576b714a99977197941457f1787917 Signed-off-by: Takashi Kajinami --- manifests/client.pp | 2 +- manifests/containerreconciler.pp | 2 +- manifests/init.pp | 8 ++++---- manifests/objectexpirer.pp | 2 +- manifests/proxy.pp | 2 +- manifests/proxy/ceilometer.pp | 2 +- manifests/storage/account.pp | 2 +- manifests/storage/container.pp | 2 +- manifests/storage/generic.pp | 2 +- manifests/storage/object.pp | 2 +- manifests/storage/policy.pp | 18 +++++++++--------- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index abb838b5..d5013388 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -9,7 +9,7 @@ # Defaults to 'present'. # class swift::client ( - $ensure = 'present', + Stdlib::Ensure::Package $ensure = 'present', ) { include swift::deps include swift::params diff --git a/manifests/containerreconciler.pp b/manifests/containerreconciler.pp index ec6a00a5..0217edd1 100644 --- a/manifests/containerreconciler.pp +++ b/manifests/containerreconciler.pp @@ -115,7 +115,7 @@ class swift::containerreconciler ( Boolean $manage_service = true, Boolean $enabled = true, - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], $interval = $facts['os_service_default'], $concurrency = $facts['os_service_default'], diff --git a/manifests/init.pp b/manifests/init.pp index 0bacdd53..d8ce806e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -45,10 +45,10 @@ # Copyright 2011 Puppetlabs Inc, unless otherwise noted. # class swift ( - $swift_hash_path_suffix = $facts['os_service_default'], - $swift_hash_path_prefix = $facts['os_service_default'], - $package_ensure = 'present', - Boolean $purge_config = false, + $swift_hash_path_suffix = $facts['os_service_default'], + $swift_hash_path_prefix = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $purge_config = false, ) { include swift::deps include swift::params diff --git a/manifests/objectexpirer.pp b/manifests/objectexpirer.pp index 4cfdeabb..f69c95b8 100644 --- a/manifests/objectexpirer.pp +++ b/manifests/objectexpirer.pp @@ -132,7 +132,7 @@ class swift::objectexpirer ( Boolean $manage_service = true, Boolean $enabled = true, - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'], $concurrency = $facts['os_service_default'], $interval = $facts['os_service_default'], diff --git a/manifests/proxy.pp b/manifests/proxy.pp index a33f782a..4e78c851 100644 --- a/manifests/proxy.pp +++ b/manifests/proxy.pp @@ -249,7 +249,7 @@ class swift::proxy ( $allow_open_expired = $facts['os_service_default'], Boolean $manage_service = true, Boolean $enabled = true, - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', Swift::ServiceProvider $service_provider = $swift::params::service_provider, Boolean $purge_config = false, ) inherits swift::params { diff --git a/manifests/proxy/ceilometer.pp b/manifests/proxy/ceilometer.pp index 51e102cd..92e8e6b0 100644 --- a/manifests/proxy/ceilometer.pp +++ b/manifests/proxy/ceilometer.pp @@ -177,7 +177,7 @@ class swift::proxy::ceilometer ( $driver = $facts['os_service_default'], $topic = $facts['os_service_default'], $control_exchange = $facts['os_service_default'], - $ensure = 'present', + Stdlib::Ensure::Package $ensure = 'present', $nonblocking_notify = $facts['os_service_default'], $ignore_projects = ['services'], $auth_url = 'http://127.0.0.1:5000', diff --git a/manifests/storage/account.pp b/manifests/storage/account.pp index 986e9abd..3f8fdd8e 100644 --- a/manifests/storage/account.pp +++ b/manifests/storage/account.pp @@ -29,7 +29,7 @@ class swift::storage::account ( Boolean $manage_service = true, Boolean $enabled = true, - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', String[1] $config_file_name = 'account-server.conf', Swift::ServiceProvider $service_provider = $swift::params::service_provider ) inherits swift::params { diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp index 4b9caea0..f00a84d8 100644 --- a/manifests/storage/container.pp +++ b/manifests/storage/container.pp @@ -34,7 +34,7 @@ class swift::storage::container ( Boolean $manage_service = true, Boolean $enabled = true, - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', Array[String[1]] $allowed_sync_hosts = ['127.0.0.1'], String[1] $config_file_name = 'container-server.conf', Swift::ServiceProvider $service_provider = $swift::params::service_provider diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp index c0af74c9..0b497f9b 100644 --- a/manifests/storage/generic.pp +++ b/manifests/storage/generic.pp @@ -37,7 +37,7 @@ define swift::storage::generic ( Swift::StorageServerType $type = $name, Boolean $manage_service = true, Boolean $enabled = true, - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', String[1] $config_file_name = "${name}-server.conf", Swift::ServiceProvider $service_provider = $swift::params::service_provider ) { diff --git a/manifests/storage/object.pp b/manifests/storage/object.pp index 0fde49ba..6af91153 100644 --- a/manifests/storage/object.pp +++ b/manifests/storage/object.pp @@ -29,7 +29,7 @@ class swift::storage::object ( Boolean $manage_service = true, Boolean $enabled = true, - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', String[1] $config_file_name = 'object-server.conf', Swift::ServiceProvider $service_provider = $swift::params::service_provider ) inherits swift::params { diff --git a/manifests/storage/policy.pp b/manifests/storage/policy.pp index 989b22b1..a8fab5eb 100644 --- a/manifests/storage/policy.pp +++ b/manifests/storage/policy.pp @@ -60,15 +60,15 @@ define swift::storage::policy ( $policy_name, $default_policy, - $ensure = 'present', - $policy_aliases = undef, - $policy_index = $name, - $policy_type = 'replication', - $deprecated = undef, - $ec_type = undef, - $ec_num_data_fragments = undef, - $ec_num_parity_fragments = undef, - $ec_object_segment_size = undef, + Enum['present', 'absent'] $ensure = 'present', + $policy_aliases = undef, + $policy_index = $name, + $policy_type = 'replication', + $deprecated = undef, + $ec_type = undef, + $ec_num_data_fragments = undef, + $ec_num_parity_fragments = undef, + $ec_object_segment_size = undef, ) { include swift::deps