Merge lp:~james-page/neutron/vpn-l3-fixup into lp:~ubuntu-server-dev/neutron/icehouse

[James Page]

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

255. By James Page on 2014-04-10

Drop whitespace

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-09 12:51:42 +0000
+++ debian/changelog	2014-04-10 13:28:18 +0000
@@ -1,3 +1,16 @@
+neutron (1:2014.1~rc2-0ubuntu2) trusty; urgency=medium
+
+  * 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/control: Add appropriate Breaks/Replaces for config file moves.
+    - d/neutron-vpn-agent.upstart: Include fwaas_driver.ini on config file
+      path inline with l3-agent configuration.
+
+ -- James Page <[e-mail]>  Thu, 10 Apr 2014 14:04:45 +0100
+
 neutron (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium
 
   [ James Page ]
 
=== modified file 'debian/control'
--- debian/control	2014-03-28 09:49:30 +0000
+++ debian/control	2014-04-10 13:28:18 +0000
@@ -60,8 +60,14 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-server  ( << 1:2013.2~b2-0ubuntu1~ )
+Breaks:
+ neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu1~),
+ neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu1~),
+ quantum-server (<< 1:2013.2~b2-0ubuntu1~)
+Replaces:
+ neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu1~),
+ neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu1~),
+ quantum-server (<< 1:2013.2~b2-0ubuntu1~)
 Recommends: neutron-plugin-ml2
 Description: Neutron is a virtual network service for Openstack - server
  Neutron is a virtual network service for Openstack, and a part of
@@ -678,12 +684,12 @@
 Architecture: all
 Depends:
  neutron-common (= ${source:Version}),
- neutron-l3-agent (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
 Breaks: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
 Replaces: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Conflicts: neutron-l3-agent
 Description: Neutron is a virtual network service for Openstack - VPN agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -694,7 +700,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the VPN agent.
+ This package provides the VPN agent, which also provides L3 agent support.
 
 Package: neutron-plugin-vpn-agent
 Architecture: all
@@ -825,4 +831,3 @@
  etc.)
  .
  This package provides the One Convergence agent.
-
 
=== modified file 'debian/neutron-common.install'
--- debian/neutron-common.install	2013-09-04 11:32:37 +0000
+++ debian/neutron-common.install	2014-04-10 13:28:18 +0000
@@ -1,10 +1,16 @@
+debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
 debian/neutron_sudoers etc/sudoers.d
 etc/api-paste.ini etc/neutron
+etc/fwaas_driver.ini etc/neutron
+etc/l3_agent.ini etc/neutron
 etc/neutron.conf etc/neutron
 etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d
 etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
+etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
+etc/neutron/rootwrap.d/vpnaas.filters etc/neutron/rootwrap.d
 etc/policy.json etc/neutron
 etc/rootwrap.conf etc/neutron
+etc/vpn_agent.ini etc/neutron
 usr/bin/neutron-db-manage usr/bin
 usr/bin/neutron-debug usr/bin
 usr/bin/neutron-netns-cleanup usr/bin
 
=== modified file 'debian/neutron-l3-agent.install'
--- debian/neutron-l3-agent.install	2014-03-28 09:49:30 +0000
+++ debian/neutron-l3-agent.install	2014-04-10 13:28:18 +0000
@@ -1,5 +1,1 @@
-debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
-etc/l3_agent.ini etc/neutron
-etc/fwaas_driver.ini etc/neutron
-etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
 usr/bin/neutron-l3-agent usr/bin
 
=== modified file 'debian/neutron-vpn-agent.install'
--- debian/neutron-vpn-agent.install	2014-04-07 16:24:11 +0000
+++ debian/neutron-vpn-agent.install	2014-04-10 13:28:18 +0000
@@ -1,3 +1,1 @@
-etc/vpn_agent.ini etc/neutron
 usr/bin/neutron-vpn-agent usr/bin
-etc/neutron/rootwrap.d/vpnaas.filters etc/neutron/rootwrap.d
 
=== modified file 'debian/neutron-vpn-agent.upstart'
--- debian/neutron-vpn-agent.upstart	2014-03-28 09:49:30 +0000
+++ debian/neutron-vpn-agent.upstart	2014-04-10 13:28:18 +0000
@@ -16,4 +16,5 @@
 
 exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
        --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
-       --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/vpn_agent.log
+       --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \
+       --log-file=/var/log/neutron/vpn_agent.log