Merge pull request #11 from bodepd/master

Make upstart patches Ubuntu only

manifests/proxy.pp

@@ -95,13 +95,13 @@ class swift::proxy(
     require => Package['swift-proxy'],
   }
 
-  # TODO - this needs to be updated once the init file is not broken
-
-  file { '/etc/init/swift-proxy.conf':
-    mode    => '0644',
-    owner   => 'root',
-    group   => 'root',
-    content => '
+  if($::operatingsystem == 'Ubuntu') {
+    # TODO - this needs to be updated once the init file is not broken
+    file { '/etc/init/swift-proxy.conf':
+      mode    => '0644',
+      owner   => 'root',
+      group   => 'root',
+      content => '
 # swift-proxy - SWIFT Proxy Server
 # This is temporarily managed by Puppet
 # until 917893 is fixed
@@ -122,7 +122,8 @@ pre-start script
 end script
 
 post-stop exec /usr/bin/swift-init proxy-server stop',
-    before => Service['swift-proxy'],
+      before => Service['swift-proxy'],
+    }
   }
 
   service { 'swift-proxy':

manifests/storage/generic.pp

@@ -44,7 +44,13 @@ define swift::storage::generic(
     subscribe => Service['rsync'],
   }
 
-  swift::storage::generic::upstart { $name: }
+  # TODO - this should be fixed in the upstream
+  # packages so that this code can be removed.
+  # 931893
+  if($::operatingsystem == 'Ubuntu') {
+    # I have to fix broken init scripts on Ubuntu
+    swift::storage::generic::upstart { $name: }
+  }
 
 }
 # TODO this should be removed when the upstart packages are fixed.