diff options
| author | harlowja <harlowja@virtualbox.rhel> | 2013-02-21 22:39:30 -0800 |
|---|---|---|
| committer | harlowja <harlowja@virtualbox.rhel> | 2013-02-21 22:39:30 -0800 |
| commit | 9dfb60d3144860334ab1ad1d72920d962139461f (patch) | |
| tree | 59b8b37a26cbf9ababc49428fd7488340daff60d /cloudinit/sources/DataSourceEc2.py | |
| parent | 6d40d5b2e3da9577d4a2686444d47125e62817fe (diff) | |
| download | vyos-cloud-init-9dfb60d3144860334ab1ad1d72920d962139461f.tar.gz vyos-cloud-init-9dfb60d3144860334ab1ad1d72920d962139461f.zip | |
More work on requests integration.
Diffstat (limited to 'cloudinit/sources/DataSourceEc2.py')
| -rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 47f677d4..eee4e6bc 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -64,8 +64,10 @@ class DataSourceEc2(sources.DataSource): if not self.wait_for_metadata_service(): return False start_time = time.time() - self.userdata_raw = ec2_utils.get_instance_userdata(self.metadata_address, self.api_ver) - self.metadata = ec2_utils.get_instance_metadata(self.metadata_address, self.api_ver) + self.userdata_raw = ec2_utils.get_instance_userdata(self.metadata_address, self.api_ver, + ssl_details=util.fetch_ssl_details(self.paths)) + self.metadata = ec2_utils.get_instance_metadata(self.metadata_address, self.api_ver, + ssl_details=util.fetch_ssl_details(self.paths)) LOG.debug("Crawl of metadata service took %s seconds", int(time.time() - start_time)) return True |