Merge "Validate ensure parameter for package resources"

manifests/api.pp

@@ -33,12 +33,12 @@
 #   Defaults to $facts['os_service_default'].
 #
 class placement::api (
-  Boolean $enabled              = true,
-  Boolean $manage_service       = true,
-  $api_service_name             = $placement::params::service_name,
-  $package_ensure               = 'present',
-  Boolean $sync_db              = false,
-  $enable_proxy_headers_parsing = $facts['os_service_default'],
+  Boolean $enabled                        = true,
+  Boolean $manage_service                 = true,
+  $api_service_name                       = $placement::params::service_name,
+  Stdlib::Ensure::Package $package_ensure = 'present',
+  Boolean $sync_db                        = false,
+  $enable_proxy_headers_parsing           = $facts['os_service_default'],
 ) inherits placement::params {
   include placement::deps
   include placement::policy

manifests/client.pp

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

manifests/generic_service.pp

@@ -33,9 +33,9 @@
 define placement::generic_service (
   $package_name,
   $service_name,
-  Boolean $enabled        = true,
-  Boolean $manage_service = true,
-  $ensure_package         = 'present'
+  Boolean $enabled                        = true,
+  Boolean $manage_service                 = true,
+  Stdlib::Ensure::Package $ensure_package = 'present'
 ) {
   include placement::deps
   include placement::params

manifests/init.pp

@@ -32,7 +32,7 @@
 #   Defaults to $facts['os_service_default']
 #
 class placement (
-  $ensure_package                            = 'present',
+  Stdlib::Ensure::Package $ensure_package    = 'present',
   Boolean $sync_db                           = true,
   $state_path                                = $facts['os_service_default'],
   $randomize_allocation_candidates           = $facts['os_service_default'],

metadata.json

@@ -7,7 +7,7 @@
         },
         {
             "name": "puppetlabs/stdlib",
-            "version_requirement": ">=5.0.0 <10.0.0"
+            "version_requirement": ">=9.0.0 <10.0.0"
         },
         {
             "name": "openstack/keystone",

spec/classes/placement_api_spec.rb

@@ -25,11 +25,11 @@ describe 'placement::api' do
 
     context 'with package_ensure parameter provided' do
       let :params do
-        { :package_ensure => false }
+        { :package_ensure => 'latest' }
       end
 
       it { should contain_placement__generic_service('api').with(
-        :ensure_package => false,
+        :ensure_package => 'latest',
       ) }
     end