fix(centos-6): has only _one_ service 'openvpn'

myii · Jul 13, 2019 · 3d5723d · 3d5723d
1 parent b16756c
commit 3d5723d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/openvpn/map.jinja b/openvpn/map.jinja
@@ -1,21 +1,26 @@
 {% import_yaml "openvpn/defaults.yaml" as defaults %}
 {% import_yaml "openvpn/osfamilymap.yaml" as osfamilymap %}
 {% import_yaml "openvpn/osmap.yaml" as osmap %}
+{% import_yaml "openvpn/osfingermap.yaml" as osfingermap %}
 
 {% do defaults.openvpn.update({'multi_services': salt['grains.has_value']('systemd')}) %}
 
 {% set map = salt['grains.filter_by'](
     defaults, 
     merge=salt['grains.filter_by'](
-	   osfamilymap,
-	   grain='os_family',
-	   merge=salt['grains.filter_by'](
-		 osmap,
-		 grain='os',
-		 merge=salt['pillar.get']('openvpn:lookup', {}),
-         ),
-   ),
-   base='openvpn')
+        osfamilymap,
+        grain='os_family',
+        merge=salt['grains.filter_by'](
+            osmap,
+            grain='os',
+            merge=salt['grains.filter_by'](
+                osfingermap,
+                grain='os',
+                merge=salt['pillar.get']('openvpn:lookup', {}),
+            ),
+        ),
+    ),
+    base='openvpn')
  %}
 
 {%- macro multipart_param(value, index=None) %}

diff --git a/openvpn/osfingermap.yaml b/openvpn/osfingermap.yaml
@@ -0,0 +1,2 @@
+CentOS-6:
+  multi_services: false