summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-18 18:45:35 +0000
committerGerrit Code Review <review@openstack.org>2012-07-18 18:45:35 +0000
commit1cc28ed65bae2b48bb856a07e747ba06de620692 (patch)
tree562721682e0df26baa6c7adeb6a9c48e0adb822d /nova/api
parent8a54a9fee3e96c4f43f3f293fda9f6844db5cfc7 (diff)
parentfafd1f1651907b9c57a8b944ea70f350e1b244a6 (diff)
downloadnova-1cc28ed65bae2b48bb856a07e747ba06de620692.tar.gz
nova-1cc28ed65bae2b48bb856a07e747ba06de620692.tar.xz
nova-1cc28ed65bae2b48bb856a07e747ba06de620692.zip
Merge "Show all absolute quota limits in /limits."
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/views/limits.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/views/limits.py b/nova/api/openstack/compute/views/limits.py
index 1c3590984..22e0272ad 100644
--- a/nova/api/openstack/compute/views/limits.py
+++ b/nova/api/openstack/compute/views/limits.py
@@ -47,6 +47,10 @@ class ViewBuilder(object):
"ram": ["maxTotalRAMSize"],
"instances": ["maxTotalInstances"],
"cores": ["maxTotalCores"],
+ "gigabytes": ["maxTotalVolumeGigabytes"],
+ "volumes": ["maxTotalVolumes"],
+ "key_pairs": ["maxTotalKeypairs"],
+ "floating_ips": ["maxTotalFloatingIps"],
"metadata_items": ["maxServerMeta", "maxImageMeta"],
"injected_files": ["maxPersonality"],
"injected_file_content_bytes": ["maxPersonalitySize"],