Merge pull request #16 from fcharlier/swift_on_debian

Some modifications to install swift correctly on Debian

examples/all.pp

@@ -30,7 +30,7 @@ class { 'swift::storage':
 }
 
 # create xfs partitions on a loopback device and mounts them
-swift::storage::loopback { ['1', '2', '3']:
+swift::storage::loopback { ['4', '2', '3']:
   require => Class['swift'],
 }
 
@@ -44,9 +44,9 @@ Swift::Storage::Node {
   storage_local_net_ip => $swift_local_net_ip,
 }
 
-swift::storage::node { '1':
+swift::storage::node { '4':
-  zone    => 1,
+  zone    => 4,
-  require => Swift::Storage::Loopback[1],
+  require => Swift::Storage::Loopback[4],
 }
 
 swift::storage::node { '2':

manifests/params.pp

@@ -10,7 +10,11 @@ class swift::params {
       $container_service_name = 'swift-container'
       $account_package_name   = 'swift-account'
       $account_service_name   = 'swift-account'
-      $service_provider       = 'upstart'
+      if $::operatingsystem == 'Debian' {
+        $service_proivider    = 'debian'
+      } else {
+        $service_provider     = 'upstart'
+      }
     }
     'RedHat': {
       $package_name           = 'openstack-swift'

manifests/storage/generic.pp

@@ -33,6 +33,7 @@ define swift::storage::generic(
     # sorry its so ugly :(
     name   => inline_template("<%= scope.lookupvar('::swift::params::${name}_package_name') %>"),
     ensure => $package_ensure,
+    before => Service["swift-${name}"],
   }
 
   file { "/etc/swift/${name}-server/":

manifests/storage/server.pp

@@ -35,6 +35,7 @@ define swift::storage::server(
     content => template("swift/${type}-server.conf.erb"),
     owner   => $owner,
     group   => $group,
+    notify  => Service["swift-${type}"],
   }
 
 }