This is fix for salt-formulas#182 part 2. Add backward compatibility.

- We will check now if pillar system.selinux is a map for new format
- If system.selinux is not a map use old format
- policycoreutils and policycoreutils-python are not nessasary for basic selinux configuration
  we need this packages later to add selinux rules.
- Added new format to test pillars

linux/map.jinja

@@ -80,7 +80,7 @@
          },
     },
     'RedHat': {
-        'pkgs': ['policycoreutils', 'policycoreutils-python', 'telnet', 'wget'],
+        'pkgs': ['telnet', 'wget'],
         'utc': true,
         'user': {},
         'group': {},

linux/system/selinux.sls

@@ -1,19 +1,29 @@
 {%- from "linux/map.jinja" import system with context %}
 {%- if system.selinux is defined %}
+{%- if grains.os_family == 'RedHat' %}
+
+{% if system.selinux is mapping %}
 
   {% if system.selinux.pkgs %}
 linux_system_selinux_pkgs:
   pkg.installed:
   - pkgs: {{ system.selinux.pkgs }}
   {%- endif %}
 
-  {%- if grains.os_family == 'RedHat' %}
-
+  {%- if system.selinux.mode %}
 {{ system.selinux.mode }}:
   selinux.mode:
     - require:
       - pkg: linux_system_selinux_pkgs
+  {%- endif %}
+
+  {%- else %}
+
+{{ system.selinux }}:
+  selinux.mode
 
   {%- endif %}
+
+{%- endif %}
 {%- endif %}
 

tests/pillar/system.sls

@@ -24,7 +24,8 @@ linux:
     domain: ci.local
     environment: prd
     purge_repos: true
-    selinux: permissive
+    selinux:
+      mode: permissive
     directory:
       /tmp/test:
         makedirs: true