diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-20 01:18:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-20 01:18:16 +0000 |
| commit | 09ab621db77b81864450feec270dbf97631a7eec (patch) | |
| tree | 59d20f0d715656cadb0af630861701c580563a0f | |
| parent | e7e1cfc8ab9792654c8c09f35f8cf98fe463ba66 (diff) | |
| parent | 6ebe7fd5f0c3fbe9b409f643237be837c5266dea (diff) | |
Merge "No stack trace on bad nova aggregate-* command"
| -rw-r--r-- | nova/api/openstack/compute/contrib/aggregates.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py index 54eca8288..9435f5980 100644 --- a/nova/api/openstack/compute/contrib/aggregates.py +++ b/nova/api/openstack/compute/contrib/aggregates.py @@ -73,7 +73,7 @@ class AggregateController(object): aggregate = self.api.create_aggregate(context, name, avail_zone) except (exception.AggregateNameExists, exception.InvalidAggregateAction): - LOG.exception(_("Cannot create aggregate with name %(name)s and " + LOG.info(_("Cannot create aggregate with name %(name)s and " "availability zone %(avail_zone)s") % locals()) raise exc.HTTPConflict return self._marshall_aggregate(aggregate) @@ -85,7 +85,7 @@ class AggregateController(object): try: aggregate = self.api.get_aggregate(context, id) except exception.AggregateNotFound: - LOG.exception(_("Cannot show aggregate: %(id)s") % locals()) + LOG.info(_("Cannot show aggregate: %(id)s") % locals()) raise exc.HTTPNotFound return self._marshall_aggregate(aggregate) @@ -111,7 +111,7 @@ class AggregateController(object): try: aggregate = self.api.update_aggregate(context, id, updates) except exception.AggregateNotFound: - LOG.exception(_("Cannot update aggregate: %(id)s") % locals()) + LOG.info(_("Cannot update aggregate: %(id)s") % locals()) raise exc.HTTPNotFound return self._marshall_aggregate(aggregate) @@ -123,7 +123,7 @@ class AggregateController(object): try: self.api.delete_aggregate(context, id) except exception.AggregateNotFound: - LOG.exception(_("Cannot delete aggregate: %(id)s") % locals()) + LOG.info(_("Cannot delete aggregate: %(id)s") % locals()) raise exc.HTTPNotFound def action(self, req, id, body): @@ -149,12 +149,12 @@ class AggregateController(object): try: aggregate = self.api.add_host_to_aggregate(context, id, host) except (exception.AggregateNotFound, exception.ComputeHostNotFound): - LOG.exception(_("Cannot add host %(host)s in aggregate " + LOG.info(_("Cannot add host %(host)s in aggregate " "%(id)s") % locals()) raise exc.HTTPNotFound except (exception.AggregateHostExists, exception.InvalidAggregateAction): - LOG.exception(_("Cannot add host %(host)s in aggregate " + LOG.info(_("Cannot add host %(host)s in aggregate " "%(id)s") % locals()) raise exc.HTTPConflict return self._marshall_aggregate(aggregate) @@ -167,11 +167,11 @@ class AggregateController(object): try: aggregate = self.api.remove_host_from_aggregate(context, id, host) except (exception.AggregateNotFound, exception.AggregateHostNotFound): - LOG.exception(_("Cannot remove host %(host)s in aggregate " + LOG.info(_("Cannot remove host %(host)s in aggregate " "%(id)s") % locals()) raise exc.HTTPNotFound except exception.InvalidAggregateAction: - LOG.exception(_("Cannot remove host %(host)s in aggregate " + LOG.info(_("Cannot remove host %(host)s in aggregate " "%(id)s") % locals()) raise exc.HTTPConflict return self._marshall_aggregate(aggregate) @@ -191,7 +191,7 @@ class AggregateController(object): aggregate = self.api.update_aggregate_metadata(context, id, metadata) except exception.AggregateNotFound: - LOG.exception(_("Cannot set metadata %(metadata)s in aggregate " + LOG.info(_("Cannot set metadata %(metadata)s in aggregate " "%(id)s") % locals()) raise exc.HTTPNotFound |