https://gerrit.wikimedia.org/r/c/operations/puppet/+/631396 puppetizes /etc/apt/sources.list. That change is currently not active on cloud-vps.
It's probably better to enable on cloud-vps as well, but first we need to locate VMs that have custom repos added by hand and move those configs into /etc/apt/sources.list.d/<whatever>
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Resolved | Andrew | T264311 Prepare for puppetizing /etc/apt/sources.list | |||
| Resolved | BUG REPORT | Andrew | T291168 [Debian bullseye image] APT source-list file is not up to date |
For a Buster system, the puppetised sources.list looks like this:
deb http://mirrors.wikimedia.org/debian/ buster main contrib non-free deb-src http://mirrors.wikimedia.org/debian/ buster main contrib non-free deb http://security.debian.org/debian-security buster/updates main contrib non-free deb-src http://security.debian.org/debian-security buster/updates main contrib non-free # -updates, previously known as 'volatile' deb http://mirrors.wikimedia.org/debian/ buster-updates main contrib non-free deb-src http://mirrors.wikimedia.org/debian/ buster-updates main contrib non-free
For a Stretch system, the puppetised sources.list looks like this:
deb http://mirrors.wikimedia.org/debian/ stretch main contrib non-free deb-src http://mirrors.wikimedia.org/debian/ stretch main contrib non-free deb http://security.debian.org/debian-security stretch/updates main contrib non-free deb-src http://security.debian.org/debian-security stretch/updates main contrib non-free # -updates, previously known as 'volatile' deb http://mirrors.wikimedia.org/debian/ stretch-updates main contrib non-free deb-src http://mirrors.wikimedia.org/debian/ stretch-updates main contrib non-free
I wonder if there are CloudVPS VMs in which the admin hand-edited the file. The moment we enable this, the changes would be lost, right?
Yes. This task is about detecting and counting those VMs and moving the customisations out of the way of the puppet management.
Exactly. I'd expect that 99% of all VMs don't have anything in there, but there are surely some edge cases. OTOH, overwriting /etc/apt/sources.list does not cause any imminent breakage, all packages remain installed as they are, it only affects further updates. As such, it's probably also fine to simply announce this to users, give them a week and then merge a patch?
A few things I'm seeing:
This chaos makes me really want to normalize things, and also makes me quite nervous about normalizing.
Proposed good-enough solution:
I changed my mind about the announcement. It's likely that either 0 or 1 users are going to be confused by this so I'll handle this with a comment in the sources.list file
Change 751497 had a related patch set uploaded (by Andrew Bogott; author: Andrew Bogott):
[operations/puppet@production] apt sources.list templates: add some comments
Change 751498 had a related patch set uploaded (by Andrew Bogott; author: Andrew Bogott):
[operations/puppet@production] cloud-vps: puppetize /etc/apt/sources.list
Change 751497 merged by Andrew Bogott:
[operations/puppet@production] apt sources.list templates: add some comments
Change 751498 merged by Andrew Bogott:
[operations/puppet@production] cloud-vps: puppetize /etc/apt/sources.list