summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-06-01 17:24:12 -0400
committerScott Moser <smoser@ubuntu.com>2012-06-06 17:08:00 -0400
commit55128d1c5d2ffda769f7b939dfc7dc6af3bf2e97 (patch)
treea08c3dcbbd7edad0f7da0e5e9ed95a7536d1f4f5 /etc
parent7626472ed8eac46f393d7d9ff4d5e8250a4a22b7 (diff)
separate Metadata logic away from the web service
The changes here are coming as a result of starting on blueprint config-drive-v2 [1]. I wanted to separate out the "Metadata" from the "Metadata Server". Thus, the creation of nova/api/metadata/base.py. The InstanceMetadata in base.py contains most of the logic for presenting metadata. As a result, the Metadata webservice in handler.py greatly simplified. This should make it easier to render duplicate data to a config drive. Additional changes here: * a few more tests * removal of the separate 'Versions' handler. Its now replaced by the single handler. Change-Id: I35fcfd8d7f247763954afc0a9f752f629b243e9b
Diffstat (limited to 'etc')
-rw-r--r--etc/nova/api-paste.ini18
1 files changed, 1 insertions, 17 deletions
diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
index be2b37846..a621b759f 100644
--- a/etc/nova/api-paste.ini
+++ b/etc/nova/api-paste.ini
@@ -3,27 +3,11 @@
############
[composite:metadata]
use = egg:Paste#urlmap
-/: metaversions
-/latest: meta
-/1.0: meta
-/2007-01-19: meta
-/2007-03-01: meta
-/2007-08-29: meta
-/2007-10-10: meta
-/2007-12-15: meta
-/2008-02-01: meta
-/2008-09-01: meta
-/2009-04-04: meta
-
-[pipeline:metaversions]
-pipeline = ec2faultwrap logrequest metaverapp
+/: meta
[pipeline:meta]
pipeline = ec2faultwrap logrequest metaapp
-[app:metaverapp]
-paste.app_factory = nova.api.metadata.handler:Versions.factory
-
[app:metaapp]
paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory