summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-08-31 20:39:19 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-08-31 23:30:21 +0000
commit37401cf3c51eb0467527ee9297978797d5e4d64d (patch)
treee7010f2b7820769b08630715933844da6d471126 /puppet
parente774cb35d5a0658de7595839b0c54c4181181798 (diff)
Pass cinder_iscsi_address without brackets
We shoult never emit in hieradata: key: [ipv6] as it will cause hiera parsing errors. This can only be addressed in the puppet module. Change-Id: I0b13b6691647769e41d9af8be4112e6341827e6c Depends-On: I787becce343b38e6c27c9a1b937b47c0aefb034d Closes-Bug: 1618930
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