From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 31 Aug 2016 22:02:52 +0000 (+0200)
Subject: Ensure iscsi_ip_address is in brackets if IPv6
X-Git-Tag: opnfv-6.0.0~608
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=96f22c629de5343a63442d7c3c811d3e31aca00b;p=apex-puppet-tripleo.git

Ensure iscsi_ip_address is in brackets if IPv6

Change-Id: I787becce343b38e6c27c9a1b937b47c0aefb034d
Related-Bug: 1618930
---

diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp
index d1d22bb..8baaf1c 100644
--- a/manifests/profile/base/cinder/volume/iscsi.pp
+++ b/manifests/profile/base/cinder/volume/iscsi.pp
@@ -52,8 +52,11 @@ class tripleo::profile::base::cinder::volume::iscsi (
       size => join([$cinder_lvm_loop_device_size, 'M']),
     }
 
+    # NOTE(gfidente): never emit in hieradata:
+    # key: [ipv6]
+    # as it will cause hiera parsing errors
     cinder::backend::iscsi { $backend_name :
-      iscsi_ip_address => $cinder_iscsi_address,
+      iscsi_ip_address => normalize_ip_for_uri($cinder_iscsi_address),
       iscsi_helper     => $cinder_iscsi_helper,
     }
   }