diff --git a/manifests/params.pp b/manifests/params.pp
index d4719bfd..d05101b7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -32,8 +32,8 @@ class barbican::params {
       $worker_service_name            = 'barbican-worker'
       $keystone_listener_package_name = 'barbican-keystone-listener'
       $keystone_listener_service_name = 'barbican-keystone-listener'
-      $retry_package_name             = false
-      $retry_service_name             = false
+      $retry_package_name             = undef
+      $retry_service_name             = undef
       $barbican_wsgi_script_path      = '/usr/lib/cgi-bin/barbican'
       $barbican_wsgi_script_source    = '/usr/bin/barbican-wsgi-api'
     }
diff --git a/manifests/retry_scheduler.pp b/manifests/retry_scheduler.pp
index 9c8a80e2..6c942476 100644
--- a/manifests/retry_scheduler.pp
+++ b/manifests/retry_scheduler.pp
@@ -40,33 +40,32 @@ class barbican::retry_scheduler (
     'retry_scheduler/periodic_interval_max_seconds': value => $periodic_interval_max_seconds;
   }
 
-  case $facts['os']['family'] {
-    'RedHat': {
-      package { 'barbican-retry':
-        ensure => $package_ensure,
-        name   => $::barbican::params::retry_package_name,
-        tag    => ['openstack', 'barbican-package'],
-      }
-
-      if $manage_service {
-        if $enabled {
-          $service_ensure = 'running'
-        } else {
-          $service_ensure = 'stopped'
-        }
-
-        service { 'barbican-retry':
-          ensure     => $service_ensure,
-          name       => $::barbican::params::retry_service_name,
-          enable     => $enabled,
-          hasstatus  => true,
-          hasrestart => true,
-          tag        => 'barbican-service',
-        }
-      }
-    }
-    default: {
-      warning('barbican-retry package/service is not available')
+  if $::barbican::params::retry_package_name {
+    package { 'barbican-retry':
+      ensure => $package_ensure,
+      name   => $::barbican::params::retry_package_name,
+      tag    => ['openstack', 'barbican-package'],
     }
   }
+
+  if $::barbican::params::retry_service_name {
+    if $manage_service {
+      if $enabled {
+        $service_ensure = 'running'
+      } else {
+        $service_ensure = 'stopped'
+      }
+
+      service { 'barbican-retry':
+        ensure     => $service_ensure,
+        name       => $::barbican::params::retry_service_name,
+        enable     => $enabled,
+        hasstatus  => true,
+        hasrestart => true,
+        tag        => 'barbican-service',
+      }
+    }
+  } else {
+    warning('barbican-retry service is not available')
+  }
 }