summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/server/plugins/generators/rules.txt2
-rw-r--r--src/lib/Bcfg2/Client/Tools/Chkconfig.py3
-rw-r--r--src/lib/Bcfg2/Client/Tools/RcUpdate.py3
-rw-r--r--src/lib/Bcfg2/Client/Tools/Systemd.py3
-rw-r--r--src/lib/Bcfg2/Client/Tools/launchd.py3
5 files changed, 13 insertions, 1 deletions
diff --git a/doc/server/plugins/generators/rules.txt b/doc/server/plugins/generators/rules.txt
index 782ad290d..7cc345a68 100644
--- a/doc/server/plugins/generators/rules.txt
+++ b/doc/server/plugins/generators/rules.txt
@@ -191,7 +191,7 @@ Service status descriptions
* ignore
- * don't check the status, leave it as-is (valid for deb and upstart services only)
+ * Don't perform service status checks.
Client Tag
----------
diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
index 0169b12da..ad9e58350 100644
--- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py
+++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
@@ -21,6 +21,9 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool):
def VerifyService(self, entry, _):
"""Verify Service status for entry."""
+ if entry.get('status') == 'ignore':
+ return True
+
try:
cmd = "/sbin/chkconfig --list %s " % (entry.get('name'))
raw = self.cmd.run(cmd)[1]
diff --git a/src/lib/Bcfg2/Client/Tools/RcUpdate.py b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
index ddf9c1f2d..a53a45251 100644
--- a/src/lib/Bcfg2/Client/Tools/RcUpdate.py
+++ b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
@@ -18,6 +18,9 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
Assumes we run in the "default" runlevel.
"""
+ if entry.get('status') == 'ignore':
+ return True
+
# check if service is enabled
cmd = '/sbin/rc-update show default | grep %s'
rc = self.cmd.run(cmd % entry.get('name'))[0]
diff --git a/src/lib/Bcfg2/Client/Tools/Systemd.py b/src/lib/Bcfg2/Client/Tools/Systemd.py
index a295bc608..43eca2eac 100644
--- a/src/lib/Bcfg2/Client/Tools/Systemd.py
+++ b/src/lib/Bcfg2/Client/Tools/Systemd.py
@@ -17,6 +17,9 @@ class Systemd(Bcfg2.Client.Tools.SvcTool):
def VerifyService(self, entry, _):
"""Verify Service status for entry."""
+ if entry.get('status') == 'ignore':
+ return True
+
cmd = "/bin/systemctl status %s.service " % (entry.get('name'))
raw = ''.join(self.cmd.run(cmd)[1])
diff --git a/src/lib/Bcfg2/Client/Tools/launchd.py b/src/lib/Bcfg2/Client/Tools/launchd.py
index 6f08559a2..ff0cb3788 100644
--- a/src/lib/Bcfg2/Client/Tools/launchd.py
+++ b/src/lib/Bcfg2/Client/Tools/launchd.py
@@ -59,6 +59,9 @@ class launchd(Bcfg2.Client.Tools.Tool):
def VerifyService(self, entry, _):
"""Verify launchd service entry."""
+ if entry.get('status') == 'ignore':
+ return True
+
try:
services = self.cmd.run("/bin/launchctl list")[1]
except IndexError: