summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2017-09-06 20:16:58 -0400
committerBrian Coca <brian.coca+git@gmail.com>2017-09-06 23:26:44 -0400
commit54ad5b5f49eac8ad071251e430df51a7dda5a791 (patch)
treee5cbe7c990fd1f3b010a7601818026e687ae9d05
parentaa6f3f91ba81a9821ec43f65e0931c4780d67be1 (diff)
downloadansible-54ad5b5f49eac8ad071251e430df51a7dda5a791.tar.gz
fix check mode for solaris enable/disable (#29049)
(cherry picked from commit 78040495921966180fd79145dd6182a6d891fdf2)
-rw-r--r--lib/ansible/modules/system/service.py25
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/ansible/modules/system/service.py b/lib/ansible/modules/system/service.py
index ea484e88cc..7e5199d868 100644
--- a/lib/ansible/modules/system/service.py
+++ b/lib/ansible/modules/system/service.py
@@ -1392,20 +1392,21 @@ class SunOSService(Service):
elif (not self.enable) and (not startup_enabled):
return
- # Mark service as started or stopped (this will have the side effect of
- # actually stopping or starting the service)
- if self.enable:
- subcmd = "enable -rs"
- else:
- subcmd = "disable -s"
+ if not self.module.check_mode:
+ # Mark service as started or stopped (this will have the side effect of
+ # actually stopping or starting the service)
+ if self.enable:
+ subcmd = "enable -rs"
+ else:
+ subcmd = "disable -s"
- rc, stdout, stderr = self.execute_command("%s %s %s" % (self.svcadm_cmd, subcmd, self.name))
+ 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)
+ if rc != 0:
+ if stderr:
+ self.module.fail_json(msg=stderr)
+ else:
+ self.module.fail_json(msg=stdout)
self.changed = True