Merge lp://staging/~ltrager/maas-images/image_index into lp://staging/maas-images

Proposed by Lee Trager
Status: Merged
Merged at revision: 410
Proposed branch: lp://staging/~ltrager/maas-images/image_index
Merge into: lp://staging/maas-images
Diff against target: 242 lines (+85/-71)
3 files modified
bin/maas-qcow2targz (+17/-6)
conf/centos.yaml (+1/-3)
meph2/commands/mimport.py (+67/-62)
To merge this branch: bzr merge lp://staging/~ltrager/maas-images/image_index
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Scott Moser (community) Needs Information
Review via email: mp+347772@code.staging.launchpad.net

Commit message

Scan for CentOS images using the image-index provided by upstream

When CentOS support was initially added, we decided that CentOS should
follow the same path as Ubuntu. Upstream generates a generic cloud-image
and then lp:maas-images modifies the image to work for MAAS. When this was
first implemented upstream only supplied a sha256sum.txt file[1] for us to
scan for new images. Now, upstream is providing an
image-index [2] file which uses config file format.

The image-index[2] file is missing some older images the sha256sum.txt[1]
has but both contain the latest image file.

[1] https://cloud.centos.org/centos/7/images/sha256sum.txt
[2] https://cloud.centos.org/centos/7/images/image-index

Description of the change

When I initially added CentOS support to lp:maas-images we decided that CentOS should follow the same path as Ubuntu. Upstream generates a generic cloud-image and then lp:maas-images modifies the image to work for MAAS. When this was first implemented upstream only supplied a sha256sum.txt file[1] for us to scan for new images. I noticed that upstream is now providing an image-index [2] file which uses config file format.

The image-index[2] file is missing some older images the sha256sum.txt[1] has but both contain the latest image file.

[1] https://cloud.centos.org/centos/7/images/sha256sum.txt
[2] https://cloud.centos.org/centos/7/images/image-index

To post a comment you must log in.
401. By Lee Trager

Fix comment

402. By Lee Trager

Fix exception

Revision history for this message
Scott Moser (smoser) wrote :

i think there are some logic problems.

review: Needs Information
403. By Lee Trager

Merge trunk

404. By Lee Trager

Conform to image-index format

405. By Lee Trager

Remove old code

406. By Lee Trager

Support upstream release versions

Revision history for this message
Lee Trager (ltrager) wrote :

Thanks for the review. I've removed the old code as suggested and added support for upstream release versions. I'm ignoring old revisions formats(e.g 20141129) since we aren't building them anyway. While you are correct CentOS 6 and 7 may use the same revision they come from different files[1, 2] which are processed separately.

[1] https://cloud.centos.org/centos/7/images/image-index
[2] https://cloud.centos.org/centos/6/images/image-index

407. By Lee Trager

Remove old check

Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve

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