Merge ~vorlon/cloud-init:lp.1959343 into cloud-init:main

[Steve Langasek]

From Ubuntu 20.10 on, the partner archive is completely empty; we are now sunsetting it and should no longer put references to it (even commented out) in sources.list.

cloud-init currently uses a single sources.list template in its codebase, which would be used on all host releases of Ubuntu. Since the partner archive still *exists* for Ubuntu 20.04 and earlier, despite being of limited use, removing this for all releases may not be the desired behavior; however, I'm not enthusiastic about writing new code to handle this in jinja for a small corner case unless told to do so.

[Chad Smith (chad.smith)]

I approve this message, we can easily carry a quily patch in our ubuntu/focal & ubuntu/bionic upstream branches to leave this commented out apt source unredacted. No reason to carry that template formard on upstream/main.

Since our git+launchpad repo is simply a mirror of our upstream repo, I'd prefer if we proposed and landed a PR up here https://github.com/canonical/cloud-init/pulls. Then James, Brett or myself will make sure to observe correct/unchanged behavior on 20.04 and 18.04 in our next SRU.

[Chad Smith (chad.smith)]

Please resubmit to https://github.com/canonical/cloud-init/pulls and we'll get that into upstream. Also, please ensure to add your github-username to tools/.github-cla-signers alphabetically so we can process that PR quickly.

review: Needs Resubmitting

Unmerged commits

6da9265... by Steve Langasek on 2022-01-28

Do not support setting up archive.canonical.com as a source

Tthe partner archive is now obsolete. LP: #1959343.

diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl
index edb92f1..6f92867 100644
--- a/templates/sources.list.ubuntu.tmpl
+++ b/templates/sources.list.ubuntu.tmpl
@@ -43,13 +43,6 @@ deb {{mirror}} {{codename}}-updates multiverse
 deb {{mirror}} {{codename}}-backports main restricted universe multiverse
 # deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse
 
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu {{codename}} partner
-# deb-src http://archive.canonical.com/ubuntu {{codename}} partner
-
 deb {{security}} {{codename}}-security main restricted
 # deb-src {{security}} {{codename}}-security main restricted
 deb {{security}} {{codename}}-security universe