diff options
Diffstat (limited to 'manifests/profile/base/cinder/volume/iscsi.pp')
| -rw-r--r-- | manifests/profile/base/cinder/volume/iscsi.pp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp index d857caa..8baaf1c 100644 --- a/manifests/profile/base/cinder/volume/iscsi.pp +++ b/manifests/profile/base/cinder/volume/iscsi.pp @@ -21,6 +21,10 @@ # [*cinder_iscsi_address*] # The address where to bind the iscsi targets daemon # +# [*backend_name*] +# (Optional) Name given to the Cinder backend stanza +# Defaults to 'tripleo_iscsi' +# # [*cinder_iscsi_helper*] # (Optional) The iscsi helper to use # Defaults to 'tgtadm' @@ -29,10 +33,6 @@ # (Optional) The size (in MB) of the LVM loopback volume # Defaults to '10280' # -# [*backend_name*] -# (Optional) Name given to the Cinder backend stanza -# Defaults to 'tripleo_iscsi' -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -40,12 +40,11 @@ # class tripleo::profile::base::cinder::volume::iscsi ( $cinder_iscsi_address, - $cinder_iscsi_helper = 'tgtadm', - $cinder_lvm_loop_device_size = '10280', - $backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'), - $step = hiera('step'), + $backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'), + $cinder_iscsi_helper = 'tgtadm', + $cinder_lvm_loop_device_size = '10280', + $step = hiera('step'), ) { - include ::tripleo::profile::base::cinder::volume if $step >= 4 { @@ -53,8 +52,11 @@ class tripleo::profile::base::cinder::volume::iscsi ( size => join([$cinder_lvm_loop_device_size, 'M']), } + # NOTE(gfidente): never emit in hieradata: + # key: [ipv6] + # as it will cause hiera parsing errors cinder::backend::iscsi { $backend_name : - iscsi_ip_address => $cinder_iscsi_address, + iscsi_ip_address => normalize_ip_for_uri($cinder_iscsi_address), iscsi_helper => $cinder_iscsi_helper, } } |