Merge pull request #21918 from rallytime/bp-21885

Backport #21885 to 2014.7
This commit is contained in:
jfindlay 2015-03-23 19:19:07 -06:00
commit 334a7b8b4f

View File

@ -1542,8 +1542,6 @@ def is_kvm_hyper():
salt '*' virt.is_kvm_hyper salt '*' virt.is_kvm_hyper
''' '''
if __grains__['virtual'] != 'physical':
return False
try: try:
if 'kvm_' not in salt.utils.fopen('/proc/modules').read(): if 'kvm_' not in salt.utils.fopen('/proc/modules').read():
return False return False