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

[James Page]

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

charm_lint_check #10443 ceph-radosgw-next for james-page mp271982
    LINT OK: passed

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

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

charm_unit_test #9638 ceph-radosgw-next for james-page mp271982
    UNIT OK: passed

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

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

charm_amulet_test #6593 ceph-radosgw-next for james-page mp271982
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12523836/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6593/

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-06-02 18:51:37 +0000
+++ hooks/hooks.py	2015-09-22 14:25:40 +0000
@@ -109,7 +109,7 @@
         apt_install(APACHE_PACKAGES, fatal=True)
 
 
[e-mail]('install')
[e-mail]('install.real')
 def install():
     execd_preinstall()
     enable_pocket('multiverse')
 
=== 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:25:40 +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'