diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2011-03-11 21:40:51 +0000 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2011-03-11 21:40:51 +0000 |
| commit | 0eb3fefea2dbf53bdc9cc4d6b5f9682a32b346d4 (patch) | |
| tree | 7f8726868c335846807f138724283a60147c6fc7 | |
| parent | 9dbf8e31961c2b32945e7f91be7727d9ab0f2c33 (diff) | |
| parent | 271692fd80aaf3a045849ef8a87060e15ab8c69e (diff) | |
| download | nova-0eb3fefea2dbf53bdc9cc4d6b5f9682a32b346d4.tar.gz nova-0eb3fefea2dbf53bdc9cc4d6b5f9682a32b346d4.tar.xz nova-0eb3fefea2dbf53bdc9cc4d6b5f9682a32b346d4.zip | |
merge trunk
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 | ||||
| -rw-r--r-- | nova/virt/disk.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index b1917e9ea..cadda97db 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -562,7 +562,7 @@ class CloudController(object): if context.is_admin: v['status'] = '%s (%s, %s, %s, %s)' % ( volume['status'], - volume['user_id'], + volume['project_id'], volume['host'], instance_data, volume['mountpoint']) diff --git a/nova/virt/disk.py b/nova/virt/disk.py index 5d499c42c..9abe44cc3 100644 --- a/nova/virt/disk.py +++ b/nova/virt/disk.py @@ -189,4 +189,4 @@ def _inject_net_into_fs(net, fs): utils.execute('sudo', 'chown', 'root:root', netdir) utils.execute('sudo', 'chmod', 755, netdir) netfile = os.path.join(netdir, 'interfaces') - utils.execute('sudo', 'tee', netfile, net) + utils.execute('sudo', 'tee', netfile, process_input=net) |