From 50754230265077d185606931a164bcbe90661e8b Mon Sep 17 00:00:00 2001
From: hjy <821328772@qq.com>
Date: Tue, 21 Apr 2020 02:02:14 +0000
Subject: [PATCH] Revert "Mark MacroSAN Driver Unsupported"

This reverts commit 2a5cc4feff1a0325d97d37a1f09fe2b5bd2bdeba.

The 3rd Party CI is running. Therefore, the driver is being
marked supported in 'U' release.

Partially-implements: bp macrosan-driver-supported
Change-Id: Ib27f9cd869078ff36e0230a18a18ba2d37d26820
---
 cinder/volume/drivers/macrosan/driver.py           |  3 ---
 doc/source/reference/support-matrix.ini            |  2 +-
 ...crosan_driver_unsupported-b25f7a3b8270fa61.yaml | 14 --------------
 3 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 releasenotes/notes/macrosan_driver_unsupported-b25f7a3b8270fa61.yaml

diff --git a/cinder/volume/drivers/macrosan/driver.py b/cinder/volume/drivers/macrosan/driver.py
index 04f83e323f4..0d043c6e5ad 100644
--- a/cinder/volume/drivers/macrosan/driver.py
+++ b/cinder/volume/drivers/macrosan/driver.py
@@ -78,9 +78,6 @@ class MacroSANBaseDriver(driver.VolumeDriver):
 
     CI_WIKI_NAME = 'MacroSAN Volume CI'
 
-    # TODO(jsbryant) Remove driver in 'V' release if CI is not fixed.
-    SUPPORTED = False
-
     def __init__(self, *args, **kwargs):
         """Initialize the driver."""
         super(MacroSANBaseDriver, self).__init__(*args, **kwargs)
diff --git a/doc/source/reference/support-matrix.ini b/doc/source/reference/support-matrix.ini
index 50c07104664..37db869c356 100644
--- a/doc/source/reference/support-matrix.ini
+++ b/doc/source/reference/support-matrix.ini
@@ -219,7 +219,7 @@ driver.kaminario=complete
 driver.lenovo=complete
 driver.linbit_linstor=complete
 driver.lvm=complete
-driver.macrosan=missing
+driver.macrosan=complete
 driver.nec=complete
 driver.netapp_ontap=complete
 driver.netapp_solidfire=complete
diff --git a/releasenotes/notes/macrosan_driver_unsupported-b25f7a3b8270fa61.yaml b/releasenotes/notes/macrosan_driver_unsupported-b25f7a3b8270fa61.yaml
deleted file mode 100644
index 5513938a062..00000000000
--- a/releasenotes/notes/macrosan_driver_unsupported-b25f7a3b8270fa61.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-upgrade:
-  - |
-    The MacroSAN Storage driver has been marked as unsupported
-    and is now deprecated.  ``enabled_unsupported_driver`` will need
-    to be set to ``True`` in the driver's section in cinder.conf to
-    continue to use the driver.
-deprecations:
-  - |
-    The MacroSAN Storage driver has been marked as unsupported and
-    is now deprecated.  ``enable_unsupported_driver`` will need to be
-    set to ``True`` in the driver's section in cinder.conf to
-    continue to use the driver.  It its support status does not change
-    the driver will be removed in the 'V' development cycle.