Juju Charms Collection
neutron-api package

Merge lp://qastaging/~celebdor/charms/trusty/neutron-api/midonet into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. midonet
  3. Merge into next
Proposed by Antoni Segura Puimedon
Status: Work in progress
Proposed branch: lp://qastaging/~celebdor/charms/trusty/neutron-api/midonet
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 609 lines (+310/-23)
18 files modified
config.yaml (+27/-0)
files/midokura.key (+19/-0)
files/midonet.key (+24/-0)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
hooks/charmhelpers/contrib/openstack/context.py (+40/-13)
hooks/charmhelpers/contrib/openstack/neutron.py (+17/-3)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0)
hooks/charmhelpers/core/hookenv.py (+0/-1)
hooks/charmhelpers/core/kernel.py (+68/-0)
hooks/neutron_api_context.py (+24/-0)
hooks/neutron_api_hooks.py (+16/-2)
hooks/neutron_api_utils.py (+40/-0)
metadata.yaml (+5/-0)
templates/juno/midonet.ini (+11/-0)
templates/juno/neutron.conf (+3/-1)
templates/kilo/neutron.conf (+5/-1)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
unit_tests/test_neutron_api_context.py (+3/-0)
To merge this branch: bzr merge lp://qastaging/~celebdor/charms/trusty/neutron-api/midonet
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+273772@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 #11503 neutron-api-next for celebdor mp273772
    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/12711577/
Build: http://10.245.162.77:8080/job/charm_lint_check/11503/

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

charm_unit_test #10695 neutron-api-next for celebdor mp273772
    UNIT OK: passed

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

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

charm_amulet_test #7207 neutron-api-next for celebdor mp273772
    AMULET FAIL: amulet-test failed

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

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

Reply
lp://qastaging/~celebdor/charms/trusty/neutron-api/midonet updated
152. By Antoni Segura Puimedon <email address hidden>

midonet: Fix faulty cherry-pick references

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

charm_lint_check #11538 neutron-api-next for celebdor mp273772
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

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

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

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

charm_unit_test #10730 neutron-api-next for celebdor mp273772
    UNIT OK: passed

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

Reply
lp://qastaging/~celebdor/charms/trusty/neutron-api/midonet updated
153. By Antoni Segura Puimedon <email address hidden>

midonet: fix lint

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

charm_lint_check #11540 neutron-api-next for celebdor mp273772
    LINT OK: passed

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

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

charm_unit_test #10732 neutron-api-next for celebdor mp273772
    UNIT OK: passed

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

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

charm_amulet_test #7241 neutron-api-next for celebdor mp273772
    AMULET FAIL: amulet-test failed

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

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

Reply
Revision history for this message
James Page (james-page) wrote :

Some comments, but looking OK

review: Needs Fixing
Reply
Revision history for this message
Antoni Segura Puimedon (celebdor) :
Reply
Revision history for this message
Antoni Segura Puimedon (celebdor) :
Reply
lp://qastaging/~celebdor/charms/trusty/neutron-api/midonet updated
154. By Antoni Segura Puimedon <email address hidden>

midonet: fix wrong relation reference

MidonetContext was developed in
charmhelpers/contrib/openstack/context.py
It is better to have it inside of neutron_api_context since
it is only used by Neutron (of all OSt charms).

155. By Antoni Segura Puimedon <email address hidden>

midonet: move gpg keys into files

156. By Antoni Segura Puimedon <email address hidden>

midonet: fix the MidonetContext backport

157. By Antoni Segura Puimedon <email address hidden>

midonet: use charm_dir to get to the gpg files

158. By Antoni Segura Puimedon <email address hidden>

midonet: fix service driver regression for other plugins

Unmerged revisions

158. By Antoni Segura Puimedon <email address hidden>

midonet: fix service driver regression for other plugins

157. By Antoni Segura Puimedon <email address hidden>

midonet: use charm_dir to get to the gpg files

156. By Antoni Segura Puimedon <email address hidden>

midonet: fix the MidonetContext backport

155. By Antoni Segura Puimedon <email address hidden>

midonet: move gpg keys into files

154. By Antoni Segura Puimedon <email address hidden>

midonet: fix wrong relation reference

MidonetContext was developed in
charmhelpers/contrib/openstack/context.py
It is better to have it inside of neutron_api_context since
it is only used by Neutron (of all OSt charms).

153. By Antoni Segura Puimedon <email address hidden>

midonet: fix lint

152. By Antoni Segura Puimedon <email address hidden>

midonet: Fix faulty cherry-pick references

151. By Antoni Segura Puimedon <email address hidden>

Add MidoNet support for >= juno

150. By Antoni Segura Puimedon <email address hidden>

CH sync for MidoNet support

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