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 #32164 from terminalmage/issue31731-2015.5

Browse source 
Make __virtual__ for rhservice.py more robust (2015.5 branch)
This commit is contained in:
Nicole Thomas 2016-03-27 12:21:52 -06:00
commit 32b0421a34
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/rh_service.py
View file

@ -63,14 +63,14 @@ def __virtual__():
else:
return False
try:
osrelease = float(__grains__.get('osrelease', 0))
osrelease_major = __grains__.get('osrelease_info', [0])[0]
except ValueError:
return False
if __grains__['os'] == 'Fedora':
if osrelease > 15:
if osrelease_major >= 15:
return False
if __grains__['os'] in ('RedHat', 'CentOS', 'ScientificLinux', 'OEL'):
if osrelease >= 7:
if osrelease_major >= 7:
return False
return __virtualname__
return False