From 8bc78a567b06fa8038f6827a51e2d2e2b11b563f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 11 Mar 2025 22:50:01 +0900 Subject: [PATCH] Add support for netapp_delete_retention_hours ... which was added during 2025.1 cycle. Depends-on: https://review.opendev.org/932912 Change-Id: I3cdb762564db1968094b8831dec323dca5d654de --- manifests/backend/netapp.pp | 7 +++++++ .../netapp_delete_retention_hours-dea6a16be079ec82.yaml | 5 +++++ spec/defines/manila_backend_netapp_spec.rb | 2 ++ 3 files changed, 14 insertions(+) create mode 100644 releasenotes/notes/netapp_delete_retention_hours-dea6a16be079ec82.yaml diff --git a/manifests/backend/netapp.pp b/manifests/backend/netapp.pp index 0efcdd54..719abdfb 100644 --- a/manifests/backend/netapp.pp +++ b/manifests/backend/netapp.pp @@ -85,6 +85,11 @@ # driver_handles_share_servers is set to True. # Defaults to $facts['os_service_default'] # +# [*netapp_delete_retention_hours*] +# (optional) The number of hours that a deleted volume should be retained +# before the delete is completed. +# Defaults to $facts['os_service_default'] +# # [*netapp_port_name_search_pattern*] # (optional) Pattern for overriding the selection of network ports on which # to create Vserver LIFs. @@ -146,6 +151,7 @@ define manila::backend::netapp ( $netapp_aggregate_name_search_pattern = $facts['os_service_default'], $netapp_root_volume_aggregate = $facts['os_service_default'], $netapp_root_volume = $facts['os_service_default'], + $netapp_delete_retention_hours = $facts['os_service_default'], $netapp_port_name_search_pattern = $facts['os_service_default'], $netapp_trace_flags = $facts['os_service_default'], $reserved_share_percentage = $facts['os_service_default'], @@ -178,6 +184,7 @@ define manila::backend::netapp ( "${share_backend_name}/netapp_aggregate_name_search_pattern": value => $netapp_aggregate_name_search_pattern; "${share_backend_name}/netapp_root_volume_aggregate": value => $netapp_root_volume_aggregate; "${share_backend_name}/netapp_root_volume": value => $netapp_root_volume; + "${share_backend_name}/netapp_delete_retention_hours": value => $netapp_delete_retention_hours; "${share_backend_name}/netapp_port_name_search_pattern": value => $netapp_port_name_search_pattern; "${share_backend_name}/netapp_trace_flags": value => $netapp_trace_flags; "${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage; diff --git a/releasenotes/notes/netapp_delete_retention_hours-dea6a16be079ec82.yaml b/releasenotes/notes/netapp_delete_retention_hours-dea6a16be079ec82.yaml new file mode 100644 index 00000000..1afc0c6d --- /dev/null +++ b/releasenotes/notes/netapp_delete_retention_hours-dea6a16be079ec82.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``manila::backend::netapp::netapp_delete_retention_hours`` + parameter has been added. diff --git a/spec/defines/manila_backend_netapp_spec.rb b/spec/defines/manila_backend_netapp_spec.rb index ab04e23b..97071990 100644 --- a/spec/defines/manila_backend_netapp_spec.rb +++ b/spec/defines/manila_backend_netapp_spec.rb @@ -26,6 +26,7 @@ describe 'manila::backend::netapp' do :netapp_aggregate_name_search_pattern => '', :netapp_root_volume_aggregate => '', :netapp_root_volume => '', + :netapp_delete_retention_hours => '', :netapp_port_name_search_pattern => '', :netapp_trace_flags => '', :reserved_share_percentage => '', @@ -76,6 +77,7 @@ describe 'manila::backend::netapp' do :netapp_aggregate_name_search_pattern => '(.*)', :netapp_root_volume_aggregate => 'aggr1', :netapp_root_volume => 'rootvolume', + :netapp_delete_retention_hours => 12, :netapp_port_name_search_pattern => '(.*)', :netapp_trace_flags => 'method,api', :reserved_share_percentage => 10.0,