Add logging

os_collect_config/collect.py

@@ -16,6 +16,7 @@
 import httplib2
 import json
 
+from openstack.common import log
 from os_collect_config import exc
 
 
@@ -28,10 +29,9 @@ def _fetch_metadata(sub_url):
     global h
     try:
         (resp, content) = h.request('%s%s' % (EC2_METADATA_URL, sub_url))
-    except httplib2.socks.HTTPError:
+    except httplib2.socks.HTTPError as e:
+        log.getLogger().warn(e)
         raise exc.Ec2MetadataNotAvailable
-    if resp.status != 200:
-        raise Exception('Error fetching %s' % sub_url)
     if sub_url[-1] == '/':
         new_content = {}
         for subkey in content.split("\n"):
@@ -50,6 +50,7 @@ def collect_ec2():
 
 
 def __main__():
+    log.setup("os-collect-config")
     print json.dumps(collect_ec2(), indent=1)
 
 

requirements.txt

@@ -1,5 +1,9 @@
 anyjson
 argparse
 d2to1
+eventlet>=0.12.0
 httplib2
+iso8601>=0.1.4
+oslo.config>=1.1.0
 pbr
+six