summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-17 15:38:39 +0000
committerGerrit Code Review <review@openstack.org>2015-06-17 15:38:39 +0000
commit69cbda4d00b1a5e6072e8dc307db41b9898435e6 (patch)
treec01fd1e4efb8a0b9206fab9cb00a433d2786e07e
parent99f5809326647c3082b6c2d053358afa5bcdab50 (diff)
parent081f9226e46ba801ba7be8024aebb967aba7f2e9 (diff)
Merge "Fix incompatiblity issue in VNX manila driver"1.0.0a0
-rw-r--r--manila/share/drivers/emc/plugins/vnx/helper.py2
-rw-r--r--manila/tests/share/drivers/emc/plugins/vnx/test_emc_vnx.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/manila/share/drivers/emc/plugins/vnx/helper.py b/manila/share/drivers/emc/plugins/vnx/helper.py
index cf2cd38..b6e017b 100644
--- a/manila/share/drivers/emc/plugins/vnx/helper.py
+++ b/manila/share/drivers/emc/plugins/vnx/helper.py
@@ -1259,7 +1259,7 @@ class NASCommandHelper(object):
1259 share_path = '/' + share_name 1259 share_path = '/' + share_name
1260 create_nfs_share_cmd = [ 1260 create_nfs_share_cmd = [
1261 'env', 'NAS_DB=/nas', '/nas/bin/server_export', mover_name, 1261 'env', 'NAS_DB=/nas', '/nas/bin/server_export', mover_name,
1262 '-option', 'rw=-*.*.*.*,root=-*.*.*.*,access=-*.*.*.*', 1262 '-option', 'rw=-0.0.0.0,root=-0.0.0.0,access=-0.0.0.0',
1263 share_path, 1263 share_path,
1264 ] 1264 ]
1265 1265
diff --git a/manila/tests/share/drivers/emc/plugins/vnx/test_emc_vnx.py b/manila/tests/share/drivers/emc/plugins/vnx/test_emc_vnx.py
index 46e9b3e..e00806c 100644
--- a/manila/tests/share/drivers/emc/plugins/vnx/test_emc_vnx.py
+++ b/manila/tests/share/drivers/emc/plugins/vnx/test_emc_vnx.py
@@ -184,7 +184,7 @@ disks = d7
184 184
185 @staticmethod 185 @staticmethod
186 def create_nfs_export(vdm_name, path): 186 def create_nfs_export(vdm_name, path):
187 default_access = "rw=-*.*.*.*,root=-*.*.*.*,access=-*.*.*.*" 187 default_access = "rw=-0.0.0.0,root=-0.0.0.0,access=-0.0.0.0"
188 return [ 188 return [
189 'env', 'NAS_DB=/nas', '/nas/bin/server_export', vdm_name, 189 'env', 'NAS_DB=/nas', '/nas/bin/server_export', vdm_name,
190 '-option', default_access, 190 '-option', default_access,