openstack/nova
Code Issues Proposed changes

Merge "Don't change the default attach-method"

Browse Source
This commit is contained in:
Jenkins 2013-10-12 02:32:54 +00:00 committed by Gerrit Code Review
commit 8d8798efff
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/fakeguestfs.py
View File

@ -24,7 +24,6 @@ class GuestFS(object):
self.mounts = []
self.files = {}
self.auginit = False
self.attach_method = 'libvirt'
self.root_mounted = False
def launch(self):
@ -41,12 +40,6 @@ class GuestFS(object):
def add_drive_opts(self, file, *args, **kwargs):
self.drives.append((file, kwargs['format']))
def get_attach_method(self):
return self.attach_method
def set_attach_method(self, attach_method):
self.attach_method = attach_method
def inspect_os(self):
return ["/dev/guestvgf/lv_root"]

4
nova/virt/disk/vfs/guestfs.py
View File

@ -21,7 +21,6 @@ from nova import exception
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova.virt.disk.vfs import api as vfs
from nova.virt.libvirt import driver as libvirt_driver
LOG = logging.getLogger(__name__)
@ -113,9 +112,6 @@ class VFSGuestFS(vfs.VFS):
try:
self.handle.add_drive_opts(self.imgfile, format=self.imgfmt)
if self.handle.get_attach_method() == 'libvirt':
libvirt_url = 'libvirt:' + libvirt_driver.LibvirtDriver.uri()
self.handle.set_attach_method(libvirt_url)
self.handle.launch()
self.setup_os()