Juju Charms Collection
glance package

Merge lp:~1chb1n/charms/trusty/glance/six-install into lp:~openstack-charmers-archive/charms/trusty/glance/next

  1. Trusty Tahr (14.04)
  2. six-install
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 86
Proposed branch: lp:~1chb1n/charms/trusty/glance/six-install
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 23 lines (+2/-1)
2 files modified
hooks/glance_utils.py (+1/-1)
unit_tests/test_glance_relations.py (+1/-0)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/glance/six-install
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
OpenStack Charmers Pending
Review via email: mp+245028@code.launchpad.net

Description of the change

Install python-six explicitly via the charm install hook
See tracking bug: bug 1403195
Also related SRU bug: bug 1403114

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Confirmed clean precise deploy.

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

charm_lint_check #266 glance-next for 1chb1n mp245028
    LINT OK: passed

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

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

charm_unit_test #294 glance-next for 1chb1n mp245028
    UNIT OK: passed

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

Revision history for this message
Corey Bryant (corey.bryant) :
review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #312 glance-next for 1chb1n mp245028
    AMULET OK: passed

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/glance_utils.py'
2--- hooks/glance_utils.py 2014-12-04 13:29:39 +0000
3+++ hooks/glance_utils.py 2014-12-17 18:12:59 +0000
4@@ -48,7 +48,7 @@
5
6 PACKAGES = [
7 "apache2", "glance", "python-mysqldb", "python-swiftclient",
8- "python-psycopg2", "python-keystone", "uuid", "haproxy", ]
9+ "python-psycopg2", "python-keystone", "python-six", "uuid", "haproxy", ]
10
11 SERVICES = [
12 "glance-api", "glance-registry", ]
13
14=== modified file 'unit_tests/test_glance_relations.py'
15--- unit_tests/test_glance_relations.py 2014-12-15 10:16:05 +0000
16+++ unit_tests/test_glance_relations.py 2014-12-17 18:12:59 +0000
17@@ -84,6 +84,7 @@
18 'python-swiftclient',
19 'python-psycopg2',
20 'python-keystone',
21+ 'python-six',
22 'uuid', 'haproxy'], fatal=True)
23 self.assertTrue(self.execd_preinstall.called)
24

Subscribers

People subscribed via source and target branches