Merge "NetApp: Deprecate parameters for 7mode systems and E-Series systems"

deployment/cinder/cinder-backend-netapp-puppet.yaml

@@ -68,15 +68,9 @@ parameters:
   CinderNetappTransportType:
     type: string
     default: 'http'
-  CinderNetappVfiler:
-    type: string
-    default: ''
   CinderNetappVserver:
     type: string
     default: ''
-  CinderNetappPartnerBackendName:
-    type: string
-    default: ''
   CinderNetappNfsShares:
     type: string
     default: ''
@@ -89,13 +83,6 @@ parameters:
   CinderNetappCopyOffloadToolPath:
     type: string
     default: ''
-  CinderNetappControllerIps:
-    type: string
-    default: ''
-  CinderNetappSaPassword:
-    type: string
-    default: ''
-    hidden: true
   CinderNetappPoolNameSearchPattern:
     default: '(.+)'
     description: >
@@ -106,15 +93,42 @@ parameters:
   CinderNetappHostType:
     type: string
     default: ''
-  CinderNetappWebservicePath:
-    type: string
-    default: '/devmgr/v2'
   CinderNetappNasSecureFileOperations:
     type: string
     default: 'false'
   CinderNetappNasSecureFilePermissions:
     type: string
     default: 'false'
+  # DEPRECATED options for compatibility with older versions
+  # These are obsolete now that CinderNetappPoolNameSearchPattern is fully
+  # supported here and in puppet-tripleo.
+  CinderNetappVfiler:
+    type: string
+    default: ''
+  CinderNetappPartnerBackendName:
+    type: string
+    default: ''
+  CinderNetappControllerIps:
+    type: string
+    default: ''
+  CinderNetappSaPassword:
+    type: string
+    default: ''
+    hidden: true
+  CinderNetappWebservicePath:
+    type: string
+    default: '/devmgr/v2'
+
+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed.
+  parameters:
+  - CinderNetappVfiler
+  - CinderNetappPartnerBackendName
+  - CinderNetappControllerIps
+  - CinderNetappSaPassword
+  - CinderNetappWebservicePath
 
 outputs:
   role_data:
@@ -134,17 +148,12 @@ outputs:
             cinder::backend::netapp::netapp_storage_family: {get_param: CinderNetappStorageFamily}
             cinder::backend::netapp::netapp_storage_protocol: {get_param: CinderNetappStorageProtocol}
             cinder::backend::netapp::netapp_transport_type: {get_param: CinderNetappTransportType}
-            cinder::backend::netapp::netapp_vfiler: {get_param: CinderNetappVfiler}
             cinder::backend::netapp::netapp_vserver: {get_param: CinderNetappVserver}
-            cinder::backend::netapp::netapp_partner_backend_name: {get_param: CinderNetappPartnerBackendName}
             cinder::backend::netapp::nfs_shares: {get_param: CinderNetappNfsShares}
             cinder::backend::netapp::nfs_shares_config: {get_param: CinderNetappNfsSharesConfig}
             cinder::backend::netapp::nfs_mount_options: {get_param: CinderNetappNfsMountOptions}
             cinder::backend::netapp::netapp_copyoffload_tool_path: {get_param: CinderNetappCopyOffloadToolPath}
-            cinder::backend::netapp::netapp_controller_ips: {get_param: CinderNetappControllerIps}
-            cinder::backend::netapp::netapp_sa_password: {get_param: CinderNetappSaPassword}
             cinder::backend::netapp::netapp_host_type: {get_param: CinderNetappHostType}
-            cinder::backend::netapp::netapp_webservice_path: {get_param: CinderNetappWebservicePath}
             cinder::backend::netapp::nas_secure_file_operations: {get_param: CinderNetappNasSecureFileOperations}
             cinder::backend::netapp::nas_secure_file_permissions: {get_param: CinderNetappNasSecureFilePermissions}
             cinder::backend::netapp::netapp_pool_name_search_pattern: {get_param: CinderNetappPoolNameSearchPattern}

environments/cinder-netapp-config.yaml

@@ -15,18 +15,13 @@ parameter_defaults:
   CinderNetappStorageFamily: 'ontap_cluster'
   CinderNetappStorageProtocol: 'nfs'
   CinderNetappTransportType: 'http'
-  CinderNetappVfiler: ''
   CinderNetappVserver: ''
