From 8920181a0d8cfb4f78af0fa0b868e864d8971744 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Fri, 9 Dec 2011 11:16:04 -0500
Subject: Use more informative message when violating quota

Fixes bug 902218

Change-Id: I185ee726358876c074725f5297da5cedc761ec55
---
 nova/api/openstack/v2/servers.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/v2/servers.py b/nova/api/openstack/v2/servers.py
index f41ed9467..b149c2cf9 100644
--- a/nova/api/openstack/v2/servers.py
+++ b/nova/api/openstack/v2/servers.py
@@ -165,8 +165,11 @@ class Controller(wsgi.Controller):
                     _("Personality file path too long"),
             "OnsetFileContentLimitExceeded":
                     _("Personality file content too long"),
-            "InstanceLimitExceeded":
-                    _("Instance quotas have been exceeded")}
+
+            # NOTE(bcwaldon): expose the message generated below in order
+            # to better explain how the quota was exceeded
+            "InstanceLimitExceeded": error.message,
+        }
 
         expl = code_mappings.get(error.code)
         if expl:
-- 
cgit