Merge lp:~paulgear/charm-helpers/enable-disable-service-systemd into lp:charm-helpers

[Paul Gear]

See lp:1692178 for background on this. This is a fairly simplistic solution, but the mask/unmask has been left in place, in order not to break anything which relies on masked behaviour from systemd-controlled services. I suspect there are no charms which do this, but have no way to be sure; so this is the safe solution which makes enabling services work.

[Stuart Bishop (stub)]

How does this address lp:1692178 ? My understanding is that the disable/enable will not have any effect and with the mask still in place pause/resume will still fail.

review: Needs Information

[Stuart Bishop (stub)]

The unmask of course is happening before the enable, so this is fine. While the disable + mask may be redundant, the unmask + enable is not for the case where a service is disabled but not masked.

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2017-04-11 11:42:53 +0000
+++ charmhelpers/core/host.py	2017-05-20 06:09:38 +0000
@@ -191,6 +191,7 @@
     upstart_file = os.path.join(init_dir, "{}.conf".format(service_name))
     sysv_file = os.path.join(initd_dir, service_name)
     if init_is_systemd():
+        service('disable', service_name)
         service('mask', service_name)
     elif os.path.exists(upstart_file):
         override_path = os.path.join(
@@ -225,6 +226,7 @@
     sysv_file = os.path.join(initd_dir, service_name)
     if init_is_systemd():
         service('unmask', service_name)
+        service('enable', service_name)
     elif os.path.exists(upstart_file):
         override_path = os.path.join(
             init_dir, '{}.override'.format(service_name))