Merge lp:~james-page/charms/trusty/mongodb/forward-compat-xenial into lp:charms/trusty/mongodb

[James Page]

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1294 mongodb for james-page mp287312
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1294/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #1546 mongodb for james-page mp287312
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1546/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #542 mongodb for james-page mp287312
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/542/

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-12-17 02:22:42 +0000
+++ hooks/hooks.py	2016-02-26 14:02:09 +0000
@@ -926,7 +926,7 @@
 ###############################################################################
 # Hook functions
 ###############################################################################
[e-mail]('install')
[e-mail]('install.real')
 def install_hook():
     juju_log('Begin install hook.')
     execd_preinstall()

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2016-02-26 14:02:09 +0000
@@ -0,0 +1,20 @@
+#!/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="python"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real

=== renamed symlink 'hooks/install' => 'hooks/install.real'