diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-26 17:14:28 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-26 17:14:28 -0700 |
| commit | 754db8ef1ceb84fa9a1f44bfc6c5c6bbd99cd7e1 (patch) | |
| tree | 160984a03f0d27a8ff4dff9b5e12a8243fd9fe91 /nova/compute | |
| parent | cacca7df569e396d76112693aab62c95d51ff035 (diff) | |
| download | nova-754db8ef1ceb84fa9a1f44bfc6c5c6bbd99cd7e1.tar.gz nova-754db8ef1ceb84fa9a1f44bfc6c5c6bbd99cd7e1.tar.xz nova-754db8ef1ceb84fa9a1f44bfc6c5c6bbd99cd7e1.zip | |
renamed xxxservice to service
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/service.py (renamed from nova/compute/computeservice.py) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/computeservice.py b/nova/compute/service.py index 5568e3888..02e35baa2 100644 --- a/nova/compute/computeservice.py +++ b/nova/compute/service.py @@ -49,7 +49,7 @@ from nova.compute import disk from nova.compute import model from nova.compute import network from nova.objectstore import image # for image_path flag -from nova.volume import volumeservice +from nova.volume import service as volume_service FLAGS = flags.FLAGS @@ -221,7 +221,7 @@ class ComputeService(service.Service): @exception.wrap_exception def attach_volume(self, instance_id = None, volume_id = None, mountpoint = None): - volume = volumeservice.get_volume(volume_id) + volume = volume_service.get_volume(volume_id) yield self._init_aoe() yield process.simple_execute( "sudo virsh attach-disk %s /dev/etherd/%s %s" % @@ -242,7 +242,7 @@ class ComputeService(service.Service): """ detach a volume from an instance """ # despite the documentation, virsh detach-disk just wants the device # name without the leading /dev/ - volume = volumeservice.get_volume(volume_id) + volume = volume_service.get_volume(volume_id) target = volume['mountpoint'].rpartition('/dev/')[2] yield process.simple_execute( "sudo virsh detach-disk %s %s " % (instance_id, target)) |