fix chown on /srv/node

deployment/puppet/swift/manifests/init.pp

@@ -39,15 +39,6 @@ class swift(
       ensure => $package_ensure,
       name   => $::swift::params::package_name,
     }
-
-    file {'/srv/node':
-      ensure       => 'directory',
-      owner        => 'swift',
-      group        => 'swift',
-      recurse      => true,
-      recurselimit => 1,
-      require      => Package['swift'],
-    }
   }
 
   File { owner => 'swift', group => 'swift', require => Package['swift'] }

deployment/puppet/swift/manifests/storage/all.pp

@@ -31,6 +31,16 @@ class swift::storage::all(
     storage_local_net_ip => $storage_local_net_ip,
   }
 
+  if(!defined(File['/srv/node'])) {
+    file {'/srv/node':
+      ensure       => 'directory',
+      owner        => 'swift',
+      group        => 'swift',
+      recurse      => true,
+      recurselimit => 1,
+    }
+  }
+
   Swift::Storage::Server {
     swift_zone           => $swift_zone,
     devices              => $devices,