From 5e4f319edca2d9ee567c94794a47d6516ea1db26 Mon Sep 17 00:00:00 2001
From: rajinir <rajini.karthik@dell.com>
Date: Sun, 17 May 2020 20:01:30 -0500
Subject: [PATCH] Deprecating Old ScaleIO  Volume Config

New Dell EMC VxFlexOS Volume config is now
added. See https://review.opendev.org/#/c/728727/
Deprecating the old resource.

Change-Id: I65339e92d3ab1a7904ca0477666b32367295808d
---
 .../cinder/cinder-backend-scaleio-puppet.yaml | 25 ++++++++++++++++++-
 environments/cinder-scaleio-config.yaml       |  4 +++
 ...deprecate-old-driver-ab28e372280c44e6.yaml |  5 ++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 rename deployment/{ => deprecated}/cinder/cinder-backend-scaleio-puppet.yaml (86%)
 create mode 100644 releasenotes/notes/scaleio-deprecate-old-driver-ab28e372280c44e6.yaml

diff --git a/deployment/cinder/cinder-backend-scaleio-puppet.yaml b/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml
similarity index 86%
rename from deployment/cinder/cinder-backend-scaleio-puppet.yaml
rename to deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml
index c54f404fee..540432624d 100644
--- a/deployment/cinder/cinder-backend-scaleio-puppet.yaml
+++ b/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml
@@ -15,7 +15,9 @@ heat_template_version: rocky
 
 description: >
   Openstack Cinder Dell EMC ScaleIO backend
-
+  Please note, this template is deprecated now.
+  Use Cinder Dell EMC VxFlexOS backend template defined in
+  cinder-backend-dellemc-vxflexos-puppet.yaml.
 parameters:
   CinderEnableScaleIOBackend:
     type: boolean
@@ -102,6 +104,27 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
 
+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed.
+  parameters:
+  - CinderEnableScaleIOBackend
+  - CinderScaleIOBackendName
+  - CinderScaleIOSanIp
+  - CinderScaleIOSanLogin
+  - CinderScaleIOSanPassword
+  - CinderScaleIORestServerPort
+  - CinderScaleIOVerifyServerCertificate
+  - CinderScaleIOServerCertificatePath
+  - CinderScaleIOProtectionDomainName
+  - CinderScaleIOStoragePoolName
+  - CinderScaleIOStoragePools
+  - CinderScaleIORoundVolumeCapacity
+  - CinderScaleIOUnmapVolumeBeforeDeletion
+  - CinderScaleIOMaxOverSubscriptionRatio
+  - CinderScaleIOSanThinProvision
+
 outputs:
   role_data:
     description: Role data for the Cinder Dell EMC ScaleIO backend.
diff --git a/environments/cinder-scaleio-config.yaml b/environments/cinder-scaleio-config.yaml
index 75086458c2..3374b57a2f 100644
--- a/environments/cinder-scaleio-config.yaml
+++ b/environments/cinder-scaleio-config.yaml
@@ -14,6 +14,10 @@
 #
 # A Heat environment file which can be used to enable a
 # a Cinder Dell EMC ScaleIO backend, configured via puppet
+#
+#  Please note, this template is deprecated now.
+#  Use Cinder Dell EMC VxFlexOS backend template defined in
+#  cinder-backend-dellemc-vxflexos-puppet.yaml.
 resource_registry:
   OS::TripleO::Services::CinderBackendScaleIO: ../deployment/cinder/cinder-backend-scaleio-puppet.yaml
 
diff --git a/releasenotes/notes/scaleio-deprecate-old-driver-ab28e372280c44e6.yaml b/releasenotes/notes/scaleio-deprecate-old-driver-ab28e372280c44e6.yaml
new file mode 100644
index 0000000000..683c59041a
--- /dev/null
+++ b/releasenotes/notes/scaleio-deprecate-old-driver-ab28e372280c44e6.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - Resource OS::TripleO::Services::CinderBackendScaleIO
+    is no longer supported. Use the new resource
+    OS::TripleO::Services::CinderBackendDellEMCVxFlexOS.