Merge lp:~tribaal/charms/trusty/ntpmaster/python3-hooks into lp:charms/trusty/ntpmaster

[Chris Glass]

This branch makes the charm code run on python3 instead of python2, since the latter is not available on a Xenial+ image by default.

Steps taken:

- Refresh charmhelpers (they now use six where necesseary)
- Change the shebang to point to python3 instead of python.

Tests done:

Autopilot deployments didn't reveal any problems (charm installs and works as expected) on both trusty and xenial.

[Chris Glass (tribaal)]

This exact code is already published to the charm store at cs:~tribaal/xenial/ntpmaster-python3-0 for testing purposes.

[Charles Butler (lazypower)]

+1 LGTM

It gets a clean bill of health from bundle tester
PASS: 4 Total: 4 (357.364986 sec)

Thanks for the contribution!

review: Approve

[Charles Butler (lazypower)]

Thanks for the submission! A few things I did as a follow up i want documented as the new charm store bits may have some dragons in there...

- pushed this to cs:~landscape-charmers/trusty/ntpmaster-0
- set acl to read=everyone
- promulgated this to ntpmaster-5 in the store

Any future pushes to cs:~landscape-charmers/trusty/ntpmaster should auto-rev the promulgated version. Use best practices for testing releases before pushing directly to this space :)

If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>, or ask a question tagged with "juju" on http://askubuntu.com.

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/3987/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/4028/

review: Needs Fixing (automated testing)

=== added file 'hooks/charmhelpers/contrib/hardening/apache/templates/__init__.py'
=== added file 'hooks/charmhelpers/contrib/hardening/defaults/__init__.py'
=== added file 'hooks/charmhelpers/contrib/hardening/host/templates/__init__.py'
=== added file 'hooks/charmhelpers/contrib/hardening/mysql/templates/__init__.py'
=== added file 'hooks/charmhelpers/contrib/hardening/ssh/templates/__init__.py'
=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2016-03-21 05:58:51 +0000
+++ hooks/charmhelpers/core/host.py	2016-05-03 06:51:45 +0000
@@ -128,6 +128,13 @@
     return subprocess.call(cmd) == 0
 
 
+def systemv_services_running():
+    output = subprocess.check_output(
+        ['service', '--status-all'],
+        stderr=subprocess.STDOUT).decode('UTF-8')
+    return [row.split()[-1] for row in output.split('\n') if '[ + ]' in row]
+
+
 def service_running(service_name):
     """Determine whether a system service is running"""
     if init_is_systemd():
@@ -140,11 +147,15 @@
         except subprocess.CalledProcessError:
             return False
         else:
+            # This works for upstart scripts where the 'service' command
+            # returns a consistent string to represent running 'start/running'
             if ("start/running" in output or "is running" in output or
                     "up and running" in output):
                 return True
-            else:
-                return False
+            # Check System V scripts init script return codes
+            if service_name in systemv_services_running():
+                return True
+            return False
 
 
 def service_available(service_name):
@@ -412,7 +423,7 @@
     pass
 
 
-def restart_on_change(restart_map, stopstart=False):
+def restart_on_change(restart_map, stopstart=False, restart_functions=None):
     """Restart services based on configuration files changing
 
     This function is used a decorator, for example::
@@ -433,18 +444,22 @@
 
     @param restart_map: {path_file_name: [service_name, ...]
     @param stopstart: DEFAULT false; whether to stop, start OR restart
+    @param restart_functions: nonstandard functions to use to restart services
+                              {svc: func, ...}
     @returns result from decorated function
     """
     def wrap(f):
         @functools.wraps(f)
         def wrapped_f(*args, **kwargs):
             return restart_on_change_helper(
-                (lambda: f(*args, **kwargs)), restart_map, stopstart)
+                (lambda: f(*args, **kwargs)), restart_map, stopstart,
+                restart_functions)
         return wrapped_f
     return wrap
 
 
-def restart_on_change_helper(lambda_f, restart_map, stopstart=False):
+def restart_on_change_helper(lambda_f, restart_map, stopstart=False,
+                             restart_functions=None):
     """Helper function to perform the restart_on_change function.
 
     This is provided for decorators to restart services if files described
@@ -453,8 +468,12 @@
     @param lambda_f: function to call.
     @param restart_map: {file: [service, ...]}
     @param stopstart: whether to stop, start or restart a service
+    @param restart_functions: nonstandard functions to use to restart services
+                              {svc: func, ...}
     @returns result of lambda_f()
     """
+    if restart_functions is None:
+        restart_functions = {}
     checksums = {path: path_hash(path) for path in restart_map}
     r = lambda_f()
     # create a list of lists of the services to restart
@@ -465,9 +484,12 @@
     services_list = list(OrderedDict.fromkeys(itertools.chain(*restarts)))
     if services_list:
         actions = ('stop', 'start') if stopstart else ('restart',)
-        for action in actions:
-            for service_name in services_list:
-                service(action, service_name)
+        for service_name in services_list:
+            if service_name in restart_functions:
+                restart_functions[service_name](service_name)
+            else:
+                for action in actions:
+                    service(action, service_name)
     return r
 
 

=== modified file 'hooks/ntpmaster_hooks.py'
--- hooks/ntpmaster_hooks.py	2016-03-21 06:18:46 +0000
+++ hooks/ntpmaster_hooks.py	2016-05-03 06:51:45 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import shutil