From 25ab984c9b089004bd1c497890c483d305e4f627 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:30 -0400
Subject: [PATCH] Revert "Disallow Deb10 -> Deb12 upgrades"

This reverts commit 6e56dd3e4aa52692eef17c915d6c0f797753874a.
---
 oneshot/upgrade-pvc-cluster_deb12.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/oneshot/upgrade-pvc-cluster_deb12.yml b/oneshot/upgrade-pvc-cluster_deb12.yml
index 71e19f0..478850a 100644
--- a/oneshot/upgrade-pvc-cluster_deb12.yml
+++ b/oneshot/upgrade-pvc-cluster_deb12.yml
@@ -18,11 +18,6 @@
         debian_codename: "{{ ansible_lsb.codename }}"
       when: ansible_lsb.codename is defined
 
-    - name: bail out if incorrect version
-      shell: echo "Can't upgrade from Debian < 11; run upgrade-pvc-cluster_deb11.yml against cluster first!" && /bin/false
-      delegate_to: localhost
-      when: debian_version|int < 11
-
     - name: set PVC maintenance mode
       command: pvc cluster maintenance on
 
@@ -134,6 +129,22 @@
       with_items:
         - /etc/apt/sources.list
 
+    - name: remove security entry if on Debian 10
+      lineinfile:
+        dest: /etc/apt/sources.list
+        regexp: "security.debian.org"
+        state: absent
+      when: debian_version < 11
+
+    - name: update apt cache
+      apt:
+        update_cache: yes
+
+    - name: install python-is-python3
+      apt:
+        name: python-is-python3
+        state: latest
+
     - name: aptitude dist upgrade and cleanup
       apt:
         update_cache: yes
@@ -141,11 +152,6 @@
         autoclean: yes
         upgrade: dist
 
-    - name: install python-is-python3
-      apt:
-        name: python-is-python3
-        state: latest
-
     - name: clean up obsolete kernels
       command: /usr/local/sbin/kernel-cleanup.sh