heavy repo refactoring

base/packages/repo/debian-bullseye.sls

@@ -5,6 +5,7 @@
       )
 %}
 
+{% if salt['pillar.get']('os:release', default = 'buster') != 'bullseye' %}
 
 repo_debian-bullseye:
   pkgrepo.managed:
@@ -12,3 +13,10 @@ repo_debian-bullseye:
     - file: /etc/apt/sources.list.d/debian-bullseye.list
     - clean_file: True
 
+{% else %}
+
+repo_debian-bullseye-absent:
+  file.absent:
+    - name: /etc/apt/sources.list.d/debian-bullseye.list
+
+{% endif %}

base/packages/repo/debian.sls

@@ -7,6 +7,18 @@
       )
 %}
 
+{%- 
+ set os_rel = salt['pillar.get'](
+     'os:release', 
+     default=False
+     )
+%}
+
+{%- if not os_rel %}
+  set os_rel = grains['oscodename']
+{%- endif %}
+
+
 repo_default:
   file.managed:
     - name: /etc/apt/sources.list
@@ -19,25 +31,32 @@ repo_default:
 
 repo_debian:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ grains['oscodename'] }} main contrib non-free'
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }} main contrib non-free'
     - file: /etc/apt/sources.list.d/debian.list
     - clean_file: True
 
 repo_debian-updates:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-updates main contrib non-free'
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }}-updates main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-updates.list
     - clean_file: True
 
+#deb http://deb.debian.org/debian-security/ bullseye-security main contrib non-free
+{% if os_rel == 'buster' %}
+{% set repo_path = "/updates" %}
+{% else %}
+{% set repo_path = "-security" %}
+{% endif %}
+
 repo_debian-security:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url}}deb.debian.org/debian-security {{ grains['oscodename'] }}/updates main contrib non-free'
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian-security {{ os_rel }}{{ repo_path }} main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-security.list
     - clean_file: True
 
 repo_debian-backports:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-backports main contrib non-free'
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }}-backports main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-backports.list
     - clean_file: True
 {% endif %}    

base/release.sls

@@ -1,5 +1,5 @@
 {% set def_rel = 'bullseye' %}
-{% if grains['oscodename'] != 'bullseye' %} 
+{% if grains['oscodename'] != 'bullseye' and salt['pillar.get']('os:release', default = False) != 'bullseye' %} 
 {%    set def_rel = 'buster' %}
 {% endif %}