diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp
index 614e7a44..85359cb1 100644
--- a/manifests/storage/generic.pp
+++ b/manifests/storage/generic.pp
@@ -19,7 +19,7 @@
 # Copyright 2011 Puppetlabs Inc, unless otherwise noted.
 define swift::storage::generic(
   $package_ensure   = 'present',
-  $service_provider = 'upstart'
+  $service_provider = $::swift::params::service_provider
 ) {
 
   include swift::params