diff --git a/manifests/backend/pure.pp b/manifests/backend/pure.pp index 89dfa386..dd1b74ea 100644 --- a/manifests/backend/pure.pp +++ b/manifests/backend/pure.pp @@ -33,18 +33,12 @@ # # [*use_chap_auth*] # (optional) Use authentication for iSCSI. Only affects the PureISCSIDriver. -# Defaults to False +# Defaults to $facts['os_service_default'] # # [*use_multipath_for_image_xfer*] # (optional) Use multipath when attaching the volume for image transfer. # Defaults to True # -# [*manage_volume_type*] -# (Optional) Whether or not manage Cinder Volume type. -# If set to true, a Cinder Volume type will be created -# with volume_backend_name=$volume_backend_name key/value. -# Defaults to false. -# # [*image_volume_cache_enabled*] # (Optional) Enable Cinder's image cache function for this backend. # Defaults to True @@ -97,6 +91,12 @@ # supersedes pure_iscsi_cidr. # Defaults to $facts['os_service_default'] # +# [*manage_volume_type*] +# (Optional) Whether or not manage Cinder Volume type. +# If set to true, a Cinder Volume type will be created +# with volume_backend_name=$volume_backend_name key/value. +# Defaults to false. +# # [*extra_options*] # (optional) Hash of extra options to pass to the backend stanza. # Defaults to: {} @@ -110,9 +110,8 @@ define cinder::backend::pure( $backend_availability_zone = $facts['os_service_default'], $reserved_percentage = $facts['os_service_default'], Enum['iSCSI', 'FC', 'NVMe'] $pure_storage_protocol = 'iSCSI', - $use_chap_auth = false, + $use_chap_auth = $facts['os_service_default'], $use_multipath_for_image_xfer = true, - Boolean $manage_volume_type = false, $image_volume_cache_enabled = true, $image_volume_cache_max_size_gb = $facts['os_service_default'], $image_volume_cache_max_count = $facts['os_service_default'], @@ -123,6 +122,7 @@ define cinder::backend::pure( $pure_nvme_cidr_list = $facts['os_service_default'], $pure_iscsi_cidr = $facts['os_service_default'], $pure_iscsi_cidr_list = $facts['os_service_default'], + Boolean $manage_volume_type = false, Hash $extra_options = {}, ) { diff --git a/spec/defines/cinder_backend_pure_spec.rb b/spec/defines/cinder_backend_pure_spec.rb index d1a4b46c..c93a3c83 100644 --- a/spec/defines/cinder_backend_pure_spec.rb +++ b/spec/defines/cinder_backend_pure_spec.rb @@ -26,7 +26,7 @@ describe 'cinder::backend::pure' do is_expected.to contain_cinder_config('pure/san_ip').with_value('127.0.0.2') is_expected.to contain_cinder_config('pure/pure_api_token').with_value('abc123def456ghi789') is_expected.to contain_cinder_config('pure/use_multipath_for_image_xfer').with_value('true') - is_expected.to contain_cinder_config('pure/use_chap_auth').with_value('false') + is_expected.to contain_cinder_config('pure/use_chap_auth').with_value('') is_expected.to contain_cinder_config('pure/pure_eradicate_on_delete').with_value('') is_expected.to contain_cinder_config('pure/pure_iscsi_cidr').with_value('') is_expected.to contain_cinder_config('pure/pure_iscsi_cidr_list').with_value('') @@ -77,7 +77,7 @@ describe 'cinder::backend::pure' do is_expected.to contain_cinder_config('pure/san_ip').with_value('127.0.0.2') is_expected.to contain_cinder_config('pure/pure_api_token').with_value('abc123def456ghi789') is_expected.to contain_cinder_config('pure/use_multipath_for_image_xfer').with_value('true') - is_expected.to contain_cinder_config('pure/use_chap_auth').with_value('false') + is_expected.to contain_cinder_config('pure/use_chap_auth').with_value('') is_expected.to contain_cinder_config('pure/pure_eradicate_on_delete').with_value('') is_expected.to contain_cinder_config('pure/pure_host_personality').with_value('') } @@ -98,7 +98,7 @@ describe 'cinder::backend::pure' do is_expected.to contain_cinder_config('pure/san_ip').with_value('127.0.0.2') is_expected.to contain_cinder_config('pure/pure_api_token').with_value('abc123def456ghi789') is_expected.to contain_cinder_config('pure/use_multipath_for_image_xfer').with_value('true') - is_expected.to contain_cinder_config('pure/use_chap_auth').with_value('false') + is_expected.to contain_cinder_config('pure/use_chap_auth').with_value('') is_expected.to contain_cinder_config('pure/pure_eradicate_on_delete').with_value('') is_expected.to contain_cinder_config('pure/pure_nvme_cidr').with_value('') is_expected.to contain_cinder_config('pure/pure_nvme_transport').with_value('')