diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-30 07:36:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-30 07:36:35 +0000 |
| commit | 7284dca72a5adb29b3e3e67ffec1c0821f12d7fb (patch) | |
| tree | d5c7e8780a83019da6395b16481180a373528177 /nova/api | |
| parent | 2377d6a7b6b275febdf57b345c72a402254eb925 (diff) | |
| parent | 3db7a943bebbda5fea07fc80813cabc436fb892b (diff) | |
Merge "Fixes error message for flavor-create duplicate ID"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/flavormanage.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index 69d5d6ed9..e8ac4d522 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -73,7 +73,8 @@ class FlavorManageController(wsgi.Controller): root_gb, ephemeral_gb, flavorid, swap, rxtx_factor, is_public) req.cache_db_flavor(flavor) - except exception.InstanceTypeExists as err: + except (exception.InstanceTypeExists, + exception.InstanceTypeIdExists) as err: raise webob.exc.HTTPConflict(explanation=str(err)) return self._view_builder.show(req, flavor) |