stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Sync storage rings from rsync server"

Browse Source
This commit is contained in:
Jenkins
2013-10-08 02:41:51 +00:00
committed by Gerrit Code Review
parent 9dd6737863 9ecb7c0059
commit 8f4429971e
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/swift/proxy.pp
View File

@@ -107,11 +107,6 @@ class openstack::swift::proxy (
local_net_ip => $swift_local_net_ip, 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 # deploy a script that can be used for testing
class {'swift::test_file': class {'swift::test_file':
auth_server => $real_keystone_host, auth_server => $real_keystone_host,

8
manifests/swift/storage-node.pp
View File

@@ -1,5 +1,6 @@
class openstack::swift::storage-node ( class openstack::swift::storage-node (
$swift_zone, $swift_zone,
$ring_server,
$swift_hash_suffix = 'swift_secret', $swift_hash_suffix = 'swift_secret',
$swift_local_net_ip = $::ipaddress_eth0, $swift_local_net_ip = $::ipaddress_eth0,
$storage_type = 'loopback', $storage_type = 'loopback',
@@ -47,7 +48,8 @@ class openstack::swift::storage-node (
weight => $storage_weight, weight => $storage_weight,
} }
# collect resources for synchronizing the ring databases # rsync rings from the ring server
Swift::Ringsync<<||>> swift::ringsync { ['account','container','object']:
ring_server => $ring_server,
}
} }