From 79719a11ccde300aefcf3d98a8a55afdf3c09edd Mon Sep 17 00:00:00 2001
From: Yong Huang <yong.huang@emc.com>
Date: Sat, 10 Feb 2018 20:17:30 -0500
Subject: [PATCH] [DellEMC]Update Manila Unity driver

This patch adds following 3 options:

* network_plugin_ipv6_enabled
* emc_ssl_cert_verify
* emc_ssl_cert_path

Depends-On: https://review.openstack.org/538146

Change-Id: Ic0391618cf00413d6adc0ed3cba97eb76793c36a
---
 environments/manila-unity-config.yaml               |  2 ++
 puppet/services/manila-backend-unity.yaml           | 13 +++++++++++++
 ...update_manila_unity_driver-43aeb041029c4e7f.yaml |  5 +++++
 3 files changed, 20 insertions(+)
 create mode 100644 releasenotes/notes/update_manila_unity_driver-43aeb041029c4e7f.yaml

diff --git a/environments/manila-unity-config.yaml b/environments/manila-unity-config.yaml
index 418404e1b1..26a215ba0e 100644
--- a/environments/manila-unity-config.yaml
+++ b/environments/manila-unity-config.yaml
@@ -15,3 +15,5 @@ parameter_defaults:
   ManilaUnityServerMetaPool: ''
   ManilaUnityShareDataPools: ''
   ManilaUnityEthernetPorts: ''
+  ManilaUnityEmcSslCertVerify: false
+  ManilaUnityEmcSslCertPath: ''
diff --git a/puppet/services/manila-backend-unity.yaml b/puppet/services/manila-backend-unity.yaml
index 8d77360374..93b0725b6c 100644
--- a/puppet/services/manila-backend-unity.yaml
+++ b/puppet/services/manila-backend-unity.yaml
@@ -28,6 +28,16 @@ parameters:
   ManilaUnityEthernetPorts:
     type: string
     default: ''
+  ManilaUnityEmcSslCertVerify:
+    type: string
+    default: false
+  ManilaUnityEmcSslCertPath:
+    type: string
+    default: ''
+  ManilaIPv6:
+    default: false
+    description: Set to True to enable IPv6 access in manila.
+    type: boolean
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -70,5 +80,8 @@ outputs:
         manila::backend::dellemc_unity::unity_server_meta_pool: {get_param: ManilaUnityServerMetaPool}
         manila::backend::dellemc_unity::unity_share_data_pools: {get_param: ManilaUnityShareDataPools}
         manila::backend::dellemc_unity::unity_ethernet_ports: {get_param: ManilaUnityEthernetPorts}
+        manila::backend::dellemc_unity::network_plugin_ipv6_enabled: {get_param: ManilaIPv6}
+        manila::backend::dellemc_unity::emc_ssl_cert_verify: {get_param: ManilaUnityEmcSslCertVerify}
+        manila::backend::dellemc_unity::emc_ssl_cert_path: {get_param: ManilaUnityEmcSslCertPath}
       step_config:
 
diff --git a/releasenotes/notes/update_manila_unity_driver-43aeb041029c4e7f.yaml b/releasenotes/notes/update_manila_unity_driver-43aeb041029c4e7f.yaml
new file mode 100644
index 0000000000..1e15f468e5
--- /dev/null
+++ b/releasenotes/notes/update_manila_unity_driver-43aeb041029c4e7f.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+      Adds network_plugin_ipv6_enabled, emc_ssl_cert_verify and
+      emc_ssl_cert_path options for Manila Unity driver.