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: Ibd5b417e328b3b3008a4d01533f0251dde7dd1ce
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

manifests/api.pp

@@ -2,23 +2,23 @@
 #
 # == Parameters
 #
-# [*enabled*]
-#   (optional) Should the service be enabled.
-#   Defaults to true
-#
 # [*manage_service*]
 #   (optional) Whether the service should be managed by Puppet.
 #   Defaults to true.
 #
-# [*max_limit*]
-#   (optional) The maximum number of items returned in a
-#   single response from a collection resource.
-#   Defaults to $facts['os_service_default']
+# [*enabled*]
+#   (optional) Should the service be enabled.
+#   Defaults to true
 #
 # [*package_ensure*]
 #   (optional) ensure state for package.
 #   Defaults to 'present'
 #
+# [*max_limit*]
+#   (optional) The maximum number of items returned in a
+#   single response from a collection resource.
+#   Defaults to $facts['os_service_default']
+#
 # [*service_name*]
 #   (optional) Name of the service that will be providing the
 #   server functionality of gnocchi-api.
@@ -56,17 +56,17 @@
 #   Defaults to $facts['os_service_default'].
 #
 class gnocchi::api (
-  Boolean $manage_service       = true,
-  Boolean $enabled              = true,
-  $package_ensure               = 'present',
-  $max_limit                    = $facts['os_service_default'],
-  $service_name                 = $gnocchi::params::api_service_name,
-  Boolean $sync_db              = false,
-  $auth_strategy                = 'keystone',
-  $paste_config                 = $facts['os_service_default'],
-  $operation_timeout            = $facts['os_service_default'],
-  $enable_proxy_headers_parsing = $facts['os_service_default'],
-  $max_request_body_size        = $facts['os_service_default'],
+  Boolean $manage_service                 = true,
+  Boolean $enabled                        = true,
+  Stdlib::Ensure::Package $package_ensure = 'present',
+  $max_limit                              = $facts['os_service_default'],
+  $service_name                           = $gnocchi::params::api_service_name,
+  Boolean $sync_db                        = false,
+  $auth_strategy                          = 'keystone',
+  $paste_config                           = $facts['os_service_default'],
+  $operation_timeout                      = $facts['os_service_default'],
+  $enable_proxy_headers_parsing           = $facts['os_service_default'],
+  $max_request_body_size                  = $facts['os_service_default'],
 ) inherits gnocchi::params {
   include gnocchi::deps
   include gnocchi::policy

manifests/client.pp

@@ -3,10 +3,11 @@
 #
 # == parameters
 #  [*ensure*]
-#    ensure state for package.
+#    (optional) ensure state for package.
+#    Defaults to 'present'
 #
 class gnocchi::client (
-  $ensure = 'present'
+  Stdlib::Ensure::Package $ensure = 'present'
 ) {
   include gnocchi::deps
   include gnocchi::params

manifests/db.pp

@@ -52,17 +52,17 @@
 #   Defaults to 'present'
 #
 class gnocchi::db (
-  $database_db_max_retries          = $facts['os_service_default'],
-  Oslo::DBconn $database_connection = 'sqlite:////var/lib/gnocchi/gnocchi.sqlite',
-  $slave_connection                 = $facts['os_service_default'],
-  $database_connection_recycle_time = $facts['os_service_default'],
-  $database_max_pool_size           = $facts['os_service_default'],
-  $database_max_retries             = $facts['os_service_default'],
-  $database_retry_interval          = $facts['os_service_default'],
-  $database_max_overflow            = $facts['os_service_default'],
-  $database_pool_timeout            = $facts['os_service_default'],
-  $mysql_enable_ndb                 = $facts['os_service_default'],
-  $package_ensure                   = 'present',
+  $database_db_max_retries                = $facts['os_service_default'],
+  Oslo::DBconn $database_connection       = 'sqlite:////var/lib/gnocchi/gnocchi.sqlite',
+  $slave_connection                       = $facts['os_service_default'],
+  $database_connection_recycle_time       = $facts['os_service_default'],
+  $database_max_pool_size                 = $facts['os_service_default'],
+  $database_max_retries                   = $facts['os_service_default'],
+  $database_retry_interval                = $facts['os_service_default'],
+  $database_max_overflow                  = $facts['os_service_default'],
+  $database_pool_timeout                  = $facts['os_service_default'],
+  $mysql_enable_ndb                       = $facts['os_service_default'],
+  Stdlib::Ensure::Package $package_ensure = 'present',
 ) inherits gnocchi::params {
   include gnocchi::deps
 

manifests/init.pp

@@ -18,9 +18,9 @@
 #   Defaults to false.
 #
 class gnocchi (
-  $package_ensure       = 'present',
-  $coordination_url     = $facts['os_service_default'],
-  Boolean $purge_config = false,
+  Stdlib::Ensure::Package $package_ensure = 'present',
+  $coordination_url                       = $facts['os_service_default'],
+  Boolean $purge_config                   = false,
 ) inherits gnocchi::params {
   include gnocchi::deps
 

manifests/metricd.pp

@@ -2,14 +2,18 @@
 #
 # == Parameters
 #
-# [*enabled*]
-#   (optional) Should the service be enabled.
-#   Defaults to true
-#
 # [*package_ensure*]
 #   (optional) ensure state for package.
 #   Defaults to 'present'
 #
+# [*manage_service*]
+#   (optional) Whether the service should be managed by Puppet.
+#   Defaults to true.
+#
+# [*enabled*]
+#   (optional) Should the service be enabled.
+#   Defaults to true
+#
 # [*workers*]
 #   (optional) the number of workers.
 #   Defaults to $facts['os_workers']
@@ -35,20 +39,16 @@
 #   (optional) Number of workers tht share a task.
 #   Defaults to $facts['os_service_default'].
 #
-# [*manage_service*]
-#   (optional) Whether the service should be managed by Puppet.
-#   Defaults to true.
-#
 class gnocchi::metricd (
-  Boolean $manage_service  = true,
-  Boolean $enabled         = true,
-  $workers                 = $facts['os_workers'],
-  $metric_processing_delay = $facts['os_service_default'],
-  $greedy                  = $facts['os_service_default'],
-  $metric_reporting_delay  = $facts['os_service_default'],
-  $metric_cleanup_delay    = $facts['os_service_default'],
-  $processing_replicas     = $facts['os_service_default'],
-  $package_ensure          = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
+  Boolean $manage_service                 = true,
+  Boolean $enabled                        = true,
+  $workers                                = $facts['os_workers'],
+  $metric_processing_delay                = $facts['os_service_default'],
+  $greedy                                 = $facts['os_service_default'],
+  $metric_reporting_delay                 = $facts['os_service_default'],
+  $metric_cleanup_delay                   = $facts['os_service_default'],
+  $processing_replicas                    = $facts['os_service_default'],
 ) inherits gnocchi::params {
   include gnocchi::deps
 

manifests/statsd.pp

@@ -39,14 +39,14 @@
 #
 class gnocchi::statsd (
   $resource_id,
-  $host                   = $facts['os_service_default'],
-  $port                   = $facts['os_service_default'],
-  $flush_delay            = $facts['os_service_default'],
-  $archive_policy_name    = $facts['os_service_default'],
-  $creator                = $facts['os_service_default'],
-  Boolean $manage_service = true,
-  Boolean $enabled        = true,
-  $package_ensure         = 'present',
+  $host                                   = $facts['os_service_default'],
+  $port                                   = $facts['os_service_default'],
+  $flush_delay                            = $facts['os_service_default'],
+  $archive_policy_name                    = $facts['os_service_default'],
+  $creator                                = $facts['os_service_default'],
+  Boolean $manage_service                 = true,
+  Boolean $enabled                        = true,
+  Stdlib::Ensure::Package $package_ensure = 'present',
 ) inherits gnocchi::params {
   include gnocchi::deps
 

manifests/storage/ceph.pp

@@ -54,13 +54,13 @@
 #
 class gnocchi::storage::ceph (
   $ceph_username,
-  $ceph_keyring         = undef,
-  $ceph_secret          = undef,
-  $ceph_pool            = 'gnocchi',
-  $ceph_timeout         = $facts['os_service_default'],
-  $ceph_conffile        = '/etc/ceph/ceph.conf',
-  Boolean $manage_rados = true,
-  $package_ensure       = 'present',
+  $ceph_keyring                           = undef,
+  $ceph_secret                            = undef,
+  $ceph_pool                              = 'gnocchi',
+  $ceph_timeout                           = $facts['os_service_default'],
+  $ceph_conffile                          = '/etc/ceph/ceph.conf',
+  Boolean $manage_rados                   = true,
+  Stdlib::Ensure::Package $package_ensure = 'present',
 ) inherits gnocchi::params {
   include gnocchi::deps
 

manifests/storage/s3.pp

@@ -34,13 +34,13 @@
 #   Defaults to 'present'
 #
 class gnocchi::storage::s3 (
-  $s3_endpoint_url      = $facts['os_service_default'],
-  $s3_region_name       = $facts['os_service_default'],
-  $s3_access_key_id     = undef,
-  $s3_secret_access_key = undef,
-  $s3_bucket_prefix     = $facts['os_service_default'],
-  Boolean $manage_boto3 = true,
-  $package_ensure       = 'present',
+  $s3_endpoint_url                        = $facts['os_service_default'],
+  $s3_region_name                         = $facts['os_service_default'],
+  $s3_access_key_id                       = undef,
+  $s3_secret_access_key                   = undef,
+  $s3_bucket_prefix                       = $facts['os_service_default'],
+  Boolean $manage_boto3                   = true,
+  Stdlib::Ensure::Package $package_ensure = 'present',
 ) {
   include gnocchi::deps
   include gnocchi::params