Juju Charms Collection
neutron-agents-midonet package

Merge lp://qastaging/~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support into lp://qastaging/~celebdor/charms/trusty/neutron-agents-midonet/split

  1. Trusty Tahr (14.04)
  2. nova-metadata-support
  3. Merge into split
Proposed by James Page
Status: Merged
Approved by: Antoni Segura Puimedon
Approved revision: 43
Merged at revision: 44
Proposed branch: lp://qastaging/~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support
Merge into: lp://qastaging/~celebdor/charms/trusty/neutron-agents-midonet/split
Diff against target: 288 lines (+115/-23)
10 files modified
.bzrignore (+1/-0)
config.yaml (+0/-4)
hooks/install (+2/-1)
hooks/services.py (+44/-12)
templates/juno/nova.conf (+25/-0)
templates/kilo/neutron.conf (+6/-0)
templates/kilo/nova.conf (+29/-0)
templates/metadata_agent.ini (+4/-2)
tests/basic_deployment.py (+0/-1)
unit_tests/test_templates.py (+4/-3)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support
Reviewer Review Type Date Requested Status
Antoni Segura Puimedon Pending
Review via email: mp+285049@code.qastaging.launchpad.net
To post a comment you must log in.
lp://qastaging/~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support updated
43. By James Page

Add missing templates and hooks

44. By James Page

Don't pickup test unitdatadb file in the real charm

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