remove dead/unused code, call this 0.5.0

2 files changed, 0 insertions, 34 deletions

diff --git a/ec2init/DataSourceEc2.py b/ec2init/DataSourceEc2.py
index cdea0b3e..c7415c0a 100644
--- a/ec2init/DataSourceEc2.py
+++ b/ec2init/DataSourceEc2.py
@@ -9,7 +9,6 @@ import cPickle
 
 class DataSourceEc2(DataSource.DataSource):
     api_ver  = '2009-04-04'
-    conffile = '/etc/ec2-init/ec2-config.cfg'
     cachedir = ec2init.cachedir + '/ec2'
 
     location_locale_map = { 
@@ -47,31 +46,6 @@ class DataSourceEc2(DataSource.DataSource):
     def get_instance_id(self):
         return(self.metadata['instance-id'])
 
-    def wait_or_bail(self):
-        if self.wait_for_metadata_service():
-            return True
-        else:
-            bailout_command = self.get_cfg_option_str('bailout_command')
-            if bailout_command:
-                os.system(bailout_command)
-            return False
-
-    def get_cfg_option_str(self, key, default=None):
-        return self.config.get(key, default)
-
-    def get_ssh_keys(self):
-        conn = urllib2.urlopen('%s/public-keys/' % self.meta_data_base_url)
-        data = conn.read()
-        keyids = [line.split('=')[0] for line in data.split('\n')]
-        return [urllib2.urlopen('%s/public-keys/%d/openssh-key' % (self.meta_data_base_url, int(keyid))).read().rstrip() for keyid in keyids]
-
-#    def get_userdata(self):
-#        return boto.utils.get_instance_userdata()
-#
-#    def get_instance_metadata(self):
-#        self.instance_metadata = getattr(self, 'instance_metadata', boto.utils.get_instance_metadata())
-#        return self.instance_metadata 
-
     def get_availability_zone(self):
         return(self.metadata['placement']['availability-zone'])
 
@@ -118,13 +92,6 @@ class DataSourceEc2(DataSource.DataSource):
                 #timeout = timeout * 2
         return False
 
-    def get_location_from_availability_zone(self, availability_zone):
-        if availability_zone.startswith('us-'):
-            return 'us'
-        elif availability_zone.startswith('eu-'):
-            return 'eu'
-        raise Exception('Could not determine location')
-
     def get_public_ssh_keys(self):
         keys = []
         if not self.metadata.has_key('public-keys'): return([])
diff --git a/ec2init/__init__.py b/ec2init/__init__.py
index 270414f7..d9d24969 100644
--- a/ec2init/__init__.py
+++ b/ec2init/__init__.py
@@ -82,7 +82,6 @@ class EC2Init:
                     self.datasource = s
                     return
             except Exception as e:
-                print e
                 pass
         raise Exception("Could not find data source")