Merge "Ensure swift.conf created in all scenarios"

Author: Jenkins

manifests/swift/proxy.pp

@@ -32,10 +32,12 @@
   } else {
     $real_keystone_host = $keystone_host
   }
-  class { 'swift':
-    swift_hash_suffix => $swift_hash_suffix,
-    package_ensure    => $package_ensure,
-  }
+
+  ensure_resource('class', 'swift',
+    { swift_hash_suffix => $swift_hash_suffix,
+      package_ensure    => $package_ensure,
+    }
+  )
 
   if $memcached {
     class { 'memcached':

manifests/swift/storage-node.pp

@@ -12,12 +12,11 @@
   $byte_size            = '1024',
 ) {
 
-  if !defined(swift){
-    class { 'swift':
-      swift_hash_suffix => $swift_hash_suffix,
+  ensure_resource('class', 'swift',
+    { swift_hash_suffix => $swift_hash_suffix,
       package_ensure    => $package_ensure,
     }
-  }
+  )
 
   case $storage_type {
     'loopback': {