Move to more dynamic apt configs

Allow specifying repository URLs in the group_vars, and add
release-specific template files to support future version changes.
This commit is contained in:
Joshua Boniface 2021-04-08 14:14:25 -04:00 committed by Joshua Boniface
parent 3e1d3a90b0
commit 3819cd87fd
4 changed files with 18 additions and 15 deletions

View File

@ -9,6 +9,9 @@ timezone_location: Canada/Eastern
# Cluster domain for node FQDNs
local_domain: upstream.local
# Debian package repository URL
debian_repository: http://ftp.debian.org/debian
# IPMI user and password
# > For the password, use pwgen to generate.
# > Set these in the IPMI configuration as a user with permissions to reboot the host.

View File

@ -78,7 +78,7 @@
with_items:
- { src: "etc/apt/apt.conf.d/10norecommends.j2", dest: "/etc/apt/apt.conf.d/10norecommends" }
- { src: "etc/apt/preferences.d/pins.j2", dest: "/etc/apt/preferences.d/pins" }
- { src: "etc/apt/sources.list.{{ ansible_machine }}.j2", dest: "/etc/apt/sources.list" }
- { src: "etc/apt/sources.list.{{ ansible_machine }}.{{ ansible_distribution_release }}.j2", dest: "/etc/apt/sources.list" }
tags: base-apt
- name: add key for bonilan repo

View File

@ -0,0 +1,14 @@
# apt configuration: main sources list (buster)
# {{ ansible_managed }}
deb {{ debian_main_repository }} buster main contrib non-free
deb-src {{ debian_main_repository }} buster main contrib
deb {{ debian_security_repository }} buster/updates main contrib
deb-src {{ debian_security_repository }} buster/updates main contrib
deb {{ debian_main_repository }} buster-updates main contrib
deb-src {{ debian_main_repository }} buster-updates main contrib
deb {{ debian_pvc_repository }} buster pvc
deb-src {{ debian_pvc_repository }} buster pvc

View File

@ -1,14 +0,0 @@
# apt configuration: main sources list
# {{ ansible_managed }}
deb http://ftp.debian.org/debian {{ ansible_distribution_release }} main contrib non-free
deb-src http://ftp.debian.org/debian {{ ansible_distribution_release }} main contrib
deb http://security.debian.org/ {{ ansible_distribution_release }}/updates main contrib
deb-src http://security.debian.org/ {{ ansible_distribution_release }}/updates main contrib
deb http://ftp.debian.org/debian/ {{ ansible_distribution_release }}-updates main contrib
deb-src http://ftp.debian.org/debian/ {{ ansible_distribution_release }}-updates main contrib
deb https://repo.bonifacelabs.net/debian/ {{ ansible_distribution_release }} pvc
deb-src https://repo.bonifacelabs.net/debian/ {{ ansible_distribution_release }} pvc