Merge "Fix puppet-lint warnings about ensure"

manifests/init.pp

@@ -31,14 +31,14 @@ class swift(
 
   if !defined(Package['swift']) {
     package { 'swift':
-      name   => $::swift::params::package_name,
       ensure => $package_ensure,
+      name   => $::swift::params::package_name,
     }
   }
 
   package { 'swiftclient':
-    name   => $::swift::params::client_package,
     ensure => $package_ensure,
+    name   => $::swift::params::client_package,
   }
 
   File { owner => 'swift', group => 'swift', require => Package['swift'] }

manifests/proxy.pp

@@ -81,8 +81,8 @@ class swift::proxy(
   }
 
   package { 'swift-proxy':
-    name   => $::swift::params::proxy_package_name,
     ensure => $package_ensure,
+    name   => $::swift::params::proxy_package_name,
   }
 
   concat { '/etc/swift/proxy-server.conf':
@@ -113,8 +113,8 @@ class swift::proxy(
   }
 
   service { 'swift-proxy':
-    name      => $::swift::params::proxy_service_name,
     ensure    => running,
+    name      => $::swift::params::proxy_service_name,
     enable    => true,
     provider  => $::swift::params::service_provider,
     hasstatus => true,

manifests/proxy/swift3.pp

@@ -21,8 +21,8 @@ class swift::proxy::swift3(
   include swift::params
 
   package { 'swift-plugin-s3':
-    name   => $::swift::params::swift3,
     ensure => $ensure,
+    name   => $::swift::params::swift3,
   }
 
   concat::fragment { 'swift_swift3':

manifests/storage/account.pp

@@ -6,16 +6,16 @@ class swift::storage::account(
   }
 
   service { 'swift-account-reaper':
-    name      => $::swift::params::account_reaper_service_name,
     ensure    => running,
+    name      => $::swift::params::account_reaper_service_name,
     enable    => true,
     provider  => $::swift::params::service_provider,
     require   => Package['swift-account'],
   }
 
   service { 'swift-account-auditor':
-    name      => $::swift::params::account_auditor_service_name,
     ensure    => running,
+    name      => $::swift::params::account_auditor_service_name,
     enable    => true,
     provider  => $::swift::params::service_provider,
     require   => Package['swift-account'],

manifests/storage/container.pp

@@ -13,15 +13,15 @@ class swift::storage::container(
   }
 
   service { 'swift-container-updater':
-    name      => $::swift::params::container_updater_service_name,
     ensure    => running,
+    name      => $::swift::params::container_updater_service_name,
     enable    => true,
     provider  => $::swift::params::service_provider,
     require   => Package['swift-container'],
   }
   service { 'swift-container-auditor':
-    name      => $::swift::params::container_auditor_service_name,
     ensure    => running,
+    name      => $::swift::params::container_auditor_service_name,
     enable    => true,
     provider  => $::swift::params::service_provider,
     require   => Package['swift-container'],

manifests/storage/disk.pp

@@ -40,9 +40,9 @@ define swift::storage::disk(
 
   if(!defined(File[$mnt_base_dir])) {
     file { $mnt_base_dir:
+      ensure => directory,
       owner  => 'swift',
       group  => 'swift',
-      ensure => directory,
     }
   }
 

manifests/storage/generic.pp

@@ -29,10 +29,10 @@ define swift::storage::generic(
   validate_re($name, '^object|container|account$')
 
   package { "swift-${name}":
+    ensure => $package_ensure,
     # this is a way to dynamically build the variables to lookup
     # sorry its so ugly :(
     name   => inline_template("<%= scope.lookupvar('::swift::params::${name}_package_name') %>"),
-    ensure => $package_ensure,
     before => Service["swift-${name}", "swift-${name}-replicator"],
   }
 
@@ -43,8 +43,8 @@ define swift::storage::generic(
   }
 
   service { "swift-${name}":
-    name      => inline_template("<%= scope.lookupvar('::swift::params::${name}_service_name') %>"),
     ensure    => running,
+    name      => inline_template("<%= scope.lookupvar('::swift::params::${name}_service_name') %>"),
     enable    => true,
     hasstatus => true,
     provider  => $service_provider,
@@ -52,8 +52,8 @@ define swift::storage::generic(
   }
 
   service { "swift-${name}-replicator":
-    name      => inline_template("<%= scope.lookupvar('::swift::params::${name}_replicator_service_name') %>"),
     ensure    => running,
+    name      => inline_template("<%= scope.lookupvar('::swift::params::${name}_replicator_service_name') %>"),
     enable    => true,
     hasstatus => true,
     provider  => $service_provider,

manifests/storage/loopback.pp

@@ -22,9 +22,9 @@ define swift::storage::loopback(
 
   if(!defined(File[$mnt_base_dir])) {
     file { $mnt_base_dir:
+      ensure => directory,
       owner  => 'swift',
       group  => 'swift',
-      ensure => directory,
     }
   }
 

manifests/storage/object.pp

@@ -6,15 +6,15 @@ class swift::storage::object(
   }
 
   service { 'swift-object-updater':
-    name      => $::swift::params::object_updater_service_name,
     ensure    => running,
+    name      => $::swift::params::object_updater_service_name,
     enable    => true,
     provider  => $::swift::params::service_provider,
     require   => Package['swift-object'],
   }
   service { 'swift-object-auditor':
-    name      => $::swift::params::object_auditor_service_name,
     ensure    => running,
+    name      => $::swift::params::object_auditor_service_name,
     enable    => true,
     provider  => $::swift::params::service_provider,
     require   => Package['swift-object'],

manifests/storage/xfs.pp

@@ -32,9 +32,9 @@ define swift::storage::xfs(
 
   if(!defined(File[$mnt_base_dir])) {
     file { $mnt_base_dir:
+      ensure => directory,
       owner  => 'swift',
       group  => 'swift',
-      ensure => directory,
     }
   }