From 5c09e674737142ce9b722eea65160eefc34b6fa1 Mon Sep 17 00:00:00 2001
From: Yong Huang <yong.huang@emc.com>
Date: Mon, 4 Jun 2018 15:33:15 +0800
Subject: [PATCH] Update yaml files for Dell EMC VNX, Unity drivers

1. manila-backend-vnx.yaml:
  a. remove ManilaVNXServerMetaPool since meta_pool is not used by Manila VNX driver
  b. add ManilaVNXServerContainer

2. cinder-dellemc-vnx-config.yaml:
  a. remove default value of CinderDellEMCVNXStorageSecurityFileDir since it is not medatory option for Cinder VNX driver

Change-Id: Ie48cec52df720f3a13700d6048ecf78ba9067b51
Closes-bug: #1774942
---
 environments/cinder-dellemc-vnx-config.yaml | 2 +-
 environments/manila-vnx-config.yaml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/environments/cinder-dellemc-vnx-config.yaml b/environments/cinder-dellemc-vnx-config.yaml
index d85262bd9f..1f975fa33f 100644
--- a/environments/cinder-dellemc-vnx-config.yaml
+++ b/environments/cinder-dellemc-vnx-config.yaml
@@ -15,5 +15,5 @@ parameter_defaults:
   CinderDellEMCVNXMaxLunsPerStorageGroup: 255
   CinderDellEMCVNXInitiatorAutoRegistration: 'true'
   CinderDellEMCVNXAuthType: 'global'
-  CinderDellEMCVNXStorageSecurityFileDir: '/etc/secfile/array1'
+  CinderDellEMCVNXStorageSecurityFileDir: ''
   CinderDellEMCVNXNaviSecCliPath: '/opt/Navisphere/bin/naviseccli'
diff --git a/environments/manila-vnx-config.yaml b/environments/manila-vnx-config.yaml
index 0c9443861e..d1043581f3 100644
--- a/environments/manila-vnx-config.yaml
+++ b/environments/manila-vnx-config.yaml
@@ -12,7 +12,7 @@ parameter_defaults:
   ManilaVNXNasLogin: ''
   ManilaVNXNasPassword: ''
   ManilaVNXNasServer: ''
-  ManilaVNXServerMetaPool: ''
+  ManilaVNXServerContainer: ''
   ManilaVNXShareDataPools: ''
   ManilaVNXEthernetPorts: ''
   ManilaVNXEmcSslCertVerify: false