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

fixing init system dectection on sles 11, refs #31617

Browse source
This commit is contained in:
Richard McIntosh 2016-03-10 16:46:14 +01:00
parent baeefac252
commit d242cb19b4
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/rh_service.py
View file

@ -60,14 +60,19 @@ def __virtual__():
if __grains__['os'] in enable:
if __grains__['os'] == 'XenServer':
return __virtualname__
if __grains__['os'] == 'SUSE':
if str(__grains__['osrelease']).startswith('11'):
return __virtualname__
else:
return (False, 'Cannot load rh_service module on SUSE > 11')
try:
osrelease = float(__grains__.get('osrelease', 0))
except ValueError:
return (False, 'Cannot load rh_service module: '
'osrelease grain, {0}, not a float,'.format(osrelease))
if __grains__['os'] == 'SUSE':
if osrelease >= 12:
return (False, 'Cannot load rh_service module on SUSE >= 12')
if __grains__['os'] == 'Fedora':
if osrelease > 15:
return (False, 'Cannot load rh_service module on Fedora >= 15')