From ba08f6714222622467215c23c8284f992830e047 Mon Sep 17 00:00:00 2001 From: Richard McIntosh Date: Thu, 10 Mar 2016 16:46:14 +0100 Subject: [PATCH 33/33] fixing init system dectection on sles 11, refs #31617 --- salt/modules/rh_service.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/salt/modules/rh_service.py b/salt/modules/rh_service.py index 910a75d..c8ebb52 100644 --- a/salt/modules/rh_service.py +++ b/salt/modules/rh_service.py @@ -60,14 +60,19 @@ def __virtual__(): if __grains__['os'] in enable: if __grains__['os'] == 'XenServer': return __virtualname__ + + if __grains__['os'] == 'SUSE': + if str(__grains__['osrelease']).startswith('11'): + return __virtualname__ + else: + return (False, 'Cannot load rh_service module on SUSE > 11') + try: osrelease = float(__grains__.get('osrelease', 0)) except ValueError: return (False, 'Cannot load rh_service module: ' 'osrelease grain, {0}, not a float,'.format(osrelease)) - if __grains__['os'] == 'SUSE': - if osrelease >= 12: - return (False, 'Cannot load rh_service module on SUSE >= 12') + if __grains__['os'] == 'Fedora': if osrelease > 15: return (False, 'Cannot load rh_service module on Fedora >= 15') -- 2.1.4