diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-28 20:37:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-28 20:37:22 +0000 |
| commit | 0b99bc205c8ea2a7b1be7edd5d2498cfa7bfece6 (patch) | |
| tree | f5ec2a27e9ea765039fa1753e0f94f325edc23a9 /nova/api | |
| parent | 1ea998649058f78f63a167dd697cf5f6732596ff (diff) | |
| parent | 9f7595aa0f464dc7344e0639951ea731dcfbeca5 (diff) | |
| download | nova-0b99bc205c8ea2a7b1be7edd5d2498cfa7bfece6.tar.gz nova-0b99bc205c8ea2a7b1be7edd5d2498cfa7bfece6.tar.xz nova-0b99bc205c8ea2a7b1be7edd5d2498cfa7bfece6.zip | |
Merge "Fixes bug 942549"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/aggregates.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py index ea90a57d7..583fe1b51 100644 --- a/nova/api/openstack/compute/contrib/aggregates.py +++ b/nova/api/openstack/compute/contrib/aggregates.py @@ -72,7 +72,8 @@ class AggregateController(object): try: aggregate = self.api.create_aggregate(context, name, avail_zone) - except exception.AggregateNameExists: + except (exception.AggregateNameExists, + exception.InvalidAggregateAction): LOG.exception(_("Cannot create aggregate with name %(name)s and " "availability zone %(avail_zone)s") % locals()) raise exc.HTTPConflict |