Merge pull request #28885 from kt97679/2015.8

fix for: service.enabled fails on xen server #28754
This commit is contained in:
Justin Findlay 2015-11-13 21:55:38 -07:00
commit a45ce78e20

View file

@ -44,6 +44,7 @@ def __virtual__():
'''
# Enable on these platforms only.
enable = set((
'XenServer',
'RedHat',
'CentOS',
'ScientificLinux',
@ -57,6 +58,8 @@ def __virtual__():
'McAfee OS Server'
))
if __grains__['os'] in enable:
if __grains__['os'] == 'XenServer':
return __virtualname__
if __grains__['os'] == 'SUSE':
if str(__grains__['osrelease']).startswith('11'):
return __virtualname__