-
Committer:
James Page
-
Date:
2014-04-10 13:04:53 UTC
-
Revision ID:
james.page@canonical.com-20140410130453-ud281d3p5nq1y0u4
* 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.