diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-09 11:10:14 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-09 11:10:14 -0400 |
| commit | d72e36d63b1aefe7731d5c832c2b2fa52227407c (patch) | |
| tree | 2563f056dd646ee1826c58bfe40700e7f1cdc8c8 /nova/compute | |
| parent | ed4a3b33647d3cbf5b1733596c1e180078e23cb0 (diff) | |
making usage of 'delete' argument more clear
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 8 |
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 |