From 0d4ae3f9c941f86c2f237821a93d8366436215ce Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Fri, 4 Aug 2017 15:21:45 +0000
Subject: [PATCH] Revert "NetApp: Deprecate E-Series drivers"
Upon gathering deployer and operator feedback in the spirit
of OpenStack deprecations, we believe this driver cannot be
deprecated at the moment. Since the CI was never brought down,
I'd like to un-deprecate this driver.
This reverts commit a27f31754fdc4aafe478911571a9d4a62464c1db and
removes the deprecation warning and release note.
Change-Id: I61e666313285187c72010f5dded585fa990f844e
---
cinder/volume/drivers/netapp/eseries/library.py | 6 ------
.../netapp-deprecate-eseries-drivers-f0787de87ba4f3f7.yaml | 6 ------
2 files changed, 12 deletions(-)
delete mode 100644 releasenotes/notes/netapp-deprecate-eseries-drivers-f0787de87ba4f3f7.yaml
diff --git a/cinder/volume/drivers/netapp/eseries/library.py b/cinder/volume/drivers/netapp/eseries/library.py
index 44111604890..80a94c868ea 100644
--- a/cinder/volume/drivers/netapp/eseries/library.py
+++ b/cinder/volume/drivers/netapp/eseries/library.py
@@ -152,12 +152,6 @@ class NetAppESeriesLibrary(object):
if self.configuration.netapp_enable_multiattach:
self._ensure_multi_attach_host_group_exists()
- # This driver has been marked 'deprecated' in the Pike release and
- # can be removed in Queens.
- msg = _("The NetApp E-Series driver is deprecated and will be "
- "removed in a future release.")
- versionutils.report_deprecated_feature(LOG, msg)
-
def _create_rest_client(self, configuration):
port = configuration.netapp_server_port
scheme = configuration.netapp_transport_type.lower()
diff --git a/releasenotes/notes/netapp-deprecate-eseries-drivers-f0787de87ba4f3f7.yaml b/releasenotes/notes/netapp-deprecate-eseries-drivers-f0787de87ba4f3f7.yaml
deleted file mode 100644
index 3fe8bea0a85..00000000000
--- a/releasenotes/notes/netapp-deprecate-eseries-drivers-f0787de87ba4f3f7.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-deprecations:
- - The NetApp E-Series drivers are deprecated as of the Pike release and
- will be removed in the Queens release. Other configurations of the
- NetApp driver, i.e Clustered Data ONTAP and Solidfire, are
- unaffected.