lp:~james-page/charms/trusty/neutron-api/midonet-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next at revision 171

OpenStack Charmers: Pending requested 2016-02-01

Diff: 878 lines (+329/-77)

19 files modified

config.yaml (+23/-0)
files/midokura.key (+19/-0)
files/midonet.key (+24/-0)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1)
hooks/charmhelpers/contrib/openstack/neutron.py (+14/-6)
hooks/charmhelpers/contrib/openstack/utils.py (+63/-30)
hooks/charmhelpers/core/host.py (+41/-26)
hooks/charmhelpers/fetch/giturl.py (+5/-3)
hooks/neutron_api_context.py (+24/-0)
hooks/neutron_api_hooks.py (+19/-6)
hooks/neutron_api_utils.py (+31/-1)
metadata.yaml (+2/-0)
templates/juno/midonet.ini (+11/-0)
templates/juno/neutron.conf (+2/-0)
templates/kilo/neutron.conf (+5/-1)
templates/liberty/neutron.conf (+3/-1)
templates/liberty/neutron_lbaas.conf (+5/-1)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1)
unit_tests/test_neutron_api_context.py (+34/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

171. By James Page on 2016-02-01

Merge changes for celebor for midonet support

170. By Corey Bryant on 2016-01-22

[beisner, r=corey.bryant] Amulet neutron.conf mitaka updates

169. By David Ames on 2016-01-21

[1chb1n, r=thedac] turn on releases for amulet tests

168. By David Ames on 2016-01-21

[tinwood, r=thedac] Fixes Bug#1475534 Added config option 'dhcp-agents-per-network'

167. By Liam Young on 2016-01-21

[gnuoy, r=james-page]

    neutron.conf requires a nova section for deploys >= mitaka

166. By James Page on 2016-01-19

Fix liberty/mitaka typo from previous test definition update batch.

165. By David Ames on 2016-01-15

[gnuoy, r=thedac] Rename catalogue entry published to keystone from quantum to neutron

164. By Liam Young on 2016-01-12

Update test combo definitions, remove Vivid deprecated release tests, update bundletester testplan yaml, update tests README.

163. By Corey Bryant on 2016-01-08

[corey.bryant,r=trivial] Fix unit test failures

162. By Corey Bryant on 2016-01-08

[corey.bryant,r=osci] Sync charm-helpers.