diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp
index 0a1c7ea1..1ee3e65b 100644
--- a/manifests/storage/generic.pp
+++ b/manifests/storage/generic.pp
@@ -52,13 +52,3 @@ define swift::storage::generic(
   }
 
 }
-# TODO this should be removed when the upstart packages are fixed.
-define swift::storage::generic::upstart() {
-  file { "/etc/init/swift-${name}.conf":
-    mode   => '0644',
-    owner  => 'root',
-    group  => 'root',
-    source => "puppet:///modules/swift/swift-${name}.conf.upstart",
-    before => Service["swift-${name}"],
-  }
-}
diff --git a/manifests/storage/generic/upstart.pp b/manifests/storage/generic/upstart.pp
new file mode 100644
index 00000000..3d21568a
--- /dev/null
+++ b/manifests/storage/generic/upstart.pp
@@ -0,0 +1,10 @@
+# TODO this should be removed when the upstart packages are fixed.
+define swift::storage::generic::upstart() {
+  file { "/etc/init/swift-${name}.conf":
+    mode   => '0644',
+    owner  => 'root',
+    group  => 'root',
+    source => "puppet:///modules/swift/swift-${name}.conf.upstart",
+    before => Service["swift-${name}"],
+  }
+}