More work on requests integration.

2 files changed, 13 insertions, 8 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
diff --git a/cloudinit/sources/DataSourceMAAS.py b/cloudinit/sources/DataSourceMAAS.py
index 2de31305..dc048943 100644
--- a/cloudinit/sources/DataSourceMAAS.py
+++ b/cloudinit/sources/DataSourceMAAS.py
@@ -81,7 +81,8 @@ class DataSourceMAAS(sources.DataSource):
             self.base_url = url
 
             (userdata, metadata) = read_maas_seed_url(self.base_url,
-                                                      self.md_headers)
+                                                      self.md_headers,
+                                                      paths=self.paths)
             self.userdata_raw = userdata
             self.metadata = metadata
             return True
@@ -141,7 +142,7 @@ class DataSourceMAAS(sources.DataSource):
             LOG.debug("Using metadata source: '%s'", url)
         else:
             LOG.critical("Giving up on md from %s after %i seconds",
-                            urls, int(time.time() - starttime))
+                         urls, int(time.time() - starttime))
 
         return bool(url)
 
@@ -190,7 +191,7 @@ def read_maas_seed_dir(seed_d):
 
 
 def read_maas_seed_url(seed_url, header_cb=None, timeout=None,
-    version=MD_VERSION):
+                       version=MD_VERSION, paths=None):
     """
     Read the maas datasource at seed_url.
       - header_cb is a method that should return a headers dictionary for
@@ -222,12 +223,13 @@ def read_maas_seed_url(seed_url, header_cb=None, timeout=None,
         else:
             headers = {}
         try:
-            resp = util.read_file_or_url(url, headers=headers, timeout=timeout)
+            resp = util.read_file_or_url(url, headers=headers, timeout=timeout,
+                                         ssl_details=util.fetch_ssl_details(paths))
             if resp.ok:
                 md[name] = str(resp)
             else:
                 LOG.warn(("Fetching from %s resulted in"
-                          " an invalid http code %s"), url, resp.status_code)
+                          " an invalid http code %s"), url, resp.code)
         except url_helper.UrlError as e:
             if e.code != 404:
                 raise
@@ -372,7 +374,8 @@ if __name__ == "__main__":
         if args.subcmd == "check-seed":
             if args.url.startswith("http"):
                 (userdata, metadata) = read_maas_seed_url(args.url,
-                    header_cb=my_headers, version=args.apiver)
+                                                          header_cb=my_headers,
+                                                          version=args.apiver)
             else:
                 (userdata, metadata) = read_maas_seed_url(args.url)
             print "=== userdata ==="