lp:~oddbloke/cloud-init/fix-gce-az

Branch merges

Propose for merging

No branches dependent on this one.

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

cloud-init Commiters: Pending requested 2015-07-22

Diff: 195 lines (+43/-18)

6 files modified

cloudinit/distros/__init__.py (+11/-9)
cloudinit/sources/DataSourceEc2.py (+7/-0)
cloudinit/sources/DataSourceGCE.py (+4/-0)
cloudinit/sources/__init__.py (+5/-2)
config/cloud.cfg (+1/-0)
tests/unittests/test_distros/test_generic.py (+15/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1470880: [SRU] GCE datasource reports availability zones incorrectly	High	Fix Released
Bug #1470890: [SRU] cc_apt_configure does not understand regions	High	Fix Released

Link a bug report

Related blueprints

1125. By Dan Watkins on 2015-07-22

Add DataSource.region and use it in mirror selection.

Also implement DataSource.region for EC2 and GCE data sources.

1124. By Dan Watkins on 2015-07-22

Make full data source available to code that handles mirror selection.

1123. By Scott Moser on 2015-07-21

fix 'make pyflakes'

1122. By Scott Moser on 2015-07-21

tests: fix TestHandlerHandlePart tests

these tests were previously passing, but doing so erroneously.
I believe that an update to mock caused them to start failing.

I've updated the tests now. The simple change is
replacing 'assert_called_with_once' with 'assert_called_once_with'.

The second set of changes is seemingly a correction of the following tests
expectations:
 test_normal_version_2 : was not expecting to get frequency passed into
    handle_part, but should have been.
 test_no_handle_when_modfreq_once: was expecting to have handle_part
    called even though the test implies otherwise.
 test_exception_is_caught: this test just looked broken.
    Now, we're testing that the part handler is called and that no
    exception is raised past handle_part

1121. By Dan Watkins on 2015-07-20

Return a sensible value for DataSourceGCE.availability_zone.

1120. By Scott Moser on 2015-07-16

CloudSigma: encode/decode data before communicating over the serial channel

this fixes the cloudsigma datasource when used with python3.

1119. By Scott Moser on 2015-07-10

Fix regressed logic causing rightscale userdata to no longer work.

Change the logic for user data handling back to the original intent. A style
change also modified the logic of the user data handling leading to user data
being ignored even if it exists.

1118. By Scott Moser on 2015-06-16

Use wget to fetch CloudStack passwords.

Different versions of the CloudStack password server respond differently;
wget handles these nicely for us, so it's easier to just use wget.

1117. By Scott Moser on 2015-06-16

growpart: fix specification of 'devices' list.

given config:
 {'growpart': {'devices': ["/"]}}

the 'devices' was ignored, it was incorrectly read from the top
level non-namespaced location.

1116. By Scott Moser on 2015-06-15

apt_configure: fix importing of apt gpg keys under in python3