-  CinderNetappPartnerBackendName: ''
   CinderNetappNfsShares: ''
   CinderNetappNfsSharesConfig: '/etc/cinder/shares.conf'
   CinderNetappNfsMountOptions: 'context=system_u:object_r:container_file_t:s0'
   CinderNetappCopyOffloadToolPath: ''
-  CinderNetappControllerIps: ''
-  CinderNetappSaPassword: ''
   CinderNetappPoolNameSearchPattern: '(.+)'
   CinderNetappHostType: ''
-  CinderNetappWebservicePath: '/devmgr/v2'
 
 # To configure multiple Netapp backends, use CinderNetappMultiConfig to
 # assign parameter values specific to that backend. For example:

environments/storage/cinder-netapp-config.yaml

@@ -17,10 +17,6 @@ parameter_defaults:
   # Type: comma_delimited_list
   CinderNetappBackendName: tripleo_netapp
 
-  # 
-  # Type: string
-  CinderNetappControllerIps: ''
-
   # 
   # Type: string
   CinderNetappCopyOffloadToolPath: ''
@@ -58,10 +54,6 @@ parameter_defaults:
   # Type: string
   CinderNetappNfsSharesConfig: /etc/cinder/shares.conf
 
-  # 
-  # Type: string
-  CinderNetappPartnerBackendName: ''
-
   # 
   # Mandatory. This parameter must be set by the user.
   # Type: string
@@ -71,10 +63,6 @@ parameter_defaults:
   # Type: string
   CinderNetappPoolNameSearchPattern: (.+)
 
-  # 
-  # Type: string
-  CinderNetappSaPassword: ''
-
   # 
   # Mandatory. This parameter must be set by the user.
   # Type: string
@@ -100,18 +88,10 @@ parameter_defaults:
   # Type: string
   CinderNetappTransportType: http
 
-  # 
-  # Type: string
-  CinderNetappVfiler: ''
-
   # 
   # Type: string
   CinderNetappVserver: ''
 
-  # 
-  # Type: string
-  CinderNetappWebservicePath: /devmgr/v2
-
   # ******************************************************
   # Static parameters - these are values that must be
   # included in the environment but should not be changed.

releasenotes/notes/deprecate-removed-netapp-systems-15c58d7e807ba33a.yaml

@@ -0,0 +1,18 @@
+---
+deprecations:
+  - |
+    The following two parameters have been deprecated and have no effect now.
+    These two parameters are used for 7mode systems which are no longer
+    supported by cinder.
+
+    - ``CinderNetappVfiler``
+    - ``CinderNetappPartnerBackendName``
+
+  - |
+    The following three parameters have been deprecated and have no effect
+    now. These three parameters are used for E-Series systems which are no
+    longer supported by cinder.
+
+    - ``CinderNetappControllerIPs``
+    - ``CinderNetappSaPassword``
+    - ``CinderNetappWebservicePath``

sample-env-generator/storage.yaml

@@ -68,7 +68,32 @@ environments:
       a Cinder NetApp backend, configured via puppet
     files:
       deployment/cinder/cinder-backend-netapp-puppet.yaml:
-        parameters: all
+        parameters:
+          # TODO(tkajinam): Currently this is required to skip the deprecated
+          #                 parameters but ideally these should be excluded
+          #                 by generator. Remove this once that is fixed or
+          #                 the deprecated parameters are removed.
+          - CinderEnableNetappBackend
+          - CinderNetappAvailabilityZone
+          - CinderNetappBackendName
+          - CinderNetappCopyOffloadToolPath
+          - CinderNetappHostType
+          - CinderNetappLogin
+          - CinderNetappMultiConfig
+          - CinderNetappNasSecureFileOperations
+          - CinderNetappNasSecureFilePermissions
+          - CinderNetappNfsMountOptions
+          - CinderNetappNfsShares
+          - CinderNetappNfsSharesConfig
+          - CinderNetappPassword
+          - CinderNetappPoolNameSearchPattern
+          - CinderNetappServerHostname
+          - CinderNetappServerPort
+          - CinderNetappSizeMultiplier
+          - CinderNetappStorageFamily
+          - CinderNetappStorageProtocol
+          - CinderNetappTransportType
+          - CinderNetappVserver
     static:
       - CinderEnableNetappBackend
     resource_registry: