From c759ab69fe0c043ffd48bf6c8e8ede6fbacbf354 Mon Sep 17 00:00:00 2001
From: Branan Purvine-Riley <branan@puppetlabs.com>
Date: Thu, 14 Jun 2012 11:32:22 -0700
Subject: [PATCH] Fix ring_*_device usage in swift::storage::node

---
 manifests/storage/node.pp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/manifests/storage/node.pp b/manifests/storage/node.pp
index 90df96e2..0a5d57b7 100644
--- a/manifests/storage/node.pp
+++ b/manifests/storage/node.pp
@@ -26,27 +26,24 @@ define swift::storage::node(
   swift::storage::server { "60${name}0":
     type => 'object',
   }
-  ring_object_device { "${storage_local_net_ip}:60${name}0":
+  ring_object_device { "${storage_local_net_ip}:60${name}0/$name":
     zone        => $zone,
-    device_name => $name,
     weight      => $weight,
   }
 
   swift::storage::server { "60${name}1":
     type => 'container',
   }
-  ring_container_device { "${storage_local_net_ip}:60${name}1":
+  ring_container_device { "${storage_local_net_ip}:60${name}1/$name":
     zone        => $zone,
-    device_name => $name,
     weight      => $weight,
   }
 
   swift::storage::server { "60${name}2":
     type => 'account',
   }
-  ring_account_device { "${storage_local_net_ip}:60${name}2":
+  ring_account_device { "${storage_local_net_ip}:60${name}2/$name":
     zone        => $zone,
-    device_name => $name,
     weight      => $weight,
   }