Merge lp://qastaging/~oddbloke/cloud-init/fix-gce-az into lp://qastaging/~cloud-init-dev/cloud-init/trunk
Proposed by
Dan Watkins
| Status: | Merged |
|---|---|
| Merged at revision: | 1126 |
| Proposed branch: | lp://qastaging/~oddbloke/cloud-init/fix-gce-az |
| Merge into: | lp://qastaging/~cloud-init-dev/cloud-init/trunk |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://qastaging/~oddbloke/cloud-init/fix-gce-az |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| cloud-init Commiters | Pending | ||
|
Review via email:
|
|||
Description of the change
This makes the full data source available to the mirror selection code, which means we can implement region logic on the data source for everything to use rather than it being mirror-
It also implements that region logic for EC2 and GCE.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
