diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/flavormanage.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index 3fe9bc669..547760e94 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -66,9 +66,12 @@ class FlavorManageController(wsgi.Controller): swap = vals.get('swap') rxtx_factor = vals.get('rxtx_factor') - flavor = instance_types.create(name, memory_mb, vcpus, - root_gb, ephemeral_gb, flavorid, - swap, rxtx_factor) + try: + flavor = instance_types.create(name, memory_mb, vcpus, + root_gb, ephemeral_gb, flavorid, + swap, rxtx_factor) + except exception.InstanceTypeExists as err: + raise webob.exc.HTTPConflict(explanation=str(err)) return self._view_builder.show(req, flavor) |