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

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

charm_unit_test #9634 heat-next for james-page mp271979
    UNIT OK: passed

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

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

charm_lint_check #10453 heat-next for james-page mp271979
    LINT OK: passed

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

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

charm_amulet_test #6596 heat-next for james-page mp271979
    AMULET OK: passed

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/heat_relations.py'
2--- hooks/heat_relations.py 2015-09-03 09:08:40 +0000
3+++ hooks/heat_relations.py 2015-09-22 14:25:10 +0000
4@@ -66,7 +66,7 @@
5 CONFIGS = register_configs()
6
7
8-@hooks.hook('install')
9+@hooks.hook('install.real')
10 def install():
11 execd_preinstall()
12 configure_installation_source(config('openstack-origin'))
13
14=== modified symlink 'hooks/install' (properties changed: -x to +x)
15=== target was u'heat_relations.py'
16--- hooks/install 1970-01-01 00:00:00 +0000
17+++ hooks/install 2015-09-22 14:25:10 +0000
18@@ -0,0 +1,20 @@
19+#!/bin/bash
20+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
21+# by default.
22+
23+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
24+
25+check_and_install() {
26+ pkg="${1}-${2}"
27+ if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
28+ apt-get -y install ${pkg}
29+ fi
30+}
31+
32+PYTHON="python"
33+
34+for dep in ${DEPS[@]}; do
35+ check_and_install ${PYTHON} ${dep}
36+done
37+
38+exec ./hooks/install.real
39
40=== added symlink 'hooks/install.real'
41=== target is u'heat_relations.py'

Subscribers

People subscribed via source and target branches