aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-24 12:25:54 +0000
committerGerrit Code Review <review@openstack.org>2016-03-24 12:25:54 +0000
commit50fb54c02bb5b4c4f8cfc460e789d901069d800a (patch)
treeefb6bd4c2997eab90a023004b78a8a0ebb21ac00 /puppet
parent747a9302eaa152a07e6fd8a28d83bf8ef1d310df (diff)
parente6aa510e9d0f84f555dc49e110cc558337567df8 (diff)
Merge "Pass iSCSI bind address in brackets to Cinder when IPv6"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 9b960ac7..9caeedc7 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1240,7 +1240,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]}]}