summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-01 16:06:08 +0000
committerGerrit Code Review <review@openstack.org>2016-09-01 16:06:08 +0000
commit685c1e7de0c5a37d6f11eeb9bceaa74b0a2e923a (patch)
treec8a1e5814eb75368725483d78e03c1e34f1431a3 /puppet
parent6c73acbde9a31f9bcabf6913ae1d76f9661a3f74 (diff)
parent37401cf3c51eb0467527ee9297978797d5e4d64d (diff)
Merge "Pass cinder_iscsi_address without brackets"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/cinder-volume.yaml6
1 files changed, 1 insertions, 5 deletions
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index de7e6bab..5451afde 100644
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -95,10 +95,6 @@ outputs:
# internal_api -> IP
# internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR
- tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address:
- str_replace:
- template: "NETWORK_uri"
- params:
- NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
+ tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
step_config: |
include ::tripleo::profile::base::cinder::volume