bullseye and non-debian. mpd

base/packages/common.sls

@@ -33,7 +33,8 @@ common-installed:
      - python3-pip
      - python3-dev
      - python3-pyinotify
-     - python-m2crypto
+     - python3-m2crypto
+     - python3-apt
      - lockfile-progs
      - virt-what
      - ntp
@@ -46,7 +47,7 @@ common-installed:
      - nfs-common
      - mosquitto-clients
      - autofs
-     - python-apt
+     - debian-keyring
 
 common-removed:
   pkg.removed:

base/packages/prometheus/init.sls

@@ -42,9 +42,12 @@ link-orig-prom-path:
     - require:
       - file: delete-orig-prom-path
 
+{% if grains['oscodename'] != 'bullseye' %}
 patch-smartmon.sh:
   file.managed:
     - name: /usr/share/prometheus-node-exporter/smartmon.sh
     - source: salt://base/packages/prometheus/files/smartmon.sh
     - mode: 0755
+{% endif %}
+
 {%- endif %}

base/packages/repo/debian.sls

@@ -7,6 +7,16 @@
       )
 %}
 
+repo_default:
+  file.managed:
+    - name: /etc/apt/sources.list
+    - contents: '#SALT managed, all in sources.list.d'
+    - user: root
+    - group: root
+    - mode: 0600
+    
+{% if grains['os'] == 'Debian' %}
+
 repo_debian:
   pkgrepo.managed:
     - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ grains['oscodename'] }} main contrib non-free'
@@ -30,12 +40,4 @@ repo_debian-backports:
     - name: 'deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-backports main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-backports.list
     - clean_file: True
-    
-repo_default:
-  file.managed:
-    - name: /etc/apt/sources.list
-    - contents: '#SALT managed, all in sources.list.d'
-    - user: root
-    - group: root
-    - mode: 0600
-    
+{% endif %}    

base/packages/repo/maketank.sls

@@ -10,8 +10,8 @@
 
 repo_maketank:
   pkgrepo.managed:
-    - name: deb http://{{ cache_url }}apt.maketank.net/debian {{ grains['oscodename'] }} main
-    - dist: {{ grains['oscodename'] }}
+    - name: deb http://{{ cache_url }}apt.maketank.net/debian buster main
+    - dist: buster
     - file: /etc/apt/sources.list.d/maketank.list
     - key_url: http://apt.maketank.net/debian/debian.gpg
     - clean_file: True

base/packages/salt/minion.sls

@@ -1,4 +1,7 @@
 {% set salt_v = "3000.1+ds-1" %}
+{% if grains['oscodename'] == 'bullseye' %} 
+{%      set salt_v = "3002.6+dfsg1-4+deb11u1" %} 
+{% endif %}
 
 pkgs-salt-minion:
   pkg.installed:

base/release.sls

@@ -1,7 +1,11 @@
+{% set def_rel = 'bullseye' %}
+{% if grains['oscodename'] != 'bullseye' %} 
+{%    set def_rel = 'buster' %}
+{% endif %}
 
 etc_apt_release:
   file.managed:
     - name: /etc/apt/apt.conf.d/01release
     - user: root
     - mode: 644
-    - contents: 'APT::Default-Release "buster";'
+    - contents: 'APT::Default-Release "{{ def_rel }}";'