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

Proposed by James Page on 2014-04-10
Status: Merged
Approved by: Chuck Short on 2014-04-10
Approved revision: 255
Merged at revision: 253
Proposed branch: lp:~james-page/neutron/vpn-l3-fixup
Merge into: lp:~ubuntu-server-dev/neutron/icehouse
Diff against target: 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)
To merge this branch: bzr merge lp:~james-page/neutron/vpn-l3-fixup
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-04-10 Pending
Review via email: mp+215178@code.launchpad.net
To post a comment you must log in.
lp:~james-page/neutron/vpn-l3-fixup updated on 2014-04-10
255. By James Page on 2014-04-10

Drop whitespace

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-09 12:51:42 +0000
3+++ debian/changelog 2014-04-10 13:28:18 +0000
4@@ -1,3 +1,16 @@
5+neutron (1:2014.1~rc2-0ubuntu2) trusty; urgency=medium
6+
7+ * Ensure that VPN and L3 agents are not installed together (LP: #1303876):
8+ - d/control: Add Conflicts on neutron-l3-agent to neutron-vpn-agent,
9+ drop dependency from neutron-vpn-agent -> neutron-l3-agent.
10+ - d/neutron-{common,vpn-agent,l3-agent}.install: Move configuration and
11+ rootwrap filters to -common package for use by both agent types.
12+ - d/control: Add appropriate Breaks/Replaces for config file moves.
13+ - d/neutron-vpn-agent.upstart: Include fwaas_driver.ini on config file
14+ path inline with l3-agent configuration.
15+
16+ -- James Page <james.page@ubuntu.com> Thu, 10 Apr 2014 14:04:45 +0100
17+
18 neutron (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium
19
20 [ James Page ]
21
22=== modified file 'debian/control'
23--- debian/control 2014-03-28 09:49:30 +0000
24+++ debian/control 2014-04-10 13:28:18 +0000
25@@ -60,8 +60,14 @@
26 ${misc:Depends},
27 ${python:Depends},
28 ${shlibs:Depends}
29-Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ )
30-Replaces: quantum-server ( << 1:2013.2~b2-0ubuntu1~ )
31+Breaks:
32+ neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu1~),
33+ neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu1~),
34+ quantum-server (<< 1:2013.2~b2-0ubuntu1~)
35+Replaces:
36+ neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu1~),
37+ neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu1~),
38+ quantum-server (<< 1:2013.2~b2-0ubuntu1~)
39 Recommends: neutron-plugin-ml2
40 Description: Neutron is a virtual network service for Openstack - server
41 Neutron is a virtual network service for Openstack, and a part of
42@@ -678,12 +684,12 @@
43 Architecture: all
44 Depends:
45 neutron-common (= ${source:Version}),
46- neutron-l3-agent (= ${source:Version}),
47 ${misc:Depends},
48 ${python:Depends},
49 ${shlibs:Depends}
50 Breaks: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
51 Replaces: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
52+Conflicts: neutron-l3-agent
53 Description: Neutron is a virtual network service for Openstack - VPN agent
54 Neutron is a virtual network service for Openstack, and a part of
55 Netstack. Just like OpenStack Nova provides an API to dynamically
56@@ -694,7 +700,7 @@
57 advanced network capabilities (e.g., QoS, ACLs, network monitoring,
58 etc.)
59 .
60- This package provides the VPN agent.
61+ This package provides the VPN agent, which also provides L3 agent support.
62
63 Package: neutron-plugin-vpn-agent
64 Architecture: all
65@@ -825,4 +831,3 @@
66 etc.)
67 .
68 This package provides the One Convergence agent.
69-
70
71=== modified file 'debian/neutron-common.install'
72--- debian/neutron-common.install 2013-09-04 11:32:37 +0000
73+++ debian/neutron-common.install 2014-04-10 13:28:18 +0000
74@@ -1,10 +1,16 @@
75+debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
76 debian/neutron_sudoers etc/sudoers.d
77 etc/api-paste.ini etc/neutron
78+etc/fwaas_driver.ini etc/neutron
79+etc/l3_agent.ini etc/neutron
80 etc/neutron.conf etc/neutron
81 etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d
82 etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
83+etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
84+etc/neutron/rootwrap.d/vpnaas.filters etc/neutron/rootwrap.d
85 etc/policy.json etc/neutron
86 etc/rootwrap.conf etc/neutron
87+etc/vpn_agent.ini etc/neutron
88 usr/bin/neutron-db-manage usr/bin
89 usr/bin/neutron-debug usr/bin
90 usr/bin/neutron-netns-cleanup usr/bin
91
92=== modified file 'debian/neutron-l3-agent.install'
93--- debian/neutron-l3-agent.install 2014-03-28 09:49:30 +0000
94+++ debian/neutron-l3-agent.install 2014-04-10 13:28:18 +0000
95@@ -1,5 +1,1 @@
96-debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
97-etc/l3_agent.ini etc/neutron
98-etc/fwaas_driver.ini etc/neutron
99-etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
100 usr/bin/neutron-l3-agent usr/bin
101
102=== modified file 'debian/neutron-vpn-agent.install'
103--- debian/neutron-vpn-agent.install 2014-04-07 16:24:11 +0000
104+++ debian/neutron-vpn-agent.install 2014-04-10 13:28:18 +0000
105@@ -1,3 +1,1 @@
106-etc/vpn_agent.ini etc/neutron
107 usr/bin/neutron-vpn-agent usr/bin
108-etc/neutron/rootwrap.d/vpnaas.filters etc/neutron/rootwrap.d
109
110=== modified file 'debian/neutron-vpn-agent.upstart'
111--- debian/neutron-vpn-agent.upstart 2014-03-28 09:49:30 +0000
112+++ debian/neutron-vpn-agent.upstart 2014-04-10 13:28:18 +0000
113@@ -16,4 +16,5 @@
114
115 exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
116 --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
117- --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/vpn_agent.log
118+ --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \
119+ --log-file=/var/log/neutron/vpn_agent.log

Subscribers

People subscribed via source and target branches