Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Pass cinder_iscsi_address without brackets"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
cinder-volume.yaml
diff --git
a/puppet/services/cinder-volume.yaml
b/puppet/services/cinder-volume.yaml
index
de7e6ba
..
5451afd
100644
(file)
--- 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
# 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
step_config: |
include ::tripleo::profile::base::cinder::volume