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

Proposed by James Page
Status: Merged
Merged at revision: 112
Proposed branch: lp:~james-page/charms/trusty/swift-proxy/wily
Merge into: lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 40 lines (+21/-1)
2 files modified
hooks/install (+20/-0)
hooks/swift_hooks.py (+1/-1)
To merge this branch: bzr merge lp:~james-page/charms/trusty/swift-proxy/wily
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+271967@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #10440 swift-proxy-next for james-page mp271967
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9632 swift-proxy-next for james-page mp271967
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6584 swift-proxy-next for james-page mp271967
    AMULET OK: passed

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'swift_hooks.py'
--- hooks/install 1970-01-01 00:00:00 +0000
+++ hooks/install 2015-09-22 14:02:21 +0000
@@ -0,0 +1,20 @@
1#!/bin/bash
2# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
3# by default.
4
5declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
6
7check_and_install() {
8 pkg="${1}-${2}"
9 if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
10 apt-get -y install ${pkg}
11 fi
12}
13
14PYTHON="python"
15
16for dep in ${DEPS[@]}; do
17 check_and_install ${PYTHON} ${dep}
18done
19
20exec ./hooks/install.real
021
=== added symlink 'hooks/install.real'
=== target is u'swift_hooks.py'
=== modified file 'hooks/swift_hooks.py'
--- hooks/swift_hooks.py 2015-09-09 10:55:01 +0000
+++ hooks/swift_hooks.py 2015-09-22 14:02:21 +0000
@@ -94,7 +94,7 @@
94CONFIGS = register_configs()94CONFIGS = register_configs()
9595
9696
97@hooks.hook('install')97@hooks.hook('install.real')
98def install():98def install():
99 execd_preinstall()99 execd_preinstall()
100 src = config('openstack-origin')100 src = config('openstack-origin')

Subscribers

People subscribed via source and target branches