stackforge/puppet-openstack
Code Issues Proposed changes

Storage node now uses local zone variable name.

Browse Source 
Puppet 3 scoping changes mean that the exported resources cannot see
the parent scope $swift_zone variable, and must instead use the $zone
variable passed to the device_endpoint defined type.

Change-Id: I9780065c535da713c6d1d4a156f5d688e0ab9c63
Fixes: bug #1190459
This commit is contained in:
Simon Sellar
2013-06-14 14:52:39 +09:30
parent 35d5e36efa
commit 296679e6ab
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,15 +33,15 @@ class openstack::swift::storage-node (
define device_endpoint ($swift_local_net_ip, $zone, $weight) { define device_endpoint ($swift_local_net_ip, $zone, $weight) {
@@ring_object_device { "${swift_local_net_ip}:6000/${name}": @@ring_object_device { "${swift_local_net_ip}:6000/${name}":
zone => $swift_zone, zone => $zone,
weight => $weight, weight => $weight,
} }
@@ring_container_device { "${swift_local_net_ip}:6001/${name}": @@ring_container_device { "${swift_local_net_ip}:6001/${name}":
zone => $swift_zone, zone => $zone,
weight => $weight, weight => $weight,
} }
@@ring_account_device { "${swift_local_net_ip}:6002/${name}": @@ring_account_device { "${swift_local_net_ip}:6002/${name}":
zone => $swift_zone, zone => $zone,
weight => $weight, weight => $weight,
} }
} }