lp://staging/~seyeongkim/charms/trusty/neutron-api/lp1545886

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next

OpenStack Charmers: Pending requested 2016-02-17

Diff: 84 lines (+14/-2)

5 files modified

config.yaml (+5/-0)
hooks/neutron_api_context.py (+4/-0)
templates/icehouse/ml2_conf.ini (+1/-1)
templates/kilo/ml2_conf.ini (+1/-1)
unit_tests/test_neutron_api_context.py (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

176. By Seyeong Kim on 2016-02-17

add vni_ranges option

175. By James Page on 2016-02-16

Tidy tox targets

174. By Edward Hope-Morley on 2016-02-12

[hopem,r=jamespage]

Sync charmhelpers to get support for supplying a Ascii Armor PGP key to
openstack-origin (currently only supports Radix64)
Closes-Bug: 1518975

173. By James Page on 2016-02-11

Update notifications topics for designate support

172. By James Page on 2016-02-10

midonet: fix liberty plugin package name

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