From: Gabriele Cerami <gcerami@redhat.com>
Date: Wed, 14 Sep 2016 09:36:20 +0000 (+0200)
Subject: Swift add_devices.pp IPv6 handling
X-Git-Tag: opnfv-6.0.0~576^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=be79cb1eca81b39760e00948d216858c013e8819;p=apex-puppet-tripleo.git

Swift add_devices.pp IPv6 handling

Add brackets to IPv6 addresses before forming $object from $base

Change-Id: I4568d538561a0102b69f331a122d4989333a3bfa
Closes-Bug: #1623096
---

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',