openstack
/
puppet-cinder
Code Issues Proposed changes

Merge "nvme: Remove redundant defaults"

This commit is contained in:
Zuul 2023-03-19 18:34:52 +00:00 committed by Gerrit Code Review
parent da3dddf603 2f3d9f0e10
commit 10c40aadc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/backend/nvmeof.pp
View File

@ -22,11 +22,11 @@
#
# [*nvmet_port_id*]
# (Optional) Port id of the NVMe target.
# Defaults to '1'.
# Defaults to $facts['os_service_default'].
#
# [*nvmet_ns_id*]
# (Optional) The namespace id associated with the subsystem.
# Defaults to '10'.
# Defaults to $facts['os_service_default'].
#
# [*volume_backend_name*]
# (optional) Allows for the volume_backend_name to be separate of $name.
@ -64,8 +64,8 @@ define cinder::backend::nvmeof (
$target_protocol,
$target_port = '4420',
$target_prefix = $facts['os_service_default'],
$nvmet_port_id = '1',
$nvmet_ns_id = '10',
$nvmet_port_id = $facts['os_service_default'],
$nvmet_ns_id = $facts['os_service_default'],
$volume_backend_name = $name,
$backend_availability_zone = $facts['os_service_default'],
$volume_driver = 'cinder.volume.drivers.lvm.LVMVolumeDriver',

4
spec/defines/cinder_backend_nvmeof_spec.rb
View File

@ -22,8 +22,8 @@ describe 'cinder::backend::nvmeof' do
is_expected.to contain_cinder_config('nvme-backend/target_port').with_value('4420')
is_expected.to contain_cinder_config('nvme-backend/target_helper').with_value('nvmet')
is_expected.to contain_cinder_config('nvme-backend/target_protocol').with_value('nvmet_rdma')
is_expected.to contain_cinder_config('nvme-backend/nvmet_port_id').with_value('1')
is_expected.to contain_cinder_config('nvme-backend/nvmet_ns_id').with_value('10')
is_expected.to contain_cinder_config('nvme-backend/nvmet_port_id').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('nvme-backend/nvmet_ns_id').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('nvme-backend/volume_backend_name').with_value('nvme-backend')
is_expected.to contain_cinder_config('nvme-backend/backend_availability_zone').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('nvme-backend/volume_driver').with_value('cinder.volume.drivers.lvm.LVMVolumeDriver')