NetApp: Deprecate parameters for 7mode systems

... because 7mode systems are no longer supported since Rocky[1].

[1] 425f45a311dc78ff34a18ffea7dbf5bb6dd2d421

Closes-Bug: #1965850
Change-Id: I78ebe09ed1725ac01efd4ed6eeaa78c2438e4d04

manifests/backend/netapp.pp

@@ -42,8 +42,8 @@
 #
 # [*netapp_storage_family*]
 #   (optional) The storage family type used on the storage system; valid values
-#   are ontap_7mode for using Data ONTAP operating in 7-Mode, ontap_cluster
-#   for using clustered Data ONTAP, or eseries for NetApp E-Series.
+#   are ontap_cluster for using clustered Data ONTAP, or eseries for NetApp
+#   E-Series.
 #   Defaults to ontap_cluster
 #
 # [*netapp_storage_protocol*]
@@ -56,27 +56,12 @@
 #   system or proxy server. Valid values are http or https.
 #   Defaults to http
 #
-# [*netapp_vfiler*]
-#   (optional) The vFiler unit on which provisioning of block storage volumes
-#   will be done. This parameter is only used by the driver when connecting to
-#   an instance with a storage family of Data ONTAP operating in 7-Mode. Only
-#   use this parameter when utilizing the MultiStore feature on the NetApp
-#   storage system.
-#   Defaults to undef
-#
 # [*netapp_vserver*]
 #   (optional) This option specifies the virtual storage server (Vserver)
 #   name on the storage cluster on which provisioning of block storage volumes
 #   should occur.
 #   Defaults to undef
 #
-# [*netapp_partner_backend_name*]
-#   (optional) The name of the config.conf stanza for a Data ONTAP (7-mode)
-#   HA partner.  This option is only used by the driver when connecting to an
-#   instance with a storage family of Data ONTAP operating in 7-Mode, and it is
-#   required if the storage protocol selected is FC.
-#   Defaults to undef
-#
 # [*expiry_thres_minutes*]
 #   (optional) This parameter specifies the threshold for last access time for
 #   images in the NFS image cache. When a cache cleaning cycle begins, images
@@ -182,6 +167,23 @@
 #   Example :
 #     { 'netapp_backend/param1' => { 'value' => value1 } }
 #
+# DEPRECATED PARAMETERS
+#
+# [*netapp_vfiler*]
+#   (optional) The vFiler unit on which provisioning of block storage volumes
+#   will be done. This parameter is only used by the driver when connecting to
+#   an instance with a storage family of Data ONTAP operating in 7-Mode. Only
+#   use this parameter when utilizing the MultiStore feature on the NetApp
+#   storage system.
+#   Defaults to undef
+#
+# [*netapp_partner_backend_name*]
+#   (optional) The name of the config.conf stanza for a Data ONTAP (7-mode)
+#   HA partner.  This option is only used by the driver when connecting to an
+#   instance with a storage family of Data ONTAP operating in 7-Mode, and it is
+#   required if the storage protocol selected is FC.
+#   Defaults to undef
+#
 # === Examples
 #
 #  cinder::backend::netapp { 'myBackend':
@@ -212,9 +214,7 @@ define cinder::backend::netapp (
   $netapp_storage_family            = 'ontap_cluster',
   $netapp_storage_protocol          = 'nfs',
   $netapp_transport_type            = 'http',
-  $netapp_vfiler                    = undef,
   $netapp_vserver                   = undef,
-  $netapp_partner_backend_name      = undef,
   $expiry_thres_minutes             = '720',
   $thres_avl_size_perc_start        = '20',
   $thres_avl_size_perc_stop         = '60',
@@ -231,10 +231,20 @@ define cinder::backend::netapp (
   $netapp_pool_name_search_pattern  = '(.+)',
   $nas_secure_file_operations       = $::os_service_default,
   $nas_secure_file_permissions      = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $netapp_vfiler                    = undef,
+  $netapp_partner_backend_name      = undef,
 ) {
 
   include cinder::deps
 
+  if $netapp_vfiler != undef {
+    warning('The netapp_vfiler parameter is deprecated and has no effect.')
+  }
+  if $netapp_partner_backend_name != undef {
+    warning('The netapp_partner_backend_name parameter is deprecated and has no effect.')
+  }
+
   if $nfs_shares {
     validate_legacy(Array, 'validate_array', $nfs_shares)
 
@@ -258,9 +268,7 @@ define cinder::backend::netapp (
     "${name}/netapp_storage_family":            value => $netapp_storage_family;
     "${name}/netapp_storage_protocol":          value => $netapp_storage_protocol;
     "${name}/netapp_transport_type":            value => $netapp_transport_type;
-    "${name}/netapp_vfiler":                    value => $netapp_vfiler;
     "${name}/netapp_vserver":                   value => $netapp_vserver;
-    "${name}/netapp_partner_backend_name":      value => $netapp_partner_backend_name;
     "${name}/expiry_thres_minutes":             value => $expiry_thres_minutes;
     "${name}/thres_avl_size_perc_start":        value => $thres_avl_size_perc_start;
     "${name}/thres_avl_size_perc_stop":         value => $thres_avl_size_perc_stop;
@@ -275,6 +283,11 @@ define cinder::backend::netapp (
     "${name}/nas_secure_file_permissions":      value => $nas_secure_file_permissions;
   }
 
+  cinder_config {
+    "${name}/netapp_vfiler":               ensure => absent;
+    "${name}/netapp_partner_backend_name": ensure => absent;
+  }
+
   if $manage_volume_type {
     cinder_type { $name:
       ensure     => present,

releasenotes/notes/deprecate-netapp-7mode-a241386379e2a93b.yaml

@@ -0,0 +1,8 @@
+---
+deprecations:
+  - |
+    The following parameters of the ``cinder::backend::netapp`` resource type
+    have been deprecated and have no effect now.
+
+    - ``netapp_vfiler``
+    - ``netapp_partner_backend_name``

spec/defines/cinder_backend_netapp_spec.rb

@@ -10,9 +10,7 @@ describe 'cinder::backend::netapp' do
       :netapp_login                 => 'netapp',
       :netapp_password              => 'password',
       :netapp_server_hostname       => '127.0.0.2',
-      :netapp_vfiler                => 'netapp_vfiler',
       :netapp_vserver               => 'netapp_vserver',
-      :netapp_partner_backend_name  => 'fc2',
       :netapp_copyoffload_tool_path => '/tmp/na_copyoffload_64',
       :netapp_controller_ips        => '10.0.0.2,10.0.0.3',
       :netapp_sa_password           => 'password',