summaryrefslogtreecommitdiff
path: root/cloudinit/ec2_utils.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-01-17 17:08:58 -0500
committerScott Moser <smoser@ubuntu.com>2014-01-17 17:08:58 -0500
commitcbc5af7396743e014f1ad9ece0bb56820d26f484 (patch)
tree603d910759a8d4fc7075884b6e965f6eaeda9a54 /cloudinit/ec2_utils.py
parent006f3e7317b7dd985e73e221b7785ab30ceab131 (diff)
downloadvyos-cloud-init-cbc5af7396743e014f1ad9ece0bb56820d26f484.tar.gz
vyos-cloud-init-cbc5af7396743e014f1ad9ece0bb56820d26f484.zip
more boto removal. move httpretty from 'Requires'
the Requires would get that string rendered into the package's Depends/Requires (rather than BuildDepends/BuildRequires). We should have BuildDepends/BuildRequires too, but since trunk's package builds do not run 'make test', this isn't a big deal. This also adds 'test-requires' for httpretty.
Diffstat (limited to 'cloudinit/ec2_utils.py')
-rw-r--r--cloudinit/ec2_utils.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
index c86623bc..92a22747 100644
--- a/cloudinit/ec2_utils.py
+++ b/cloudinit/ec2_utils.py
@@ -49,9 +49,6 @@ def combine_url(base, add_on):
# See: http://bit.ly/TyoUQs
#
-# Since boto metadata reader uses the old urllib which does not
-# support ssl, we need to ahead and create our own reader which
-# works the same as the boto one (for now).
class MetadataMaterializer(object):
def __init__(self, blob, base_url, caller):
self._blob = blob