summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-10 05:49:36 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-10 05:49:36 -0700
commit953b79702500d129d40b557db668f095c303910d (patch)
treef46ce2c436af76e8b6e818f2484399d316bdedf8
parentc107d10eaf4072769249441dc340c725d77c8112 (diff)
couple more errors in metadata
-rw-r--r--nova/endpoint/cloud.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index bf2f07ad4..c85383ef9 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -114,7 +114,7 @@ class CloudController(object):
'user-data': base64.b64decode(instance_ref['user_data']),
'meta-data': {
'ami-id': instance_ref['image_id'],
- 'ami-launch-index': instance_ref['ami_launch_index'],
+ 'ami-launch-index': instance_ref['launch_index'],
'ami-manifest-path': 'FIXME',
'block-device-mapping': { # TODO(vish): replace with real data
'ami': 'sda1',
@@ -130,7 +130,7 @@ class CloudController(object):
'local-ipv4': address,
'kernel-id': instance_ref['kernel_id'],
'placement': {
- 'availaibility-zone': instance_ref['availability_zone'],
+ 'availability-zone': 'nova' # TODO(vish): real zone
},
'public-hostname': hostname,
'public-ipv4': floating_ip or '',