summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-08-22 17:35:43 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-08-22 17:35:43 -0400
commit0a9a6db83aca1f84b6e7943edd492e9fbc066063 (patch)
tree19b7b803be309498c40f1271b7e4f06daa4626cc /nova/utils.py
parent77f15157c5ca7013df397abc22a8866cce02976d (diff)
parent71f039b936aabb7381b0423e743da65f1475fb35 (diff)
downloadnova-0a9a6db83aca1f84b6e7943edd492e9fbc066063.tar.gz
nova-0a9a6db83aca1f84b6e7943edd492e9fbc066063.tar.xz
nova-0a9a6db83aca1f84b6e7943edd492e9fbc066063.zip
merged trunk
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py
index b42f76457..f6e98c2eb 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -295,7 +295,7 @@ EASIER_PASSWORD_SYMBOLS = ('23456789' # Removed: 0, 1
def usage_from_instance(instance_ref, **kw):
usage_info = dict(
- tenant_id=instance_ref['project_id'],
+ project_id=instance_ref['project_id'],
user_id=instance_ref['user_id'],
instance_id=instance_ref['id'],
instance_type=instance_ref['instance_type']['name'],