Added fixes.osmajorrelease module to get os major release version on Debian bullseye

.gitlab-ci.yml

@@ -67,4 +67,4 @@ highstate:debug:
     - cat /var/log/salt/*
   script:
     - salt-call grains.items --local
-    - salt-call --local state.show_highstate -l debug --retcode-passthrough
+    - salt-call --local state.show_highstate -l debug --retcode-passthrough --module-dirs _modules/

_modules/fixes.py

+"""
+Various fixes and workarounds
+"""
+
+
+def osmajorrelease():
+    """
+    Provide a wrapper for osmajorrelease grains as debian bullseye does not set the release number
+
+    :rtype: int
+    """
+    versions = {
+        'Debian-bullseye': 11
+    }
+
+    if 'osmajorrelease' in __grains__:
+        return __grains__['osmajorrelease']
+
+    return versions['%s-%s' % (__grains__['osfullname'], __grains__['oscodename'])]

apt/dependencies.sls

-{% if grains['osmajorrelease'] <= 10 %}
+{% if salt['fixes.osmajorrelease']()  <= 10 %}
 python-apt:
   pkg.installed
 {%- endif %}

apt/transport/https.sls

-{% if grains['osmajorrelease'] < 10 %}
+{% if salt['fixes.osmajorrelease']() < 10 %}
 apt-transport-https:
   pkg.installed:
     - order: 1

common/bpfcc.sls

-{% if grains['osmajorrelease'] >= 10 %}
+{% if salt['fixes.osmajorrelease']() >= 10 %}
 linux-headers-amd64:
   pkg.latest
 

common/python.sls

 python3-systemd:
   pkg.installed
 
-{% if grains['osmajorrelease'] >= 10 %}
+{% if salt['fixes.osmajorrelease']() >= 10 %}
 python-pip:
   pkg.installed:
     - pkgs:

ferm/init.sls

@@ -29,7 +29,7 @@
     - mode: '0644'
 
 
-{% if grains['osmajorrelease'] == 11 %}
+{% if salt['fixes.osmajorrelease']() == 11 %}
 # install ferm from sid on bullseye
 ferm-apt-pin:
   file.accumulated:
@@ -44,7 +44,7 @@ ferm:
   pkg.installed:
     - pkgs:
       - ferm
-{% if grains['osmajorrelease'] == 11 %}
+{% if salt['fixes.osmajorrelease']() == 11 %}
     - fromrepo: sid
     - require:
       - pkgrepo: sid
@@ -58,11 +58,11 @@ ferm:
       - file: /etc/ferm/conf.d/*
 
 include:
-{% if grains['osmajorrelease'] == 11 %}
-  - apt.repository.sid
-{% endif %}
-{% if 'vmhost' in roles or 'edge' in roles or 'noconntrack' in roles -%}
+{%- if 'vmhost' in roles or 'edge' in roles or 'noconntrack' in roles %}
   - ferm.stateless
-{% else -%}
+{%- else %}
   - ferm.stateful
-{% endif %}
+{%- endif %}
+{%- if salt['fixes.osmajorrelease']() == 11 %}
+  - apt.repository.sid
+{%- endif %}

kea-dhcp/init.sls

-{% if grains['osmajorrelease'] >= 10 %}
+{% if salt['fixes.osmajorrelease']() >= 10 %}
 include:
   - apt.repository.sid
 
@@ -16,7 +16,7 @@ kea-dhcp4-server:
   pkg.installed:
     - pkgs:
       - kea-dhcp4-server
-{% if grains['osmajorrelease'] >= 10 %}
+{% if salt['fixes.osmajorrelease']() >= 10 %}
     - fromrepo: sid
     - require:
       - pkgrepo: sid
@@ -45,7 +45,7 @@ kea-dhcp6-server:
   pkg.installed:
     - pkgs:
       - kea-dhcp6-server
-{% if grains['osmajorrelease'] >= 10 %}
+{% if salt['fixes.osmajorrelease']() >= 10 %}
     - fromrepo: sid
     - require:
       - pkgrepo: sid

kernel/init.sls

-{% if grains['osmajorrelease'] >= 10 and salt['pillar.get']('sid-kernel', False) %}
+{% if salt['fixes.osmajorrelease']() >= 10 and salt['pillar.get']('sid-kernel', False) %}
 include:
   - apt.repository.sid
 
@@ -13,7 +13,7 @@ kernel-apt-pin:
 
 packages_kernel:
   pkg.latest:
-{% if grains['osmajorrelease'] >= 10 and salt['pillar.get']('sid-kernel', False) %}
+{% if salt['fixes.osmajorrelease']() >= 10 and salt['pillar.get']('sid-kernel', False) %}
     - fromrepo: sid
 {%- elif grains['osfinger'] == "Debian-9" %}
     - fromrepo: stretch-backports