From bf98351f836eb77c2553599ca9bcae9408cb5072 Mon Sep 17 00:00:00 2001
From: rajinir <rajini.karthik@dell.com>
Date: Fri, 21 Sep 2018 13:07:11 -0500
Subject: [PATCH] Dell EMC Sc: Add support for excluded_domain_ips

The Dell EMC SC configuration option excluded_domain_ip has been
deprecated and will be removed in a future release. Deployments
should now migrate to the option excluded_domain_ips for
equivalent functionality.

Depends-On: https://review.openstack.org/604444
Change-Id: I27c02be4d306a55a1ee8617de81d145b086a8a1b
---
 environments/cinder-dellsc-config.yaml                 | 2 +-
 puppet/services/cinder-backend-dellsc.yaml             | 9 +++++++++
 releasenotes/notes/dellsc_cinder_a5572898724a11e7.yaml | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/dellsc_cinder_a5572898724a11e7.yaml

diff --git a/environments/cinder-dellsc-config.yaml b/environments/cinder-dellsc-config.yaml
index 681a2fe971..1be26db48c 100644
--- a/environments/cinder-dellsc-config.yaml
+++ b/environments/cinder-dellsc-config.yaml
@@ -19,4 +19,4 @@ parameter_defaults:
   CinderDellScSecondarySanLogin: 'Admin'
   CinderDellScSecondarySanPassword: ''
   CinderDellScSecondaryScApiPort: 3033
-  CinderDellScExcludedDomainIp: ''
+  CinderDellScExcludedDomainIps: []
diff --git a/puppet/services/cinder-backend-dellsc.yaml b/puppet/services/cinder-backend-dellsc.yaml
index 00efcff711..cc853264f6 100644
--- a/puppet/services/cinder-backend-dellsc.yaml
+++ b/puppet/services/cinder-backend-dellsc.yaml
@@ -64,6 +64,9 @@ parameters:
   CinderDellScExcludedDomainIp:
     type: string
     default: ''
+  CinderDellScExcludedDomainIps:
+    type: comma_delimited_list
+    default: []
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -90,6 +93,11 @@ parameters:
     type: json
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
+parameter_groups:
+- label: deprecated
+  description: Do not use deprecated params, they will be removed.
+  parameters:
+  - CinderDellScExcludedDomainIp
 
 outputs:
   role_data:
@@ -112,4 +120,5 @@ outputs:
                 cinder::backend::dellsc_iscsi::secondary_san_login: {get_param: CinderDellScSecondarySanLogin}
                 cinder::backend::dellsc_iscsi::secondary_san_password: {get_param: CinderDellScSecondarySanPassword}
                 cinder::backend::dellsc_iscsi::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort}
+                cinder::backend::dellsc_iscsi::excluded_domain_ips: {get_param: CinderDellScExcludedDomainIps}
                 cinder::backend::dellsc_iscsi::excluded_domain_ip: {get_param: CinderDellScExcludedDomainIp}
diff --git a/releasenotes/notes/dellsc_cinder_a5572898724a11e7.yaml b/releasenotes/notes/dellsc_cinder_a5572898724a11e7.yaml
new file mode 100644
index 0000000000..bb58163e93
--- /dev/null
+++ b/releasenotes/notes/dellsc_cinder_a5572898724a11e7.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - The Dell EMC SC configuration option excluded_domain_ip has been deprecated
+    and will be removed in a future release. Deployments should now migrate to
+    the option excluded_domain_ips for equivalent functionality.