Merge lp://staging/~tribaal/charms/trusty/nova-cloud-controller/enable-api-rate-limiting into lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Proposed by Chris Glass
Status: Merged
Merged at revision: 197
Proposed branch: lp://staging/~tribaal/charms/trusty/nova-cloud-controller/enable-api-rate-limiting
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 127 lines (+55/-2)
6 files modified
config.yaml (+9/-0)
hooks/nova_cc_context.py (+9/-0)
hooks/nova_cc_utils.py (+2/-1)
templates/icehouse/etc_nova_api-paste.ini (+3/-0)
templates/kilo/etc_nova_api-paste.ini (+3/-0)
tests/basic_deployment.py (+29/-1)
To merge this branch: bzr merge lp://staging/~tribaal/charms/trusty/nova-cloud-controller/enable-api-rate-limiting
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Ryan Beisner (community) Needs Fixing
Review via email: mp+273217@code.staging.launchpad.net

Description of the change

This branch enables API rate-limiting in the nova-cloud-controller charm instead of the nova-compute one.

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

charm_lint_check #11157 nova-cloud-controller-next for tribaal mp273217
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12638435/
Build: http://10.245.162.77:8080/job/charm_lint_check/11157/

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

charm_unit_test #10362 nova-cloud-controller-next for tribaal mp273217
    UNIT OK: passed

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

198. By Chris Glass

Added extra blank line.

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

charm_lint_check #11161 nova-cloud-controller-next for tribaal mp273217
    LINT OK: passed

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

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

charm_unit_test #10365 nova-cloud-controller-next for tribaal mp273217
    UNIT OK: passed

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

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

charm_amulet_test #6972 nova-cloud-controller-next for tribaal mp273217
    AMULET FAIL: amulet-test failed

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

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

199. By Chris Glass

Setting expectations right for the failing test.

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

charm_lint_check #11162 nova-cloud-controller-next for tribaal mp273217
    LINT OK: passed

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

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

charm_amulet_test #6975 nova-cloud-controller-next for tribaal mp273217
    AMULET FAIL: amulet-test failed

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

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

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

charm_amulet_test #6981 nova-cloud-controller-next for tribaal mp273217
    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/12639295/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6981/

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

charm_amulet_test #6985 nova-cloud-controller-next for tribaal mp273217
    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/12639381/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6985/

200. By Chris Glass

An actual missing semicolon.

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

charm_lint_check #11168 nova-cloud-controller-next for tribaal mp273217
    LINT OK: passed

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

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

charm_unit_test #10371 nova-cloud-controller-next for tribaal mp273217
    UNIT OK: passed

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

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

charm_amulet_test #6991 nova-cloud-controller-next for tribaal mp273217
    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/12640547/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6991/

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

charm_amulet_test #7001 nova-cloud-controller-next for tribaal mp273217
    AMULET FAIL: amulet-test failed

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

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

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

charm_amulet_test #7027 nova-cloud-controller-next for tribaal mp273217
    AMULET FAIL: amulet-test failed

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

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

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

Apologize for test noise while we are sorting through infra issues.

...

However, this is the real failure observed in the amulet tests. It looks like the test will need some adjusting.

00:07:49.623 2015-10-03 03:04:58 Invalid config charm nova-compute api-rate-limit-rules=( POST, '*', .*, 9999, MINUTE );

review: Needs Fixing
201. By Chris Glass

Don't assign the same dict to both nova-compute and nova-cloud-controller.

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

charm_lint_check #11324 nova-cloud-controller-next for tribaal mp273217
    LINT OK: passed

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

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

charm_unit_test #10518 nova-cloud-controller-next for tribaal mp273217
    UNIT OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Ran amulet manually: http://paste.ubuntu.com/12688874/ looks good!

juju-test INFO : Results: 9 passed, 0 failed, 0 errored

Revision history for this message
Liam Young (gnuoy) wrote :

Approved

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

charm_amulet_test #7109 nova-cloud-controller-next for tribaal mp273217
    AMULET OK: passed

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches