From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 23 Mar 2016 13:56:29 +0000 (+0100)
Subject: Pass iSCSI bind address in brackets to Cinder when IPv6
X-Git-Tag: opnfv-6.0.0~2075^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e6aa510e9d0f84f555dc49e110cc558337567df8;p=apex-tripleo-heat-templates.git

Pass iSCSI bind address in brackets to Cinder when IPv6

Configure the Cinder iscsi_ip_address key using brackets when
the IP address is of v6 class.

Closes-Bug: 1560934
Change-Id: I783e939ae304385674909bfd9f1cac95e04cef22
---

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 906e35cf..1032ab61 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1235,7 +1235,7 @@ resources:
               - '/sahara'
         swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
         swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
-        cinder_iscsi_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
+        cinder_iscsi_network: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
         cinder_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
         glance_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
         glance_registry_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}