From cc25d277755f0e103ff09144d1d490536ab9acec Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 15 Mar 2011 15:56:54 -0400
Subject: modifying paste config to support v1.1; adding v1.1 entry in versions
 resource ( GET /)

---
 etc/api-paste.ini              | 1 +
 nova/api/openstack/__init__.py | 7 +++++--
 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"])}}
-- 
cgit