cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #759 from jonhadfield/systemd_enabled_check

Browse source 
use is-enabled to check systemd service status.
This commit is contained in:
Brian Coca 2015-02-16 12:29:44 -05:00
commit ed8154bdc7
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
system/service.py
View file

@ -479,6 +479,12 @@ class LinuxService(Service):
if location.get('initctl', False):
self.svc_initctl = location['initctl']
def get_systemd_service_enabled(self):
(rc, out, err) = self.execute_command("%s is-enabled %s" % (self.enable_cmd, self.__systemd_unit,))
if rc == 0:
return True
return False
def get_systemd_status_dict(self):
(rc, out, err) = self.execute_command("%s show %s" % (self.enable_cmd, self.__systemd_unit,))
if rc != 0:
@ -693,12 +699,11 @@ class LinuxService(Service):
action = 'disable'
# Check if we're already in the correct state
d = self.get_systemd_status_dict()
if "UnitFileState" in d:
if self.enable and d["UnitFileState"] == "enabled":
self.changed = False
elif not self.enable and d["UnitFileState"] == "disabled":
self.changed = False
service_enabled = self.get_systemd_service_enabled()
if self.enable and service_enabled:
self.changed = False
elif not self.enable and not service_enabled:
self.changed = False
elif not self.enable:
self.changed = False