Remove HEAD usage and other small adjustments

4 files changed, 30 insertions, 39 deletions

diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
index 91cba20f..a7c9c9ab 100644
--- a/cloudinit/ec2_utils.py
+++ b/cloudinit/ec2_utils.py
@@ -16,10 +16,8 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import httplib
-from urlparse import (urlparse, urlunparse)
-
 import functools
+import httplib
 import json
 
 from cloudinit import log as logging
diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py
index 621572de..2c50ed84 100644
--- a/cloudinit/sources/DataSourceOpenStack.py
+++ b/cloudinit/sources/DataSourceOpenStack.py
@@ -44,6 +44,7 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
         self.ssl_details = util.fetch_ssl_details(self.paths)
         self.version = None
         self.files = {}
+        self.ec2_metadata = None
 
     def __str__(self):
         root = sources.DataSource.__str__(self)
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index 9dbef677..09fb4ad8 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -21,7 +21,6 @@
 import abc
 import base64
 import copy
-import functools
 import os
 
 from cloudinit import ec2_utils
@@ -395,26 +394,38 @@ class ConfigDriveReader(BaseReader):
 class MetadataReader(BaseReader):
     def __init__(self, base_url, ssl_details=None, timeout=5, retries=5):
         super(MetadataReader, self).__init__(base_url)
-        self._url_reader = functools.partial(url_helper.readurl,
-                                             retries=retries,
-                                             ssl_details=ssl_details,
-                                             timeout=timeout)
-        self._url_checker = functools.partial(url_helper.existsurl,
-                                              ssl_details=ssl_details,
-                                              timeout=timeout)
-        self._ec2_reader = functools.partial(ec2_utils.get_instance_metadata,
-                                             ssl_details=ssl_details,
-                                             timeout=timeout,
-                                             retries=retries)
+        self.ssl_details = ssl_details
+        self.timeout = float(timeout)
+        self.retries = int(retries)
 
     def _path_read(self, path):
-        return str(self._url_reader(path))
+        response = url_helper.readurl(path,
+                                      retries=self.retries,
+                                      ssl_details=self.ssl_details,
+                                      timeout=self.timeout)
+        return response.contents
 
     def _path_exists(self, path):
-        return self._url_checker(path)
+
+        def should_retry_cb(request, cause):
+            if cause.code >= 400:
+                return False
+            return True
+
+        try:
+            response = url_helper.readurl(path,
+                                          retries=self.retries,
+                                          ssl_details=self.ssl_details,
+                                          timeout=self.timeout,
+                                          exception_cb=should_retry_cb)
+            return response.ok()
+        except IOError:
+            return False
 
     def _path_join(self, base, *add_ons):
         return url_helper.combine_url(base, *add_ons)
 
     def _read_ec2_metadata(self):
-        return self._ec2_reader()
+        return ec2_utils.get_instance_metadata(ssl_details=self.ssl_details,
+                                               timeout=self.timeout,
+                                               retries=self.retries)
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
index 76a8e29b..a477b185 100644
--- a/cloudinit/url_helper.py
+++ b/cloudinit/url_helper.py
@@ -166,35 +166,16 @@ def _get_ssl_args(url, ssl_details):
     return ssl_args
 
 
-def existsurl(url, ssl_details=None, timeout=None):
-    r = _readurl(url, ssl_details=ssl_details, timeout=timeout,
-                 method='HEAD', check_status=False)
-    return r.ok()
-
-
 def readurl(url, data=None, timeout=None, retries=0, sec_between=1,
-            headers=None, headers_cb=None, ssl_details=None,
-            check_status=True, allow_redirects=True, exception_cb=None):
-    return _readurl(url, data=data, timeout=timeout, retries=retries,
-                    sec_between=sec_between, headers=headers,
-                    headers_cb=headers_cb, ssl_details=ssl_details,
-                    check_status=check_status,
-                    allow_redirects=allow_redirects,
-                    exception_cb=exception_cb)
-
-
-def _readurl(url, data=None, timeout=None, retries=0, sec_between=1,
              headers=None, headers_cb=None, ssl_details=None,
-             check_status=True, allow_redirects=True, exception_cb=None,
-             method='GET'):
+             check_status=True, allow_redirects=True, exception_cb=None):
     url = _cleanurl(url)
     req_args = {
         'url': url,
     }
     req_args.update(_get_ssl_args(url, ssl_details))
-    scheme = urlparse(url).scheme  # pylint: disable=E1101
     req_args['allow_redirects'] = allow_redirects
-    req_args['method'] = method
+    req_args['method'] = 'GET'
     if timeout is not None:
         req_args['timeout'] = max(float(timeout), 0)
     if data: