diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-08-16 11:31:08 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-08-16 11:31:08 -0400 |
| commit | d3becc6a0c99fb73637e7fdb89540fd8c4b48be2 (patch) | |
| tree | 3fed37860ec9c54f8e10ebb56ee47f8c5b9122be /nova/api | |
| parent | 5278d7e7a28b49ef1d7acafa9283360b0b33a725 (diff) | |
| parent | 7e4d35db17a6d129fe9cbfd3d4ffaeb96fd1fc69 (diff) | |
| download | nova-d3becc6a0c99fb73637e7fdb89540fd8c4b48be2.tar.gz nova-d3becc6a0c99fb73637e7fdb89540fd8c4b48be2.tar.xz nova-d3becc6a0c99fb73637e7fdb89540fd8c4b48be2.zip | |
merge from trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 87bba58c3..9aebf92e3 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -305,7 +305,7 @@ class CloudController(object): 'hostname': hostname, 'instance-action': 'none', 'instance-id': ec2_id, - 'instance-type': instance_ref['instance_type'], + 'instance-type': instance_ref['instance_type']['name'], 'local-hostname': hostname, 'local-ipv4': address, 'placement': {'availability-zone': availability_zone}, |