saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't load service.py if minion is running a non-sysvinit init system

Browse source 
This keeps service.py from overriding systemd.py, among others.
This commit is contained in:
Erik Johnson 2018-08-06 09:37:38 -05:00
parent 928d688d65
commit 23f87bd536
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
salt/modules/service.py
View file

@ -33,39 +33,24 @@ def __virtual__():
'Ubuntu',
'Debian',
'Devuan',
'Arch',
'Arch ARM',
'Manjaro',
'ALT',
'SUSE Enterprise Server',
'SUSE',
'OEL',
'Linaro',
'elementary OS',
'McAfee OS Server',
'Void',
'Mint',
'Raspbian',
'XenServer',
'Cumulus'
))
if __grains__.get('os', '') in disable:
if __grains__.get('os') in disable:
return (False, 'Your OS is on the disabled list')
# Disable on all non-Linux OSes as well
if __grains__['kernel'] != 'Linux':
return (False, 'Non Linux OSes are not supported')
# SUSE >=12.0 uses systemd
if __grains__.get('os_family', '') == 'Suse':
try:
# osrelease might be in decimal format (e.g. "12.1"), or for
# SLES might include service pack (e.g. "11 SP3"), so split on
# non-digit characters, and the zeroth element is the major
# number (it'd be so much simpler if it was always "X.Y"...)
import re
if int(re.split(r'\D+', __grains__.get('osrelease', ''))[0]) >= 12:
return (False, 'SUSE version greater than or equal to 12 is not supported')
except ValueError:
return (False, 'You are missing the os_family grain')
init_grain = __grains__.get('init')
if init_grain not in (None, 'sysvinit', 'unknown'):
return (False, 'Minion is running {0}'.format(init_grain))
elif __utils__['systemd.booted'](__context__):
# Should have been caught by init grain check, but check just in case
return (False, 'Minion is running systemd')
return 'service'