apt, batman: apt-neoraider is not needed for debian stretch based systems

apt/init.sls

@@ -33,6 +33,7 @@ ffho-repo-jessie:
     - require:
       - pkg: python-apt
 
+{% if grains.oscodename in [ "jessie" ] %}
 apt-neoraider:
   pkgrepo.managed:
     - comments:
@@ -43,6 +44,10 @@ apt-neoraider:
     - file: /etc/apt/sources.list.d/universe-factory.list
     - keyserver: pgpkeys.mit.edu
     - keyid: 16EF3F64CB201D9C
+{% else %}
+/etc/apt/sources.list.d/universe-factory.list:
+  file.absent
+{% endif %}
 
 apt-icinga2:
   pkgrepo.managed:

batman/init.sls

@@ -12,9 +12,7 @@ include:
 
 {%- if 'batman' in roles %}
 batctl:
-  pkg.installed:
-    - require:
-      - pkgrepo: apt-neoraider
+  pkg.installed
 
 
 # Convenience bat-hosts file for informative batctl output