From 72eea3c6ea5969a834544cf38cd0a63f4c61d85d Mon Sep 17 00:00:00 2001
From: rajinir <rajini.karthik@dell.com>
Date: Mon, 22 Oct 2018 12:08:11 -0500
Subject: [PATCH] Added Dell EMC SC multipath support

Added a new parameter CinderDellScMultipathXfer to
support cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer
to the Dell EMC SC Cinder iSCSI volume driver template.

Depends-On: https://review.openstack.org/#/c/611126/
Change-Id: I04f42ce0cd117f7dcc7a817274ea7664d9995864
---
 environments/cinder-dellsc-config.yaml                 | 1 +
 puppet/services/cinder-backend-dellsc.yaml             | 4 ++++
 releasenotes/notes/dellsc-driver-d7cd300a24a64b01.yaml | 6 ++++++
 3 files changed, 11 insertions(+)
 create mode 100644 releasenotes/notes/dellsc-driver-d7cd300a24a64b01.yaml

diff --git a/environments/cinder-dellsc-config.yaml b/environments/cinder-dellsc-config.yaml
index 1be26db48c..1aa2591ae9 100644
--- a/environments/cinder-dellsc-config.yaml
+++ b/environments/cinder-dellsc-config.yaml
@@ -20,3 +20,4 @@ parameter_defaults:
   CinderDellScSecondarySanPassword: ''
   CinderDellScSecondaryScApiPort: 3033
   CinderDellScExcludedDomainIps: []
+  CinderDellScMultipathXfer: true
diff --git a/puppet/services/cinder-backend-dellsc.yaml b/puppet/services/cinder-backend-dellsc.yaml
index a927c6310b..35116f0340 100644
--- a/puppet/services/cinder-backend-dellsc.yaml
+++ b/puppet/services/cinder-backend-dellsc.yaml
@@ -73,6 +73,9 @@ parameters:
   CinderDellScExcludedDomainIps:
     type: comma_delimited_list
     default: []
+  CinderDellScMultipathXfer:
+    type: boolean
+    default: true
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -129,6 +132,7 @@ outputs:
             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}
+            cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer: {get_param: CinderDellScMultipathXfer}
           -
             if:
             - {equals : [{get_param: CinderDellScAvailabilityZone}, '']}
diff --git a/releasenotes/notes/dellsc-driver-d7cd300a24a64b01.yaml b/releasenotes/notes/dellsc-driver-d7cd300a24a64b01.yaml
new file mode 100644
index 0000000000..07ec433aec
--- /dev/null
+++ b/releasenotes/notes/dellsc-driver-d7cd300a24a64b01.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - Added Dell EMC SC multipath support
+    This change adds support for
+    cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer
+    Added a new parameter CinderDellScMultipathXfer.