diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-26 22:04:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-26 22:04:12 +0000 |
| commit | ec99e30c9a61fd18ff4a936646e965bdc125180a (patch) | |
| tree | 5aa4e1888ba58d5b36034101d742baab8ec7ee24 | |
| parent | 527477aa9f200a83d18e63db3937d95f6003bd5c (diff) | |
| parent | 0b0db74aeb799390c4d72a3355d9bf3aa04fd517 (diff) | |
Merge "Allow access to metadata server '/' without IP check"
| -rw-r--r-- | nova/api/metadata/handler.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index f4f6b689c..59a7d030e 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -17,6 +17,7 @@ # under the License. """Metadata request handler.""" +import os import webob.dec import webob.exc @@ -67,6 +68,9 @@ class MetadataRequestHandler(wsgi.Application): if FLAGS.use_forwarded_for: remote_address = req.headers.get('X-Forwarded-For', remote_address) + if os.path.normpath("/" + req.path_info) == "/": + return(base.ec2_md_print(base.VERSIONS + ["latest"])) + try: meta_data = self.get_metadata(remote_address) except Exception: |