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

partially reverted previous change to deal with systemctl show status not returning errors on missing service

Browse source 
Now it looks for not-found key instead of running status which does return error codes when service is present but in diff states.
fixes #12216
This commit is contained in:
Brian Coca 2015-09-02 17:09:53 -04:00
parent 6df6e5977e
commit e278f285aa
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
system/service.py
View file

@ -522,13 +522,12 @@ class LinuxService(Service):
def get_systemd_status_dict(self): def get_systemd_status_dict(self):
# Check status first as show will not fail if service does not exist # Check status first as show will not fail if service does not exist
(rc, out, err) = self.execute_command("%s status '%s'" % (self.enable_cmd, self.__systemd_unit,))
if rc != 0:
self.module.fail_json(msg='failure %d running systemctl status for %r: %s' % (rc, self.__systemd_unit, err))
(rc, out, err) = self.execute_command("%s show '%s'" % (self.enable_cmd, self.__systemd_unit,)) (rc, out, err) = self.execute_command("%s show '%s'" % (self.enable_cmd, self.__systemd_unit,))
if rc != 0: if rc != 0:
self.module.fail_json(msg='failure %d running systemctl show for %r: %s' % (rc, self.__systemd_unit, err)) self.module.fail_json(msg='failure %d running systemctl show for %r: %s' % (rc, self.__systemd_unit, err))
elif 'LoadState=not-found' in out:
self.module.fail_json(msg='systemd could not find the requested service "%r": %s' % (self.__systemd_unit, err))
key = None key = None
value_buffer = [] value_buffer = []
status_dict = {} status_dict = {}