summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-12-02 10:08:56 -0600
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-12-02 10:08:56 -0600
commit3af6da1fa5a38c8238ea45a7b03a6e3fbb78fe5b (patch)
tree4ca43ad16ac0b7f5d430b8c71c5f599ff4a0a5c7 /nova/compute
parentf8afbcc08b65d4d6764a6dc66c804816573ab3b4 (diff)
Default Instance.display_name to a value even when None is explicitly passed in.
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index e826bdaa2..c4a90e604 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -102,7 +102,7 @@ class ComputeManager(manager.Manager):
instance_ref = self.db.instance_create(context, kwargs)
inst_id = instance_ref['id']
# Set sane defaults if not specified
- if 'display_name' not in kwargs:
+ if kwargs.get('display_name') is None:
display_name = "Server %s" % instance_ref['internal_id']
instance_ref['display_name'] = display_name
self.db.instance_update(context, inst_id,