Merge lp:~brad-marshall/charms/trusty/thruk-master/fix-multiseries into lp:~canonical-bootstack/charms/trusty/thruk-master/trunk

[Brad Marshall]

Fix multiseries and move to python3.

[James Hebden (ec0)]

LGTM

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-05-28 04:14:24 +0000
+++ hooks/actions.py	2017-03-21 04:39:07 +0000
@@ -20,8 +20,9 @@
 
     if config.changed('source'):
         prev_ppa = config.previous('source')
-	if prev_ppa is not None:
-            subprocess.check_call(['add-apt-repository', '--yes', '--remove', prev_ppa])
+        if prev_ppa is not None:
+            subprocess.check_call(['add-apt-repository',
+                                   '--yes', '--remove', prev_ppa])
         ppa = config.get('source')
         if ppa is not None:
             add_source(ppa)
@@ -35,10 +36,11 @@
         password = pwgen()
         with open(passwd_file, 'w') as pfile:
             pfile.write(password)
-            os.chmod(pfile.name, 0600)
+            os.chmod(pfile.name, 0o600)
 
-        ret = subprocess.call(["/usr/bin/htpasswd", "-b", "/etc/thruk/htpasswd",
-                              "thrukadmin", password])
+        ret = subprocess.call(["/usr/bin/htpasswd",
+                               "-b", "/etc/thruk/htpasswd",
+                               "thrukadmin", password])
         if not ret:
             hookenv.log('WARNING: thruk htpassword reset failed!')
     else:
@@ -55,7 +57,8 @@
                 (hookenv.config('trusted_ssl_certlocation').rpartition('/')[2])
 
         trusted_ssl_cert = hookenv.config('trusted_ssl_cert')
-        hookenv.log("Writing cert from trusted_ssl_cert: %s" % trusted_ssl_cert)
+        hookenv.log("Writing cert from trusted_ssl_cert: %s"
+                    % trusted_ssl_cert)
         with open(cert_file, 'w') as f:
             f.write(str(base64.b64decode(trusted_ssl_cert)))
 
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-04-09 06:46:35 +0000
+++ hooks/config-changed	2017-03-21 04:39:07 +0000
@@ -1,3 +1,3 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import services
 services.manage()
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-04-09 06:46:35 +0000
+++ hooks/hooks.py	2017-03-21 04:39:07 +0000
@@ -1,3 +1,3 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import services
 services.manage()
 
=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2017-03-21 04:39:07 +0000
@@ -0,0 +1,21 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+
+check_and_install() {
+    pkg="${1}-${2}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+PYTHON="python3"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real
+
 
=== renamed file 'hooks/install' => 'hooks/install.real'
--- hooks/install	2015-04-22 06:31:01 +0000
+++ hooks/install.real	2017-03-21 04:39:07 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import setup
 setup.pre_install()
 
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-06-24 00:14:14 +0000
+++ hooks/services.py	2017-03-21 04:39:07 +0000
@@ -44,7 +44,7 @@
                 helpers.render_template(
                     source='thruk-nrpe.j2',
                     target='/etc/nagios/nrpe.d/check_{}.cfg'.format(
-                       hookenv.local_unit().replace('/', '-'),
+                           hookenv.local_unit().replace('/', '-'),
                     )
                 ),
                 helpers.render_template(
 
=== modified file 'hooks/start'
--- hooks/start	2015-04-09 06:46:35 +0000
+++ hooks/start	2017-03-21 04:39:07 +0000
@@ -1,3 +1,3 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import services
 services.manage()
 
=== modified file 'hooks/stop'
--- hooks/stop	2015-04-09 06:46:35 +0000
+++ hooks/stop	2017-03-21 04:39:07 +0000
@@ -1,3 +1,3 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import services
 services.manage()
 
=== modified file 'hooks/thruk_helpers.py'
--- hooks/thruk_helpers.py	2015-05-05 04:47:26 +0000
+++ hooks/thruk_helpers.py	2017-03-21 04:39:07 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 from charmhelpers.core import hookenv
 from charmhelpers.core.services import helpers
@@ -11,7 +11,6 @@
 
     name = 'thruk-agent'
     interface = 'thruk-agent'
-    # required_keys = ['host', 'port', 'nagios_context', 'thruk_key', 'thruk_id']
 
     def get_data(self):
         """ jinja won't allow hyphens in identifiers, so we switch to
@@ -40,4 +39,3 @@
         if not hookenv.relation_ids(self.name):
             return
         self['nrpe_external_master'] = self[self.name]
-
 
=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2015-04-09 06:46:35 +0000
+++ hooks/upgrade-charm	2017-03-21 04:39:07 +0000
@@ -1,3 +1,3 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import services
 services.manage()