summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 867f6ce99..aaff8b370 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1183,14 +1183,12 @@ class API(base.Base):
`metadata` argument will be deleted.
"""
- if not delete:
+ if delete:
+ _metadata = metadata
+ else:
_metadata = self.get_instance_metadata(context, instance_id)
_metadata.update(metadata)
- else:
- _metadata = metadata
self._check_metadata_properties_quota(context, _metadata)
-
self.db.instance_metadata_update(context, instance_id, _metadata, True)
-
return _metadata