Merge "Dell EMC Sc: Add support for excluded_domain_ips"

environments/cinder-dellsc-config.yaml

@@ -19,4 +19,4 @@ parameter_defaults:
   CinderDellScSecondarySanLogin: 'Admin'
   CinderDellScSecondarySanPassword: ''
   CinderDellScSecondaryScApiPort: 3033
-  CinderDellScExcludedDomainIp: ''
+  CinderDellScExcludedDomainIps: []

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}

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.