From 98858377f01026a6995c2de299df7176d4935c25 Mon Sep 17 00:00:00 2001
From: Peter Wang <peter.wang13@emc.com>
Date: Fri, 26 Jan 2018 12:58:17 +0800
Subject: [PATCH] [DellEMC]Update Manila VNX 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/562531

Change-Id: I42b0555c077dbc9f9d5ae4efaf1ec41a9c563b6a
(cherry picked from commit 60796ebfc921fae598e125bfeef94a942e5a61b8)
---
 environments/manila-vnx-config.yaml               |  3 ++-
 puppet/services/manila-backend-vnx.yaml           | 15 ++++++++++++++-
 ...update_manila_vnx_driver-678b22c4fcd81fcf.yaml |  4 ++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/update_manila_vnx_driver-678b22c4fcd81fcf.yaml

diff --git a/environments/manila-vnx-config.yaml b/environments/manila-vnx-config.yaml
index 9a0ea59b7b..8346c44043 100644
--- a/environments/manila-vnx-config.yaml
+++ b/environments/manila-vnx-config.yaml
@@ -15,4 +15,5 @@ parameter_defaults:
   ManilaVNXServerMetaPool: ''
   ManilaVNXShareDataPools: ''
   ManilaVNXEthernetPorts: ''
-
+  ManilaVNXEmcSslCertVerify: false
+  ManilaVNXEmcSslCertPath: ''
diff --git a/puppet/services/manila-backend-vnx.yaml b/puppet/services/manila-backend-vnx.yaml
index ba088c2fee..5ee30c47fa 100644
--- a/puppet/services/manila-backend-vnx.yaml
+++ b/puppet/services/manila-backend-vnx.yaml
@@ -1,7 +1,7 @@
 heat_template_version: queens
 
 description: >
-  Openstack Manila vnx backend.
+  Openstack Manila VNX backend.
 
 parameters:
   ManilaVNXDriverHandlesShareServers:
@@ -28,6 +28,16 @@ parameters:
   ManilaVNXEthernetPorts:
     type: string
     default: ''
+  ManilaVNXEmcSslCertVerify:
+    type: string
+    default: false
+  ManilaVNXEmcSslCertPath:
+    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,6 +80,9 @@ outputs:
         manila::backend::dellemc_vnx::vnx_server_container: {get_param: ManilaVNXServerContainer}
         manila::backend::dellemc_vnx::vnx_share_data_pools: {get_param: ManilaVNXShareDataPools}
         manila::backend::dellemc_vnx::vnx_ethernet_ports: {get_param: ManilaVNXEthernetPorts}
+        manila::backend::dellemc_vnx::network_plugin_ipv6_enabled: {get_param: ManilaIPv6}
+        manila::backend::dellemc_vnx::emc_ssl_cert_verify: {get_param: ManilaVNXEmcSslCertVerify}
+        manila::backend::dellemc_vnx::emc_ssl_cert_path: {get_param: ManilaVNXEmcSslCertPath}
       step_config:
 
 
diff --git a/releasenotes/notes/update_manila_vnx_driver-678b22c4fcd81fcf.yaml b/releasenotes/notes/update_manila_vnx_driver-678b22c4fcd81fcf.yaml
new file mode 100644
index 0000000000..8704456e1d
--- /dev/null
+++ b/releasenotes/notes/update_manila_vnx_driver-678b22c4fcd81fcf.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Adds network_plugin_ipv6_enabled, emc_ssl_cert_verify and
+    emc_ssl_cert_path options for Manila VNX driver.