From 9ecb7c005915de2dcc10fd21b722d4f740e1ccf3 Mon Sep 17 00:00:00 2001
From: Chip Baeseman <cbaeseman@gmail.com>
Date: Wed, 18 Sep 2013 01:10:59 -0500
Subject: [PATCH] Sync storage rings from rsync server

Change-Id: I154b59ee2b208e711099f056f52433c472f23709
Related-Bug: 1224592
---
 manifests/swift/proxy.pp        | 5 -----
 manifests/swift/storage-node.pp | 8 +++++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/manifests/swift/proxy.pp b/manifests/swift/proxy.pp
index 34cf188..4edcb09 100644
--- a/manifests/swift/proxy.pp
+++ b/manifests/swift/proxy.pp
@@ -107,11 +107,6 @@ class openstack::swift::proxy (
     local_net_ip => $swift_local_net_ip,
   }
 
-  # exports rsync gets that can be used to sync the ring files
-  @@swift::ringsync { ['account', 'object', 'container']:
-    ring_server => $swift_local_net_ip
-  }
-
   # deploy a script that can be used for testing
   class {'swift::test_file':
     auth_server  => $real_keystone_host,
diff --git a/manifests/swift/storage-node.pp b/manifests/swift/storage-node.pp
index 6d2b602..1fcdcbb 100644
--- a/manifests/swift/storage-node.pp
+++ b/manifests/swift/storage-node.pp
@@ -1,5 +1,6 @@
 class openstack::swift::storage-node (
   $swift_zone,
+  $ring_server,
   $swift_hash_suffix    = 'swift_secret',
   $swift_local_net_ip   = $::ipaddress_eth0,
   $storage_type         = 'loopback',
@@ -47,7 +48,8 @@ class openstack::swift::storage-node (
     weight             => $storage_weight,
   }
 
-  # collect resources for synchronizing the ring databases
-  Swift::Ringsync<<||>>
-
+  # rsync rings from the ring server
+  swift::ringsync { ['account','container','object']:
+    ring_server => $ring_server,
+  }
 }