Merge ~smoser/cloud-init:feature/1805854-add-non-x86-mirrors into cloud-init:master

Proposed by Scott Moser
Status: Merged
Approved by: Chad Smith
Approved revision: ea02f670ffdf12cde2cf654a79d75ef0f794dab9
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~smoser/cloud-init:feature/1805854-add-non-x86-mirrors
Merge into: cloud-init:master
Diff against target: 23 lines (+11/-1)
1 file modified
config/cloud.cfg.tmpl (+11/-1)
Reviewer Review Type Date Requested Status
Chad Smith Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+359948@code.launchpad.net

Commit message

config: On ubuntu select cloud archive mirrors for armel, armhf, arm64.

Infrastructure is now set up for Ubuntu to handle Amazon instances
hitting a ports archive at:
   - http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/

And additionally, generic mirrors at
   *.clouds.ports.ubuntu.com/ubuntu-ports

The change here will utilize those mirrors for the arm64, armel and
armhf arches.

We've decided to limit the auto-selection of those
mirrors to arm, where we know a use case. That way new instances
of ppc64el or other arches will not select them. Such a behavior change
could be problematic for a user in a firewalled environment.

LP: #1805854

Description of the change

see commit message

To post a comment you must log in.

PASSED: Continuous integration, rev:ea02f670ffdf12cde2cf654a79d75ef0f794dab9
https://jenkins.ubuntu.com/server/job/cloud-init-ci/471/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/471/rebuild

review: Approve (continuous-integration)
Chad Smith (chad.smith) wrote :

+1! LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
2index 1fef133..7513176 100644
3--- a/config/cloud.cfg.tmpl
4+++ b/config/cloud.cfg.tmpl
5@@ -167,7 +167,17 @@ system_info:
6 - http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
7 - http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
8 security: []
9- - arches: [armhf, armel, default]
10+ - arches: [arm64, armel, armhf]
11+ failsafe:
12+ primary: http://ports.ubuntu.com/ubuntu-ports
13+ security: http://ports.ubuntu.com/ubuntu-ports
14+ search:
15+ primary:
16+ - http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
17+ - http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
18+ - http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
19+ security: []
20+ - arches: [default]
21 failsafe:
22 primary: http://ports.ubuntu.com/ubuntu-ports
23 security: http://ports.ubuntu.com/ubuntu-ports

Subscribers

People subscribed via source and target branches