summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2023-05-21 12:49:18 +0300
committerLars Wirzenius <liw@liw.fi>2023-05-21 12:49:18 +0300
commit8edb33f7dc340bbb13c91ab6248214748592d2e3 (patch)
treeda18d9c7c76af25f3f5e867568e541118837ee3e
parentefd45b6010171d73f51fc2dd39c2aaf17881f8c1 (diff)
downloadansibleness-8edb33f7dc340bbb13c91ab6248214748592d2e3.tar.gz
x220: update for bookworm upgrade trial
Sponsored-by: author
-rw-r--r--ansible/x220.yml37
-rw-r--r--v-i/x220-spec.yaml4
2 files changed, 35 insertions, 6 deletions
diff --git a/ansible/x220.yml b/ansible/x220.yml
index 8116900..93b7245 100644
--- a/ansible/x220.yml
+++ b/ansible/x220.yml
@@ -6,16 +6,47 @@
- role: ssd
- role: unix_users
- role: thinkpad
- - role: puomi
+ - role: comfortable-debian-system
+ - role: intel-wifi
+ - role: version-controller
+ - role: emacs
+ - role: gnupg-workstation
+ - role: gnome-system
+ - role: ansible
+ - role: rust-rustup
+ - role: unix_users
+ - role: liw
+ # # - role: puomi
- tasks:
vars:
ansible_python_interpreter: /usr/bin/python3
sane_debian_system_version: 2
sane_debian_system_hostname: "{{ inventory_hostname }}"
- sane_debian_system_codename: bullseye
+ sane_debian_system_codename: bookworm
sane_debian_system_timezone: Europe/Helsinki
+ sane_debian_system_sources_lists:
+ - repo: |
+ deb http://deb.debian.org/debian bookworm contrib non-free non-free-firmware
+
+ - repo: |
+ deb-src http://deb.debian.org/debian bookworm main contrib non-free
+
+ - repo: |
+ deb http://security.debian.org/debian-security bookworm-security main contrib non-free
+
+ - repo: |
+ deb http://deb.debian.org/debian bookworm-backports main contrib non-free
+
+ - repo: |
+ deb http://code.liw.fi/debian unstable main
+ signing_key: "{{ code_liw_fi_signing_key }}"
+
+ - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
+ signing_key: "{{ ci_prod_signing_key }}"
+
+ - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable main
+ signing_key: "{{ ci_prod_signing_key }}"
unix_users_version: 2
unix_users:
diff --git a/v-i/x220-spec.yaml b/v-i/x220-spec.yaml
index b7976e8..28e9a53 100644
--- a/v-i/x220-spec.yaml
+++ b/v-i/x220-spec.yaml
@@ -1,7 +1,5 @@
hostname: x220
drive: /dev/sda
-ansible_vars:
- user_ca_pubkey: |
- sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINjZEn0qxuBORhdR9bB48Sk3dRz4Kxxo4S7dDiqssQPXAAAABHNzaDo=
ansible_vars_files:
- hostid.yml
+debian_release: bookworm