diff -urN -x .bzr ec2-init.devel/ec2-get-info.py ec2-init.devel-new/ec2-get-info.py --- ec2-init.devel/ec2-get-info.py 2010-01-21 19:19:44.026163466 +0000 +++ ec2-init.devel-new/ec2-get-info.py 2010-01-21 19:47:25.255848702 +0000 @@ -35,26 +35,20 @@ 'public-hostname', 'public-ipv4', 'ramdisk-id', - 'reserveration-id', + 'reservation-id', 'security-groups'] def ec2Version(): - os.system("cat /etc/ec2_version") + print file("/etc/ec2_version").read() def getData(ec2data): api_ver = '2008-02-01' - metadata = None base_url = 'http://169.254.169.254/%s/meta-data' % api_ver - data = urllib.urlopen('%s/%s' %(base_url,ec2data)).read() - print "%s: %s" %(ec2data,data) + print "%s: %s" %(ec2data,urllib.urlopen('%s/%s' %(base_url,ec2data),proxies={}).read()) -def showAllData(ec2Data): - api_ver = '2008-02-01' - metadata = None - base_url = 'http://169.254.169.254/%s/meta-data' % api_ver +def getAllData(ec2Data): for x in ec2Data: - data = urllib.urlopen('%s/%s' %(base_url,x)).read() - print "%s: %s" %(ec2data,data) + getData(x) def main(): usage = "usage: %prog [options]" @@ -116,8 +110,7 @@ if options.ec2: ec2Version() if options.all: - for i in range(0,15): - getData(ec2Data[i]) + getAllData(ec2Data) if __name__ == "__main__": main() diff -urN -x .bzr ec2-init.devel/ec2init/boto_utils.py ec2-init.devel-new/ec2init/boto_utils.py --- ec2-init.devel/ec2init/boto_utils.py 2010-01-21 19:19:44.016153878 +0000 +++ ec2-init.devel-new/ec2init/boto_utils.py 2010-01-21 19:47:22.385849676 +0000 @@ -40,7 +40,7 @@ for i in range(0, 10): try: req = urllib2.Request(url) - resp = urllib2.urlopen(req) + resp = urllib2.urlopen(req,proxies={}) return resp.read() except urllib2.HTTPError, e: # in 2.6 you use getcode(), in 2.5 and earlier you use code diff -urN -x .bzr ec2-init.devel/ec2init/UserDataHandler.py ec2-init.devel-new/ec2init/UserDataHandler.py --- ec2-init.devel/ec2init/UserDataHandler.py 2010-01-21 19:19:44.026163466 +0000 +++ ec2-init.devel-new/ec2init/UserDataHandler.py 2010-01-21 19:47:19.565849739 +0000 @@ -25,7 +25,7 @@ # is just a list of urls, one per line for line in str.splitlines(): if line == "#include": continue - content = urllib.urlopen(line).read() + content = urllib.urlopen(line,proxies={}).read() process_includes(email.message_from_string(decomp_str(content)),parts) def process_includes(msg,parts):