Merge lp://qastaging/~james-page/charms/trusty/nova-compute/kilo into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by James Page
Status: Merged
Merged at revision: 109
Proposed branch: lp://qastaging/~james-page/charms/trusty/nova-compute/kilo
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 227 lines (+91/-12)
10 files modified
.pydevproject (+2/-2)
hooks/charmhelpers/contrib/openstack/context.py (+12/-1)
hooks/charmhelpers/contrib/openstack/neutron.py (+2/-1)
hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+9/-0)
hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0)
hooks/charmhelpers/core/hookenv.py (+26/-0)
hooks/charmhelpers/core/host.py (+5/-1)
hooks/charmhelpers/core/services/helpers.py (+2/-2)
templates/kilo/nova.conf (+7/-5)
templates/parts/section-database (+4/-0)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/nova-compute/kilo
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+254052@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2884 nova-compute-next for james-page mp254052
    LINT OK: passed

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

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

charm_unit_test #2675 nova-compute-next for james-page mp254052
    UNIT OK: passed

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

111. By James Page

resync helpers

112. By James Page

Switch to using charm-helper templates for rabbitmq

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

charm_amulet_test #2682 nova-compute-next for james-page mp254052
    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/10676306/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2682/

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

charm_lint_check #2891 nova-compute-next for james-page mp254052
    LINT OK: passed

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

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

charm_unit_test #2682 nova-compute-next for james-page mp254052
    UNIT OK: passed

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

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

charm_amulet_test #2689 nova-compute-next for james-page mp254052
    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/10676463/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2689/

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

Approve

review: Approve

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