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

Merge pull request #5 from eest/openbsd_rcctl

Browse source 
Update OpenBSD rcctl handling to use new syntax.
This commit is contained in:
Jonathan Armani 2015-01-23 10:31:30 +01:00
commit 73be895b29
1 changed files with 51 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
system/service.py
View file

@ -991,33 +991,33 @@ class OpenBsdService(Service):
if not self.enable_cmd: if not self.enable_cmd:
return super(OpenBsdService, self).service_enable() return super(OpenBsdService, self).service_enable()
rc, stdout, stderr = self.execute_command("%s %s %s" % (self.enable_cmd, 'default', self.name)) rc, stdout, stderr = self.execute_command("%s %s %s %s" % (self.enable_cmd, 'getdef', self.name, 'flags'))
if stderr: if stderr:
self.module.fail_json(msg=stderr) self.module.fail_json(msg=stderr)
default_string = stdout.rstrip() getdef_string = stdout.rstrip()
# Depending on the service the string returned from 'default' may be # Depending on the service the string returned from 'default' may be
# either a set of flags or the boolean YES/NO # either a set of flags or the boolean YES/NO
if default_string == "YES" or default_string == "NO": if getdef_string == "YES" or getdef_string == "NO":
default_flags = '' default_flags = ''
else: else:
default_flags = default_string default_flags = getdef_string
rc, stdout, stderr = self.execute_command("%s %s %s" % (self.enable_cmd, 'status', self.name)) rc, stdout, stderr = self.execute_command("%s %s %s %s" % (self.enable_cmd, 'get', self.name, 'flags'))
if stderr: if stderr:
self.module.fail_json(msg=stderr) self.module.fail_json(msg=stderr)
status_string = stdout.rstrip() get_string = stdout.rstrip()
# Depending on the service the string returned from 'status' may be # Depending on the service the string returned from 'getdef/get' may be
# either a set of flags or the boolean YES/NO # either a set of flags or the boolean YES/NO
if status_string == "YES" or status_string == "NO": if get_string == "YES" or get_string == "NO":
current_flags = '' current_flags = ''
else: else:
current_flags = status_string current_flags = get_string
# If there are arguments from the user we use these as flags unless # If there are arguments from the user we use these as flags unless
# they are already set. # they are already set.
@ -1031,29 +1031,62 @@ class OpenBsdService(Service):
else: else:
changed_flags = '' changed_flags = ''
rc, stdout, stderr = self.execute_command("%s %s %s %s" % (self.enable_cmd, 'get', self.name, 'status'))
if self.enable: if self.enable:
if rc == 0 and not changed_flags: if rc == 0 and not changed_flags:
return return
action = "enable %s" % (self.name) if rc != 0:
status_action = "set %s status on" % (self.name)
else:
status_action = ''
if changed_flags: if changed_flags:
action = action + " flags %s" % (changed_flags) flags_action = "set %s flags %s" % (self.name, changed_flags)
else:
flags_action = ''
else: else:
if rc == 1: if rc == 1:
return return
action = "disable %s" % self.name status_action = "set %s status off" % self.name
flags_action = ''
# Verify state assumption
if not status_action and not flags_action:
self.module.fail_json(msg="neither status_action or status_flags is set, this should never happen")
if self.module.check_mode: if self.module.check_mode:
self.module.exit_json(changed=True, msg="changing service enablement") self.module.exit_json(changed=True, msg="changing service enablement")
rc, stdout, stderr = self.execute_command("%s %s" % (self.enable_cmd, action)) status_modified = 0
if status_action:
rc, stdout, stderr = self.execute_command("%s %s" % (self.enable_cmd, status_action))
if rc != 0: if rc != 0:
if stderr: if stderr:
self.module.fail_json(msg=stderr) self.module.fail_json(msg=stderr)
else: else:
self.module.fail_json(msg="rcctl failed to modify service enablement") self.module.fail_json(msg="rcctl failed to modify service status")
status_modified = 1
if flags_action:
rc, stdout, stderr = self.execute_command("%s %s" % (self.enable_cmd, flags_action))
if rc != 0:
if stderr:
if status_modified:
error_message = "rcctl modified service status but failed to set flags: " + stderr
else:
error_message = stderr
else:
if status_modified:
error_message = "rcctl modified service status but failed to set flags"
else:
error_message = "rcctl failed to modify service flags"
self.module.fail_json(msg=error_message)
self.changed = True self.changed = True