Skip to content

Commit 3d5723d

Browse files
committed
fix(centos-6): has only _one_ service 'openvpn'
1 parent b16756c commit 3d5723d

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

openvpn/map.jinja

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
{% import_yaml "openvpn/defaults.yaml" as defaults %}
22
{% import_yaml "openvpn/osfamilymap.yaml" as osfamilymap %}
33
{% import_yaml "openvpn/osmap.yaml" as osmap %}
4+
{% import_yaml "openvpn/osfingermap.yaml" as osfingermap %}
45

56
{% do defaults.openvpn.update({'multi_services': salt['grains.has_value']('systemd')}) %}
67

78
{% set map = salt['grains.filter_by'](
89
defaults,
910
merge=salt['grains.filter_by'](
10-
osfamilymap,
11-
grain='os_family',
12-
merge=salt['grains.filter_by'](
13-
osmap,
14-
grain='os',
15-
merge=salt['pillar.get']('openvpn:lookup', {}),
16-
),
17-
),
18-
base='openvpn')
11+
osfamilymap,
12+
grain='os_family',
13+
merge=salt['grains.filter_by'](
14+
osmap,
15+
grain='os',
16+
merge=salt['grains.filter_by'](
17+
osfingermap,
18+
grain='os',
19+
merge=salt['pillar.get']('openvpn:lookup', {}),
20+
),
21+
),
22+
),
23+
base='openvpn')
1924
%}
2025

2126
{%- macro multipart_param(value, index=None) %}

openvpn/osfingermap.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CentOS-6:
2+
multi_services: false

0 commit comments

Comments
 (0)