summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-11 18:16:10 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-11 18:16:10 -0700
commit06a799d2668723bbaead7ca2afbfb4b0cbf28abb (patch)
tree7f2a1e65a9cb86046bf605be774af606b94f6289
parente21c310ced6992cf2eb33b372cd4e5e69a79d140 (diff)
downloadnova-06a799d2668723bbaead7ca2afbfb4b0cbf28abb.tar.gz
nova-06a799d2668723bbaead7ca2afbfb4b0cbf28abb.tar.xz
nova-06a799d2668723bbaead7ca2afbfb4b0cbf28abb.zip
use a string version of key name when constructing mpi dict because None doesn't work well in lookup
-rw-r--r--nova/endpoint/cloud.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index 622b4e2a4..45291ca34 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -88,10 +88,11 @@ class CloudController(object):
if instance['fixed_ip']:
line = '%s slots=%d' % (instance['fixed_ip']['str_id'],
INSTANCE_TYPES[instance['instance_type']]['vcpus'])
- if instance['key_name'] in result:
- result[instance['key_name']].append(line)
+ key = str(instance['key_name'])
+ if key in result:
+ result[key].append(line)
else:
- result[instance['key_name']] = [line]
+ result[key] = [line]
return result
def get_metadata(self, address):