mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Merge pull request #13748 from simoncadman/develop
CentOS 7 and Scientific Linux 7 should also use systemd module
This commit is contained in:
commit
cf2cf9bc9f
@ -57,7 +57,7 @@ def __virtual__():
|
|||||||
if __grains__['os'] == 'Fedora':
|
if __grains__['os'] == 'Fedora':
|
||||||
if __grains__.get('osrelease', 0) > 15:
|
if __grains__.get('osrelease', 0) > 15:
|
||||||
return False
|
return False
|
||||||
if __grains__['os'] == 'RedHat':
|
if __grains__['os'] in ('RedHat','CentOS','ScientificLinux'):
|
||||||
if __grains__.get('osrelease', 0) >= 7:
|
if __grains__.get('osrelease', 0) >= 7:
|
||||||
return False
|
return False
|
||||||
return __virtualname__
|
return __virtualname__
|
||||||
|
Loading…
Reference in New Issue
Block a user