Juju Charms Collection
nova-compute package

Merge lp://qastaging/~tribaal/charms/trusty/nova-compute/revert-api-rate-limit into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Chris Glass on 2015-10-02

Status:

Merged

Merged at revision:

167

Proposed branch:

lp://qastaging/~tribaal/charms/trusty/nova-compute/revert-api-rate-limit

Merge into:

lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Diff against target:

246 lines (+1/-182)

5 files modified

config.yaml (+0/-10)
hooks/nova_compute_context.py (+0/-9)
hooks/nova_compute_utils.py (+0/-5)
templates/api-paste.ini (+0/-141)
tests/basic_deployment.py (+1/-17)

To merge this branch:

bzr merge lp://qastaging/~tribaal/charms/trusty/nova-compute/revert-api-rate-limit

High

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Billy Olsen		2015-10-02	Approve on 2015-10-03
Review via email: mp+273199@code.qastaging.launchpad.net

Description of the change

This branch reverts the commit introduced in https://bazaar.launchpad.net/~openstack-charmers/charms/trusty/nova-compute/next/revision/164

It should fix the bug https://bugs.launchpad.net/charms/+source/nova-compute/+bug/1501924 until a better solution is found (at least, precise icehouse deploys won't break anymore).

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-10-02:

charm_lint_check #11159 nova-compute-next for tribaal mp273199
LINT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-10-02:

charm_unit_test #10363 nova-compute-next for tribaal mp273199
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-10-02:

charm_amulet_test #6986 nova-compute-next for tribaal mp273199
AMULET FAIL: amulet-test failed

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

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

Revision history for this message

Billy Olsen (billy-olsen) wrote on 2015-10-03:

Ran tests locally, looks good - thanks Chris. Your other branch seems to be on the right track w/ splitting up the api-paste.ini across the different releases.

review: Approve