lp:~james-page/neutron/vpn-l3-fixup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-server-dev/neutron/icehouse at revision 253

Ubuntu Server Developers: Pending requested 2014-04-10

Diff: 119 lines (+31/-12)

6 files modified

debian/changelog (+13/-0)
debian/control (+10/-5)
debian/neutron-common.install (+6/-0)
debian/neutron-l3-agent.install (+0/-4)
debian/neutron-vpn-agent.install (+0/-2)
debian/neutron-vpn-agent.upstart (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1303876: VPN agent dependencies are foobar

High

Fix Released

Link a bug report

Related blueprints

256. By James Page on 2014-04-10

d/control: Align Depends of neutron-vpn-agent with neutron-l3-agent.

255. By James Page on 2014-04-10

Drop whitespace

254. By James Page on 2014-04-10

d/control: Add appropriate Breaks/Replaces for config file moves.

253. By James Page on 2014-04-10

* Ensure that VPN and L3 agents are not installed together (LP: #1303876):
  - d/control: Add Conflicts on neutron-l3-agent to neutron-vpn-agent,
    drop dependency from neutron-vpn-agent -> neutron-l3-agent.
  - d/neutron-{common,vpn-agent,l3-agent}.install: Move configuration and
    rootwrap filters to -common package for use by both agent types.
  - d/neutron-vpn-agent.upstart: Include fwaas_driver.ini on config file
    path inline with l3-agent configuration.

252. By Chuck Short on 2014-04-09

releasing package neutron version 1:2014.1~rc2-0ubuntu1

251. By James Page on 2014-04-07

* d/neutron-plugin-oneconvergence-agent.upstart: Rename upstart
  configuration to match package name (LP: #1301957).
* d/neutron-vpn-agent.install: Install missing vpnaas.filters for
  rootwrap (LP: #1303876).

250. By James Page on 2014-04-01

releasing package neutron version 1:2014.1~rc1-0ubuntu1

249. By James Page on 2014-03-28

Add bugref for onecovergence work

248. By James Page on 2014-03-28

* d/neutron-l3-agent.{install,upstart}: Install fwaas_driver.ini with
  l3-agent and add to config-file path in upstart configuration
  (LP: #1298676).
* d/neutron-vpn-agent.upstart,control: Include l3_agent.ini on upstart
  config-file path, add dependency on neutron-l3-agent (LP: #1298675).

247. By Chuck Short on 2014-03-25

Refresh patches