maas-images

Merge lp://staging/~smoser/maas-images/trunk.proposed-non-intel into lp://staging/maas-images

trunk.proposed-non-intel
Merge into maas-ephemerals

Proposed by Scott Moser on 2018-07-09

Status:	Merged
Merged at revision:	402
Proposed branch:	lp://staging/~smoser/maas-images/trunk.proposed-non-intel
Merge into:	lp://staging/maas-images
Diff against target:	91 lines (+21/-10) 2 files modified bin/kpack-from-image (+17/-6) bin/maas-cloudimg2ephemeral (+4/-4)
To merge this branch:	bzr merge lp://staging/~smoser/maas-images/trunk.proposed-non-intel
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andres Rodriguez (community)		2018-07-09	Approve on 2018-07-10
Review via email: mp+349206@code.staging.launchpad.net

Commit message

Fix --proposed in kpack-from-image for arch other than i386 and amd64.

kpack-from-image always use archive.ubuntu.com for the ubuntu mirror
instead of ports.ubuntu.com for arch other than intel.

The change here does 3 things:
a.) change variable names in maas-cloudimg2ephemeral to be consistent
    with those used in kpack-from-image
a.) read UBUNTU_MIRROR and UBUNTU_MIRROR_PORTS from environment in both
    kpack-from-image and maas-cloudimg2ephemeral.
c.) pass UBUNTU_MIRROR and UBUNTU_MIRROR_PORTS through sudo call
    in kpack-from-image.

Revision history for this message

Scott Moser (smoser) wrote on 2018-07-09:

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2018-07-10:

lgtm!

review: Approve

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2018-07-10:

@Scott, if you think this is related to the above, does it make sense to close the bug ? Since I have a feeling that this will fix it ?

Revision history for this message

Scott Moser (smoser) wrote on 2018-07-10:

@Andreas, I marked the bug as invalid. It reported the stack trace, which occurs only on xenial. We're not going to fix that. there was a bug with --proposed and non-intel, that is fixed here.