summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-06-24 19:08:26 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-06-24 19:08:26 +0900
commitce3b1ffec9bab02e2988b69e7e361d76e56ec002 (patch)
tree2f480b2f2cc8b1fef6945f40f5329c4ea0f41fb7
parentc0a750757b2b6121bb04c6355a01cb31967c15e2 (diff)
downloadnova-ce3b1ffec9bab02e2988b69e7e361d76e56ec002.tar.gz
nova-ce3b1ffec9bab02e2988b69e7e361d76e56ec002.tar.xz
nova-ce3b1ffec9bab02e2988b69e7e361d76e56ec002.zip
ec2/cloud: typo
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index b6274df0d..a0a7db1f2 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -943,7 +943,7 @@ class CloudController(object):
i['amiLaunchIndex'] = instance['launch_index']
i['displayName'] = instance['display_name']
i['displayDescription'] = instance['display_description']
- i['rootDeviceName'] = (instance['root_device_name'] or
+ i['rootDeviceName'] = (instance.get('root_device_name') or
_DEFAULT_ROOT_DEVICE_NAME)
self._format_instance_bdm(context, instance_id,
i['rootDeviceName'], i)