diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-17 18:50:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-17 18:50:56 +0000 |
| commit | cf5b71fd1d5784d946924057a6dfeb632d3b9eef (patch) | |
| tree | 5c9fce85ed732ecc3030fa0bc84a77f20db50095 /manifests/profile | |
| parent | 9b14c9aae6d7ce098e1ab9e0093b22060ccb899f (diff) | |
| parent | be79cb1eca81b39760e00948d216858c013e8819 (diff) | |
Merge "Swift add_devices.pp IPv6 handling"
Diffstat (limited to 'manifests/profile')
| -rw-r--r-- | manifests/profile/base/swift/add_devices.pp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/profile/base/swift/add_devices.pp b/manifests/profile/base/swift/add_devices.pp index bd4c91c..909ddd6 100644 --- a/manifests/profile/base/swift/add_devices.pp +++ b/manifests/profile/base/swift/add_devices.pp @@ -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', |