summaryrefslogtreecommitdiff
path: root/nova/virt/disk/mount/api.py
diff options
context:
space:
mode:
authorEugene Nikanorov <enikanorov@mirantis.com>2013-07-04 18:06:53 +0400
committerEugene Nikanorov <enikanorov@mirantis.com>2013-07-14 20:56:10 +0400
commit03df827e7870851ddb28add8b6b9cad1a812f81a (patch)
treee420fd66a396fbdaf1c5625fca2849c54c371eb6 /nova/virt/disk/mount/api.py
parent77a66a248bfa42bd7df1ac11e5e5581c50c8bbc0 (diff)
Remove locals() from virt directory
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Mark McLoughlin <markmc@redhat.com> Verified+1: SmokeStack Approved+1: Michael Still <mikal@stillhq.com> Code-Review+2: Michael Still <mikal@stillhq.com> Submitted-by: Jenkins Submitted-at: Mon, 15 Jul 2013 10:07:22 +0000 Reviewed-on: https://review.openstack.org/35657 Project: openstack/nova Branch: refs/heads/master
Diffstat (limited to 'nova/virt/disk/mount/api.py')
-rw-r--r--nova/virt/disk/mount/api.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/virt/disk/mount/api.py b/nova/virt/disk/mount/api.py
index 85e1d10..7c442fd 100644
--- a/nova/virt/disk/mount/api.py
+++ b/nova/virt/disk/mount/api.py
@@ -40,7 +40,9 @@ class Mount(object):
40 def instance_for_format(imgfile, mountdir, partition, imgfmt): 40 def instance_for_format(imgfile, mountdir, partition, imgfmt):
41 LOG.debug(_("Instance for format imgfile=%(imgfile)s " 41 LOG.debug(_("Instance for format imgfile=%(imgfile)s "
42 "mountdir=%(mountdir)s partition=%(partition)s " 42 "mountdir=%(mountdir)s partition=%(partition)s "
43 "imgfmt=%(imgfmt)s") % locals()) 43 "imgfmt=%(imgfmt)s"),
44 {'imgfile': imgfile, 'mountdir': mountdir,
45 'partition': partition, 'imgfmt': imgfmt})
44 if imgfmt == "raw": 46 if imgfmt == "raw":
45 LOG.debug(_("Using LoopMount")) 47 LOG.debug(_("Using LoopMount"))
46 return importutils.import_object( 48 return importutils.import_object(
@@ -56,7 +58,9 @@ class Mount(object):
56 def instance_for_device(imgfile, mountdir, partition, device): 58 def instance_for_device(imgfile, mountdir, partition, device):
57 LOG.debug(_("Instance for device imgfile=%(imgfile)s " 59 LOG.debug(_("Instance for device imgfile=%(imgfile)s "
58 "mountdir=%(mountdir)s partition=%(partition)s " 60 "mountdir=%(mountdir)s partition=%(partition)s "
59 "device=%(device)s") % locals()) 61 "device=%(device)s"),
62 {'imgfile': imgfile, 'mountdir': mountdir,
63 'partition': partition, 'device': device})
60 if "loop" in device: 64 if "loop" in device:
61 LOG.debug(_("Using LoopMount")) 65 LOG.debug(_("Using LoopMount"))
62 return importutils.import_object( 66 return importutils.import_object(