Merge "Validate ensure parameter for package resources"

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

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'],

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

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'],

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 {

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',

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 {

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

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
 ) {

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 {

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