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

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 96
Proposed branch: lp:~1chb1n/charms/trusty/nova-compute/six-install
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 11 lines (+1/-0)
1 file modified
hooks/nova_compute_utils.py (+1/-0)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/nova-compute/six-install
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
OpenStack Charmers Pending
Review via email: mp+244887@code.launchpad.net

Description of the change

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

Will also eventually be fixed in keystone icehouse package deps.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #194 nova-compute-next for 1chb1n mp244887
    LINT OK: passed

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

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

charm_unit_test #223 nova-compute-next for 1chb1n mp244887
    UNIT OK: passed

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

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

charm_amulet_test #243 nova-compute-next for 1chb1n mp244887
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Confirmed in precise-icehouse deployment, ready to review and merge. n-c unit juju stat is: started.

nova-common 1:2014.1.3-0ubuntu1~cloud0
python-six 1.5.2-1~cloud0

Revision history for this message
Edward Hope-Morley (hopem) wrote :

Erm this should be fixed by:

revno: 90 [merge]
committer: <email address hidden>
branch nick: keystone
timestamp: Mon 2014-12-15 09:15:00 +0000
message:
  [corey.bryant,r=james-page] Sort out charmhelpers issues.

...which installs python-six on-the-fly

Revision history for this message
Edward Hope-Morley (hopem) wrote :

Apologies that should be:

revno: 93 [merge]
committer: <email address hidden>
branch nick: nova-compute
timestamp: Mon 2014-12-15 09:10:57 +0000
message:
  [corey.bryant,r=james-page] Sort out charmhelpers issues.

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

charm_lint_check #200 nova-compute-next for 1chb1n mp244887
    LINT OK: passed

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

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

charm_unit_test #229 nova-compute-next for 1chb1n mp244887
    UNIT OK: passed

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

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

charm_amulet_test #249 nova-compute-next for 1chb1n mp244887
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

Revision history for this message
Corey Bryant (corey.bryant) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_compute_utils.py'
2--- hooks/nova_compute_utils.py 2014-12-15 10:28:47 +0000
3+++ hooks/nova_compute_utils.py 2014-12-16 17:30:22 +0000
4@@ -54,6 +54,7 @@
5 BASE_PACKAGES = [
6 'nova-compute',
7 'genisoimage', # was missing as a package dependency until raring.
8+ 'python-six',
9 ]
10
11 NOVA_CONF_DIR = "/etc/nova"

Subscribers

People subscribed via source and target branches