aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-09-01 00:02:52 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-09-01 00:23:16 +0200
commit96f22c629de5343a63442d7c3c811d3e31aca00b (patch)
tree28a3be6d670d3dd640f7cee022393dd141380e48 /manifests
parentffa77971d7f3a161b79d4bc05d7c010ddacda088 (diff)
Ensure iscsi_ip_address is in brackets if IPv6
Change-Id: I787becce343b38e6c27c9a1b937b47c0aefb034d Related-Bug: 1618930
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/cinder/volume/iscsi.pp5
1 files changed, 4 insertions, 1 deletions
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,
}
}