fix check mode for solaris enable/disable (#29049)

This commit is contained in:
Brian Coca 2017-09-06 20:16:58 -04:00 committed by Jordan Borean
parent ecc1fbcc1d
commit 7804049592

View file

@ -1388,20 +1388,21 @@ class SunOSService(Service):
elif (not self.enable) and (not startup_enabled): elif (not self.enable) and (not startup_enabled):
return return
# Mark service as started or stopped (this will have the side effect of if not self.module.check_mode:
# actually stopping or starting the service) # Mark service as started or stopped (this will have the side effect of
if self.enable: # actually stopping or starting the service)
subcmd = "enable -rs" if self.enable:
else: subcmd = "enable -rs"
subcmd = "disable -s"
rc, stdout, stderr = self.execute_command("%s %s %s" % (self.svcadm_cmd, subcmd, self.name))
if rc != 0:
if stderr:
self.module.fail_json(msg=stderr)
else: else:
self.module.fail_json(msg=stdout) subcmd = "disable -s"
rc, stdout, stderr = self.execute_command("%s %s %s" % (self.svcadm_cmd, subcmd, self.name))
if rc != 0:
if stderr:
self.module.fail_json(msg=stderr)
else:
self.module.fail_json(msg=stdout)
self.changed = True self.changed = True