Merge lp://staging/~abentley/juju-release-tools/image-index into lp://staging/juju-release-tools

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 304
Proposed branch: lp://staging/~abentley/juju-release-tools/image-index
Merge into: lp://staging/juju-release-tools
Diff against target: 77 lines (+13/-7)
2 files modified
make_aws_image_streams.py (+9/-3)
tests/test_make_aws_image_streams.py (+4/-4)
To merge this branch: bzr merge lp://staging/~abentley/juju-release-tools/image-index
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+295334@code.staging.launchpad.net

Commit message

Use index.json, not index2.json for images.

Description of the change

This branch switches image streams to use index.json as their index.

index2.json is a workaround needed for agents because we now use multiple content-ids, and early jujus couldn't cope with that. But it was not a change to the simplestreams format. Juju considers index.json a "legacy" file, but it still uses it, and this is still the only file generated by cloud-images.

Early jujus could break if they encountered multiple image-ids in simplestreams, but they didn't access streams.canonical.com/images/releases by default. Setting image-streams changes both content-id and URL, so there's no reason for image streams to have multiple content-ids. So streams.canonical.com/images/releases is unlikely to ever have multiple content-ids, but even if it did, it would not break old jujus.

Therefore, image streams should follow the format used by cloud-images.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches