CLOUDSTACK-6861: Fixing nfs mount path

(cherry picked from commit a5415d93eb)
This commit is contained in:
Girish Shilamkar 2014-06-17 15:37:25 +05:30 committed by Daan Hoogland
parent 45db2348de
commit f75327239d
1 changed files with 8 additions and 2 deletions

View File

@ -348,7 +348,7 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
nfsurl = secondaryStore.url
from urllib2 import urlparse
parse_url = urlparse.urlsplit(nfsurl, scheme='nfs')
host, path = parse_url.netloc, parse_url.path
host, path = str(parse_url.netloc), str(parse_url.path)
if not config.mgtSvr:
raise Exception(
@ -364,11 +364,17 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
user,
passwd
)
pathSeparator = "" #used to form host:dir format
if not host.endswith(':'):
pathSeparator= ":"
cmds = [
"mkdir -p %s /mnt/tmp",
"mount -t %s %s:%s /mnt/tmp" % (
"mount -t %s %s%s%s /mnt/tmp" % (
'nfs',
host,
pathSeparator,
path,
),
"test -f %s && echo 'snapshot exists'" % (