Allow running of proxy and storage on the same node.

cbaeseman · Mark T. Voelker · commit 06adf0246a9e · 2013-12-19T22:50:34.000-05:00
This adds a if defined check to avoid class conflicts when running swift proxy and storage on the same node. Change-Id: I60fb78e5d40605ab47f349d154737ef9bab641f4 (cherry picked from commit 4b9e74a)
diff --git a/manifests/swift/storage-node.pp b/manifests/swift/storage-node.pp
@@ -12,9 +12,11 @@
   $byte_size            = '1024',
 ) {
 
-  class { 'swift':
-    swift_hash_suffix => $swift_hash_suffix,
-    package_ensure    => $package_ensure,
+  if !defined(swift){
+    class { 'swift':
+      swift_hash_suffix => $swift_hash_suffix,
+      package_ensure    => $package_ensure,
+    }
   }
 
   case $storage_type {
