lp:~harlowja/cloud-init/ds-openstack

Branch merges

Propose for merging

No branches dependent on this one.

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

cloud-init Commiters: Pending requested 2014-02-02

Diff: 2007 lines (+1149/-431)

11 files modified

cloudinit/ec2_utils.py (+7/-20)
cloudinit/sources/DataSourceConfigDrive.py (+113/-359)
cloudinit/sources/DataSourceOpenStack.py (+165/-0)
cloudinit/sources/helpers/__init__.py (+14/-0)
cloudinit/sources/helpers/openstack.py (+436/-0)
cloudinit/url_helper.py (+42/-18)
cloudinit/util.py (+10/-0)
tests/unittests/helpers.py (+24/-1)
tests/unittests/test_datasource/test_configdrive.py (+19/-16)
tests/unittests/test_datasource/test_openstack.py (+301/-0)
tests/unittests/test_ec2_util.py (+18/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

924. By Joshua Harlow on 2014-02-09

Handle code not existing in older requests versions

923. By Joshua Harlow on 2014-02-08

Spacing and comment cleanup

922. By Joshua Harlow on 2014-02-08

Update requests ssl not supported message

921. By Joshua Harlow on 2014-02-08

Capture IOError and use LOG better

920. By Joshua Harlow on 2014-02-08

Remove HEAD usage and other small adjustments

919. By Joshua Harlow on 2014-02-08

Add test for disabled dsmode

918. By Joshua Harlow on 2014-02-08

Adjust detection of python versions and variables exposed

917. By Joshua Harlow on 2014-02-08

Add a bunch of new tests

916. By Joshua Harlow on 2014-02-07

Remerged with trunk

915. By Joshua Harlow on 2014-02-02

Don't forget the rest of the files!