Merge lp:~james-page/charms/trusty/ceph/wily into lp:~openstack-charmers-archive/charms/trusty/ceph/next

[James Page]

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

charm_unit_test #9635 ceph-next for james-page mp271984
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9635/

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

charm_lint_check #10445 ceph-next for james-page mp271984
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10445/

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

charm_amulet_test #6591 ceph-next for james-page mp271984
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6591/

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-09-04 10:33:49 +0000
+++ hooks/hooks.py	2015-09-22 14:26:42 +0000
@@ -76,7 +76,7 @@
             shutil.copy(x, '/etc/init/')
 
 
[e-mail]('install')
[e-mail]('install.real')
 def install():
     execd_preinstall()
     add_source(config('source'), config('key'))

=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2015-09-22 14:26:42 +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

=== added symlink 'hooks/install.real'
=== target is u'hooks.py'