diff options
| author | Scott Moser <smoser@nelson> | 2010-01-07 16:07:01 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@nelson> | 2010-01-07 16:07:01 -0500 |
| commit | 49d3df468a94fef41a036dfa5d886449d180e006 (patch) | |
| tree | 45dccadb6bef5621eac2d692e893e6ff8aeccae8 /ec2init/DataSourceEc2.py | |
| parent | 44e69ea67e75241dce3230f755c13ab602a5ea9b (diff) | |
| download | vyos-cloud-init-49d3df468a94fef41a036dfa5d886449d180e006.tar.gz vyos-cloud-init-49d3df468a94fef41a036dfa5d886449d180e006.zip | |
functional state now in kvm tests
supports user data as mime-multipart and handling types of
text/x-shellscript - execute at rc.local
text/cloud-config - feed to cloud config
text/upstart-job - add to /etc/init as upstart job
text/x-include-url - include urls as if they were in-line
Diffstat (limited to 'ec2init/DataSourceEc2.py')
| -rw-r--r-- | ec2init/DataSourceEc2.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ec2init/DataSourceEc2.py b/ec2init/DataSourceEc2.py index 8ee92d29..cc12c97c 100644 --- a/ec2init/DataSourceEc2.py +++ b/ec2init/DataSourceEc2.py @@ -24,7 +24,7 @@ class DataSourceEc2(DataSource.DataSource): def __init__(self): self.meta_data_base_url = 'http://169.254.169.254/%s/meta-data' % self.api_ver - self.user_data_base_url = 'http://169.254.169.254/%s/user-data' % self.api_ver + self.userdata_base_url = 'http://169.254.169.254/%s/user-data' % self.api_ver def get_data(self): try: @@ -49,6 +49,9 @@ class DataSourceEc2(DataSource.DataSource): print e return False + def get_instance_id(self): + return(self.metadata['instance-id']) + def wait_or_bail(self): if self.wait_for_metadata_service(): return True @@ -67,7 +70,7 @@ class DataSourceEc2(DataSource.DataSource): 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_user_data(self): +# def get_userdata(self): # return boto.utils.get_instance_userdata() # # def get_instance_metadata(self): |