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

Merge pull request #29454 from jfindlay/rh_service

Browse source 
rh_service module __virtual__ return error messages
This commit is contained in:
Mike Place 2015-12-07 12:32:15 -07:00
commit 289e9d169e
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/modules/rh_service.py
View file

@ -60,23 +60,22 @@ 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
try:
osrelease = float(__grains__.get('osrelease', 0))
except ValueError:
return False
return (False, 'Cannot load rh_service module: '
'osrelease grain, {0}, not a float,'.format(osrelease))
if __grains__['os'] == 'SUSE':
if osrelease > 11:
return (False, 'Cannot load rh_service module on SUSE >= 11')
if __grains__['os'] == 'Fedora':
if osrelease > 15:
return False
return (False, 'Cannot load rh_service module on Fedora >= 15')
if __grains__['os'] in ('RedHat', 'CentOS', 'ScientificLinux', 'OEL'):
if osrelease >= 7:
return False
return (False, 'Cannot load rh_service module on RedHat >= 7')
return __virtualname__
return False
return (False, 'Cannot load rh_service module: OS not in {0}'.format(enable))
def _runlevel():