From 94fb333ab9203ea9b89d9873cb15f2afcd728a98 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sat, 17 Mar 2012 01:42:15 -0700
Subject: [PATCH] Move generic::upstart to its own file
I am not so sure that having multiple resource
types in the same file is supported as of 2.7.11
I am refactoring this code so that the upstart define
resides in its own file according to our standards.
---
manifests/storage/generic.pp | 10 ----------
manifests/storage/generic/upstart.pp | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
create mode 100644 manifests/storage/generic/upstart.pp
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}"],
+ }
+}