Merge "Validate status of cron resource"

manifests/cron/purge_deleted.pp

@@ -51,24 +51,20 @@
 #    Defaults to undef.
 #
 class heat::cron::purge_deleted (
-  $ensure      = present,
-  $minute      = 1,
-  $hour        = 0,
-  $monthday    = '*',
-  $month       = '*',
-  $weekday     = '*',
-  $maxdelay    = 0,
-  $user        = $::heat::params::user,
-  $age         = 1,
-  $age_type    = 'days',
-  $destination = '/var/log/heat/heat-purge_deleted.log',
-  $batch_size  = undef,
+  Enum['present', 'absent'] $ensure                     = present,
+  $minute                                               = 1,
+  $hour                                                 = 0,
+  $monthday                                             = '*',
+  $month                                                = '*',
+  $weekday                                              = '*',
+  $maxdelay                                             = 0,
+  $user                                                 = $::heat::params::user,
+  $age                                                  = 1,
+  Enum['days', 'hours', 'minutes', 'seconds'] $age_type = 'days',
+  $destination                                          = '/var/log/heat/heat-purge_deleted.log',
+  $batch_size                                           = undef,
 ) inherits heat::params {
 
-  if ! member(['days', 'hours', 'minutes', 'seconds'], $age_type) {
-    fail('age_type possible values are only days, hours, minutes, or seconds.')
-  }
-
   if $maxdelay == 0 {
     $sleep = ''
   } else {

spec/classes/heat_cron_purge_deleted_spec.rb

@@ -109,16 +109,6 @@ describe 'heat::cron::purge_deleted' do
         )
       end
     end
-
-    describe 'when setting a wrong age_type' do
-      before :each do
-        params.merge!(
-          :age_type => 'foobar'
-        )
-      end
-
-      it_raises 'a Puppet::Error', /age_type possible values are only days, hours, minutes, or seconds./
-    end
   end
 
   on_supported_os({