aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/cinder-storage.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-29 15:36:47 +0000
committerGerrit Code Review <review@openstack.org>2016-03-29 15:36:47 +0000
commit8191dd49bf71c66db64176d1abd88209a4184d5a (patch)
tree2f2b47567fa0338f13f37ead50e85e919b1f4f4c /puppet/cinder-storage.yaml
parentdfa0b12265c573314092eb8479caca76322a9f06 (diff)
parent992f85b94842abf038c20c21550a3138bea47d85 (diff)
Merge "Add quotes around the cinder_iscsi_ip_address value"
Diffstat (limited to 'puppet/cinder-storage.yaml')
-rw-r--r--puppet/cinder-storage.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 878b31c2..b5694802 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -285,7 +285,11 @@ resources:
size: {get_param: CinderLVMLoopDeviceSize}
cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend}
cinder_iscsi_helper: {get_param: CinderISCSIHelper}
- cinder_iscsi_ip_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
+ cinder_iscsi_ip_address:
+ str_replace:
+ template: "'IP'"
+ params:
+ IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
rabbit_username: {get_param: RabbitUserName}
rabbit_password: {get_param: RabbitPassword}