diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-02-18 14:15:04 +0900 |
|---|---|---|
| committer | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-02-18 14:15:04 +0900 |
| commit | d88d74c9a0a28e0ebd6cedf694753b9ee9decdac (patch) | |
| tree | 8f44c51cea4ff9ca171a4d7b133223956a166c26 /nova/virt | |
| parent | ea5e1b141c787053bab273e127f986800cb1712b (diff) | |
fixed based on reviewer's comment.
1. erase wrapper function(remove/exists/mktempfile) from nova.utils.
2. nova-manage service describeresource(->describe_resource)
3. nova-manage service updateresource(->update_resource)
4. erase "my mistake print" statement
Additional changes are made at:
1. nova.image.s3.show
2. nova.compute.api.create
that's because instances cannot launched without this changes.
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/disk.py | 1 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/disk.py b/nova/virt/disk.py index ec4acc452..c5565abfa 100644 --- a/nova/virt/disk.py +++ b/nova/virt/disk.py @@ -112,7 +112,6 @@ def inject_data(image, key=None, net=None, partition=None, nbd=False): def _link_device(image, nbd): """Link image to device using loopback or nbd""" - print '_link_device:0:', nbd, '::', image if nbd: device = _allocate_device() utils.execute('sudo qemu-nbd -c %s %s' % (device, image)) diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 9b7a9ddbe..579c4593e 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -977,7 +977,7 @@ class LibvirtConnection(object): """ Update compute manager resource info on Service table. This method is called when nova-coompute launches, and - whenever admin executes "nova-manage service updateresource". + whenever admin executes "nova-manage service update_resource". """ try: |