openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Swift add_devices.pp IPv6 handling"

Browse Source
This commit is contained in:
Jenkins 2016-09-17 18:50:56 +00:00 committed by Gerrit Code Review
commit cf5b71fd1d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/profile/base/swift/add_devices.pp
View File

@ -39,7 +39,10 @@ define tripleo::profile::base::swift::add_devices(
$zone = (($server_num%$swift_zones) + 1)
# add the rings
$base = regsubst($name,'^r1.*-(.*)$','\1')
$base_notnormal = regsubst($name,'^r1.*-(.*)$','\1')
$ip_notnormal = regsubst($base_notnormal, ':%PORT%.*', '')
$ip = normalize_ip_for_uri($ip_notnormal)
$base = regsubst($base_notnormal, $ip_notnormal, $ip)
$object = regsubst($base, '%PORT%', '6000')
ring_object_device { $object:
zone => '1',