summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2023-08-20 20:10:20 +0300
committerLars Wirzenius <liw@liw.fi>2023-08-20 20:10:20 +0300
commitd836fa481a01024b36ced5d3062c07e8983b1d92 (patch)
treeb370dfece678d8afc0628199b9ef074e50664def
parent0e412d9aba2939f53a844b569a6916fb0d2a3fe5 (diff)
downloadansibleness-d836fa481a01024b36ced5d3062c07e8983b1d92.tar.gz
upgrade various stamina VMs to bookworm
Keep the ones with ca-certificates-java at bullseye, because Debian's packaging is currently buggy and the fix hasn't reached stable yet. Sponsored-by: author
-rw-r--r--ansible/ambient-dev.yml4
-rw-r--r--ansible/debian-ansible-dev.yml4
-rw-r--r--ansible/riki-dev.yml4
-rw-r--r--ansible/sshca-dev.yml4
-rw-r--r--ansible/stamina.yml2
-rw-r--r--ansible/vmdb2-dev.yml4
-rw-r--r--ansible/web.yml4
7 files changed, 13 insertions, 13 deletions
diff --git a/ansible/ambient-dev.yml b/ansible/ambient-dev.yml
index 349ac9e..ef56a64 100644
--- a/ansible/ambient-dev.yml
+++ b/ansible/ambient-dev.yml
@@ -22,8 +22,8 @@
ansible_python_interpreter: python3
sane_debian_system_version: 2
- sane_debian_system_hostname: ambient-dev
- sane_debian_system_codename: bullseye
+ sane_debian_system_hostname: "{{ inventory_hostname }}"
+ sane_debian_system_codename: bookworm
timezone: Europe/Helsinki
diff --git a/ansible/debian-ansible-dev.yml b/ansible/debian-ansible-dev.yml
index fe7d6b8..5a194c4 100644
--- a/ansible/debian-ansible-dev.yml
+++ b/ansible/debian-ansible-dev.yml
@@ -49,8 +49,8 @@
ansible_python_interpreter: python3
sane_debian_system_version: 2
- sane_debian_system_hostname: debian-ansible-dev
- sane_debian_system_codename: bullseye
+ sane_debian_system_hostname: "{{ inventory_hostname }}"
+ sane_debian_system_codename: bookworm
timezone: Europe/Helsinki
diff --git a/ansible/riki-dev.yml b/ansible/riki-dev.yml
index b618e5a..26e8e81 100644
--- a/ansible/riki-dev.yml
+++ b/ansible/riki-dev.yml
@@ -30,8 +30,8 @@
ansible_python_interpreter: /usr/bin/python3
sane_debian_system_version: 2
- sane_debian_system_hostname: riki-dev
- sane_debian_system_codename: bullseye
+ sane_debian_system_hostname: "{{ inventory_hostname }}"
+ sane_debian_system_codename: bookworm
sane_debian_system_timezone: Europe/Helsinki
sane_debian_system_sources_lists:
- repo: |
diff --git a/ansible/sshca-dev.yml b/ansible/sshca-dev.yml
index 000a8c8..1ecdb0a 100644
--- a/ansible/sshca-dev.yml
+++ b/ansible/sshca-dev.yml
@@ -36,8 +36,8 @@
ansible_python_interpreter: python3
sane_debian_system_version: 2
- sane_debian_system_hostname: sshca-dev
- sane_debian_system_codename: bullseye
+ sane_debian_system_hostname: "{{ inventory_hostname }}"
+ sane_debian_system_codename: bookworm
timezone: Europe/Helsinki
diff --git a/ansible/stamina.yml b/ansible/stamina.yml
index 93b2be1..4d7dce7 100644
--- a/ansible/stamina.yml
+++ b/ansible/stamina.yml
@@ -82,7 +82,7 @@
content: |
image_directory: /mnt/vms
default_autostart: true
- default_base_image: ~/base-images/bullseye-vm.qcow2
+ default_base_image: ~/base-images/bookworm-vm.qcow2
default_cpus: 4
default_generate_host_certificate: true
default_image_gib: 100
diff --git a/ansible/vmdb2-dev.yml b/ansible/vmdb2-dev.yml
index f2e7d5f..0b76943 100644
--- a/ansible/vmdb2-dev.yml
+++ b/ansible/vmdb2-dev.yml
@@ -52,8 +52,8 @@
ansible_python_interpreter: python3
sane_debian_system_version: 2
- sane_debian_system_hostname: vmdb2-dev
- sane_debian_system_codename: bullseye
+ sane_debian_system_hostname: "{{ inventory_hostname }}"
+ sane_debian_system_codename: bookworm
timezone: Europe/Helsinki
diff --git a/ansible/web.yml b/ansible/web.yml
index 26f0602..7088968 100644
--- a/ansible/web.yml
+++ b/ansible/web.yml
@@ -97,8 +97,8 @@
ansible_python_interpreter: /usr/bin/python3
sane_debian_system_version: 2
- sane_debian_system_hostname: web
- sane_debian_system_codename: bullseye
+ sane_debian_system_hostname: "{{ inventory_hostname }}"
+ sane_debian_system_codename: bookworm
sane_debian_system_mirror: deb.debian.org
sane_debian_system_sources_lists:
- repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main