summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-03-15 18:14:38 -0400
committerNaveed Massjouni <naveedm9@gmail.com>2011-03-15 18:14:38 -0400
commitd4f859803eeb5a123835a3996ccfc64d35dbcb4b (patch)
tree1e9997f43a64c4b057d3a7fc86808456534c0185
parent74068a7b504a95dc8e0339faa04c8c5520417f32 (diff)
parentcc25d277755f0e103ff09144d1d490536ab9acec (diff)
downloadnova-d4f859803eeb5a123835a3996ccfc64d35dbcb4b.tar.gz
nova-d4f859803eeb5a123835a3996ccfc64d35dbcb4b.tar.xz
nova-d4f859803eeb5a123835a3996ccfc64d35dbcb4b.zip
Updating paste config.
-rw-r--r--etc/api-paste.ini1
-rw-r--r--nova/api/openstack/__init__.py7
2 files changed, 6 insertions, 2 deletions
diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index 9f7e93d4c..a4483d3f8 100644
--- a/etc/api-paste.ini
+++ b/etc/api-paste.ini
@@ -68,6 +68,7 @@ paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.f
use = egg:Paste#urlmap
/: osversions
/v1.0: openstackapi
+/v1.1: openstackapi
[pipeline:openstackapi]
pipeline = faultwrap auth ratelimit osapiapp
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index ce3cff337..0244bc93c 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -128,8 +128,11 @@ class Versions(wsgi.Application):
def __call__(self, req):
"""Respond to a request for all OpenStack API versions."""
response = {
- "versions": [
- dict(status="CURRENT", id="v1.0")]}
+ "versions": [
+ dict(status="DEPRECATED", id="v1.0"),
+ dict(status="CURRENT", id="v1.1"),
+ ],
+ }
metadata = {
"application/xml": {
"attributes": dict(version=["status", "id"])}}