diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-20 03:37:36 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-20 03:37:36 +0000 |
commit | ac55c423ad970ec21daad7a97eeacca8bfba6b6c (patch) | |
tree | 2010076c2740f8948d7f767ba46eb57b9dd17d1b /puppet/services | |
parent | 6551bec38fccc1b1882ce2e4ce80ef5e6790b726 (diff) | |
parent | ff20b533981e893b68bab0211e81265e098dee0c (diff) |
Merge "Added support for pass-through iSER configuration"
Diffstat (limited to 'puppet/services')
-rw-r--r-- | puppet/services/cinder-volume.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml index e25d9944..8834eaa5 100644 --- a/puppet/services/cinder-volume.yaml +++ b/puppet/services/cinder-volume.yaml @@ -20,6 +20,10 @@ parameters: default: lioadm description: The iSCSI helper to use with cinder. type: string + CinderISCSIProtocol: + default: iscsi + description: Whether to use TCP ('iscsi') or iSER RDMA ('iser') for iSCSI + type: string CinderLVMLoopDeviceSize: default: 10280 description: The size of the loopback file used by the cinder LVM driver. @@ -97,6 +101,7 @@ outputs: SERVERS: {get_param: CinderNfsServers} tripleo::profile::base::cinder::volume::iscsi::cinder_lvm_loop_device_size: {get_param: CinderLVMLoopDeviceSize} tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_helper: {get_param: CinderISCSIHelper} + tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_protocol: {get_param: CinderISCSIProtocol} tripleo::profile::base::cinder::volume::rbd::cinder_rbd_pool_name: {get_param: CinderRbdPoolName} tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name: {get_param: CephClientUserName} tripleo.cinder_volume.firewall_rules: |