If a service name ends with .service, .socket, or .target, do not

automatically add ".service" to the end when calling systemctl.
This change allows users to manage sockets and targets using systemctl.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/Systemd.py b/src/lib/Bcfg2/Client/Tools/Systemd.py
index 027d91c71..5778a92da 100644
--- a/src/lib/Bcfg2/Client/Tools/Systemd.py
+++ b/src/lib/Bcfg2/Client/Tools/Systemd.py
@@ -13,15 +13,22 @@ class Systemd(Bcfg2.Client.Tools.SvcTool):
     __handles__ = [('Service', 'systemd')]
     __req__ = {'Service': ['name', 'status']}
 
+    def get_svc_name(self, service):
+        svc = service.get('name')
+        if svc.endswith(('.service', '.socket', '.target')):
+            return svc
+        else:
+            return '%s.service' % svc
+
     def get_svc_command(self, service, action):
-        return "/bin/systemctl %s %s.service" % (action, service.get('name'))
+        return "/bin/systemctl %s %s" % (action, self.get_svc_name(service))
 
     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'))
+        cmd = "/bin/systemctl status %s" % (self.get_svc_name(entry))
         rv = self.cmd.run(cmd)
 
         if 'Loaded: error' in rv.stdout: