Merge pull request #13748 from simoncadman/develop

CentOS 7 and Scientific Linux 7 should also use systemd module
This commit is contained in:
Thomas S Hatch 2014-06-26 09:52:44 -06:00
commit cf2cf9bc9f

View File

@ -57,7 +57,7 @@ def __virtual__():
if __grains__['os'] == 'Fedora':
if __grains__.get('osrelease', 0) > 15:
return False
if __grains__['os'] == 'RedHat':
if __grains__['os'] in ('RedHat','CentOS','ScientificLinux'):
if __grains__.get('osrelease', 0) >= 7:
return False
return __virtualname__