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

[Scott Moser]

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

see commit message

[Server Team CI bot (server-team-bot)]

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)]

+1! LGTM.

review: Approve

diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
index 1fef133..7513176 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -167,7 +167,17 @@ system_info:
            - http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
            - http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
          security: []
-     - arches: [armhf, armel, default]
+     - arches: [arm64, armel, armhf]
+       failsafe:
+         primary: http://ports.ubuntu.com/ubuntu-ports
+         security: http://ports.ubuntu.com/ubuntu-ports
+       search:
+         primary:
+           - http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
+           - http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
+           - http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
+         security: []
+     - arches: [default]
        failsafe:
          primary: http://ports.ubuntu.com/ubuntu-ports
          security: http://ports.ubuntu.com/ubuntu-ports