apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

LOUDSTACK-6861: Fixing nfs mount path

Browse Source
This commit is contained in:
Girish Shilamkar 2014-06-17 15:37:25 +05:30
parent 7e355de365
commit e054154ca0
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/marvin/marvin/lib/utils.py
View File

@ -315,7 +315,7 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
nfsurl = secondaryStore.url nfsurl = secondaryStore.url
from urllib2 import urlparse from urllib2 import urlparse
parse_url = urlparse.urlsplit(nfsurl, scheme='nfs') 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: if not config.mgtSvr:
raise Exception("Your marvin configuration does not contain mgmt server credentials") raise Exception("Your marvin configuration does not contain mgmt server credentials")
@ -328,17 +328,24 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
user, user,
passwd passwd
) )
pathSeparator = "" #used to form host:dir format
if not host.endswith(':'):
pathSeparator= ":"
cmds = [ cmds = [
"mkdir -p %s /mnt/tmp",
"mount -t %s %s%s /mnt/tmp" % ( "mkdir -p %s /mnt/tmp",
'nfs', "mount -t %s %s%s%s /mnt/tmp" % (
host, 'nfs',
path, host,
), pathSeparator,
"test -f %s && echo 'snapshot exists'" % ( path,
os.path.join("/mnt/tmp", snapshotPath) ),
), "test -f %s && echo 'snapshot exists'" % (
] os.path.join("/mnt/tmp", snapshotPath)
),
]
for c in cmds: for c in cmds:
result = ssh_client.execute(c) result = ssh_client.execute(c)