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

Make service work when the service is not present in rc.conf

Browse source 
After installing a package from the ports collection on a
fresh FreeBSD 11.0, Ansible was unable to enable it, failing with
"unable to get current rcvar value". Debugging showed that sysrc
didn't see the variable from /usr/local/etc/rc.d/myservice, but
adding the value was working.

So we will just fallback to the default value if we can't find it.
This commit is contained in:
Michael Scherer 2016-10-23 19:24:00 +02:00 committed by Matt Clay
parent b85bcb71c3
commit 352d280058
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/system/service.py
View file

@ -988,7 +988,7 @@ class FreeBsdService(Service):
# and hope for the best.
for rcvar in rcvars:
if '=' in rcvar:
self.rcconf_key = rcvar.split('=')[0]
self.rcconf_key, default_rcconf_value = rcvar.split('=', 1)
break
if self.rcconf_key is None:
@ -997,8 +997,10 @@ class FreeBsdService(Service):
if self.sysrc_cmd: # FreeBSD >= 9.2
rc, current_rcconf_value, stderr = self.execute_command("%s -n %s" % (self.sysrc_cmd, self.rcconf_key))
# it can happen that rcvar is not set (case of a system coming from the ports collection)
# so we will fallback on the default
if rc != 0:
self.module.fail_json(msg="unable to get current rcvar value", stdout=stdout, stderr=stderr)
current_rcconf_value = default_rcconf_value
if current_rcconf_value.strip().upper() != self.rcconf_value: