Merge branch 'master' of github.com:cernvm/amiconfig

hepix/commands/amiconfig.sh

@@ -482,6 +482,8 @@ Main() {
   case "$MODE" in
     user)
       RunUserDataScript before
+      # Hack: read meta-data from HTTP, user-data locally to include extra user data
+      export AMICONFIG_EC2_USER_DATA_URL="file:$(dirname ${AMICONFIG_LOCAL_USER_DATA})"
       $AMICONFIG 2>&1 #| $PIPELOGGER
       RunUserDataScript after
       mkdir -p `dirname "$AMI_DONE_USER"`

rpath/amiconfig/instancedata.py

@@ -42,6 +42,20 @@ def open(self, path):
         return results
 
     def read(self, path):
+        ec2_user_data_url = os.getenv("AMICONFIG_EC2_USER_DATA_URL")
+        if ec2_user_data_url is not None:
+            try:
+                results = urllib.urlopen('%s/user-data' % (ec2_user_data_url))
+            except Exception, e:
+                raise EC2DataRetrievalError, '[Errno %s] %s' % (e.errno, e.strerror)
+            if results.headers.gettype() == 'text/html':
+                # Eucalyptus returns text/html and no Server: header
+                # We want to protect ourselves from HTTP servers returning real
+                # HTML, so let's hope at least they're conformant and return a
+                # Server: header
+                if 'server' in results.headers:
+                    raise EC2DataRetrievalError, '%s' % results.read()
+            return results.read()
         return self.open(path).read()
 
     def getUserData(self):