diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-03-19 15:53:16 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-03-19 15:53:16 -0700 |
| commit | 20a2d9961697fbd6ef0e74cd3770b6601b141bcd (patch) | |
| tree | bc6660c6fb2c6b88875d0ff8cec23ff3af00887f /cloudinit/sources | |
| parent | 5f3aaf5300825a3e586c9369aa4c1d917b448811 (diff) | |
| download | vyos-cloud-init-20a2d9961697fbd6ef0e74cd3770b6601b141bcd.tar.gz vyos-cloud-init-20a2d9961697fbd6ef0e74cd3770b6601b141bcd.zip | |
Move back to using boto for now.
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceCloudStack.py | 7 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py index 7fd38982..b4ca6d93 100644 --- a/cloudinit/sources/DataSourceCloudStack.py +++ b/cloudinit/sources/DataSourceCloudStack.py @@ -102,13 +102,10 @@ class DataSourceCloudStack(sources.DataSource): return False start_time = time.time() md_addr = self.metadata_address - ssl_details = util.fetch_ssl_details(self.paths) self.userdata_raw = ec2_utils.get_instance_userdata(self.api_ver, - md_addr, - ssl_details) + md_addr) self.metadata = ec2_utils.get_instance_metadata(self.api_ver, - md_addr, - ssl_details) + md_addr) LOG.debug("Crawl of metadata service took %s seconds", int(time.time() - start_time)) return True diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 0d62cf01..bd35c8b0 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -62,13 +62,10 @@ class DataSourceEc2(sources.DataSource): return False start_time = time.time() md_addr = self.metadata_address - ssl_details = util.fetch_ssl_details(self.paths) self.userdata_raw = ec2_utils.get_instance_userdata(self.api_ver, - md_addr, - ssl_details) + md_addr) self.metadata = ec2_utils.get_instance_metadata(self.api_ver, - md_addr, - ssl_details) + md_addr) LOG.debug("Crawl of metadata service took %s seconds", int(time.time() - start_time)) return True |