lp:~harlowja/cloud-init/url-ssl-fixings

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~cloud-init-dev/cloud-init/trunk at revision 801

Scott Moser: Needs Fixing on 2013-03-12

Diff: 890 lines (+316/-163)

15 files modified

Requires (+6/-5)
cloudinit/config/cc_phone_home.py (+3/-2)
cloudinit/config/cc_power_state_change.py (+1/-1)
cloudinit/distros/parsers/resolv_conf.py (+2/-2)
cloudinit/ec2_utils.py (+5/-0)
cloudinit/sources/DataSourceCloudStack.py (+6/-5)
cloudinit/sources/DataSourceEc2.py (+7/-6)
cloudinit/sources/DataSourceMAAS.py (+26/-19)
cloudinit/url_helper.py (+159/-98)
cloudinit/user_data.py (+3/-2)
cloudinit/util.py (+79/-10)
setup.py (+3/-2)
tests/unittests/test__init__.py (+5/-5)
tests/unittests/test_datasource/test_maas.py (+9/-6)
tests/unittests/test_util.py (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1067888: Https verification + usage + support	Medium	Fix Released
Bug #1068801: Metadata lazy loaded (even when disabled)	Medium	Fix Released

Link a bug report

Related blueprints

710. By Joshua Harlow on 2013-03-19

Add doc about issue 1401 in boto.

709. By Joshua Harlow on 2013-03-19

Move back to using boto for now.

708. By Scott Moser on 2013-03-19

fix typo

707. By Scott Moser on 2013-03-19

make get_instance_userdata and get_instance_metadata more like botos

this shouldn't change anything, only the signatures of the methods.

706. By Scott Moser on 2013-03-19

set 'allow_redirects' to True by default

the previous implementation of url_helper.readurl() would default
to allow_redirects being true.

So, for backwards compat, we should keep that behavior.

705. By Scott Moser on 2013-03-19

do not bother retrying on ssl errors

if the error is an ssl error, its extremely unlikely that it would be fixed by
waiting a few seconds and trying again.

704. By Scott Moser on 2013-03-19

appease pylint and pep8

* cloudinit/distros/parsers/resolv_conf.py
  added some pylint overrides with 'plXXXXX' syntax.
  example: # pl51222 pylint: disable=E0102

  The pl51222 there means: http://www.logilab.org/ticket/51222

  This specific issue is present in 12.04 pylint, but not 13.04.

* pylint doesn't like the requests special handling we have.
  which makes sense as it is only checking versus one specific version.
* general pep8 and pylint cleanups.

703. By Scott Moser on 2013-03-19

merge from trunk rev 800

702. By Scott Moser on 2013-03-19

merge from trunk at revno 799

701. By Joshua Harlow on 2013-03-14

Fix how the http error doesn't always have the response attached
in earlier versions of requests (pre 0.10.8).