diff --git a/nova/exception.py b/nova/exception.py
index 7a5c52393331..d1780349a54b 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -620,6 +620,11 @@ class ImageBadRequest(Invalid):
                 "%(response)s")
 
 
+class ImageQuotaExceeded(NovaException):
+    msg_fmt = _("Quota exceeded or out of space for image %(image_id)s "
+                "in the image service.")
+
+
 class InstanceUnacceptable(Invalid):
     msg_fmt = _("Instance %(instance_id)s is unacceptable: %(reason)s")
 
diff --git a/nova/image/glance.py b/nova/image/glance.py
index b2c5f9ae0595..5c25bd4e41d6 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -938,6 +938,8 @@ def _translate_image_exception(image_id, exc_value):
     if isinstance(exc_value, glanceclient.exc.BadRequest):
         return exception.ImageBadRequest(image_id=image_id,
                                          response=six.text_type(exc_value))
+    if isinstance(exc_value, glanceclient.exc.HTTPOverLimit):
+        return exception.ImageQuotaExceeded(image_id=image_id)
     return exc_value
 
 
diff --git a/nova/tests/unit/image/test_glance.py b/nova/tests/unit/image/test_glance.py
index c5e714c1b0af..59f5710d4929 100644
--- a/nova/tests/unit/image/test_glance.py
+++ b/nova/tests/unit/image/test_glance.py
@@ -305,6 +305,11 @@ class TestExceptionTranslations(test.NoDBTestCase):
         out_exc = glance._translate_image_exception('123', in_exc)
         self.assertIsInstance(out_exc, exception.ImageNotFound)
 
+    def test_client_httpoverlimit_converts_to_imagequotaexceeded(self):
+        in_exc = glanceclient.exc.HTTPOverLimit('123')
+        out_exc = glance._translate_image_exception('123', in_exc)
+        self.assertIsInstance(out_exc, exception.ImageQuotaExceeded)
+
 
 class TestGlanceSerializer(test.NoDBTestCase):
     def test_serialize(self):