From 2847521ecb8fac316bdc8c878c7bb1b40ff375bc Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 2 Dec 2013 22:41:01 +0800 Subject: [PATCH] neutron-l3-agent & neutron-vpn-agent now conflicts with each other Change-Id: I84c0ba547c08c985b8278f7fec8ad8f1e9f72d0c --- debian/changelog | 6 ++++++ debian/control | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 11e66b5ef..142a62dd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +neutron (2013.2-7) UNRELEASED; urgency=low + + * neutron-l3-agent & neutron-vpn-agent now conflicts with each other. + + -- Thomas Goirand Mon, 02 Dec 2013 22:39:46 +0800 + neutron (2013.2-6) unstable; urgency=low * Now starts the openvswitch agent using the ml2 config if this is the plugin diff --git a/debian/control b/debian/control index afe615214..b60c1ed7d 100644 --- a/debian/control +++ b/debian/control @@ -243,6 +243,7 @@ Depends: adduser, ${python:Depends}, ${shlibs:Depends} Recommends: openvswitch-switch +Conflicts: neutron-vpn-agent Breaks: quantum-l3-agent (<< 2013.2~) Replaces: quantum-l3-agent (<< 2013.2~) Description: OpenStack virtual network service - l3 agent @@ -324,6 +325,7 @@ Depends: adduser, ${python:Depends}, ${shlibs:Depends} Provides: neutron-plugin-vpn-agent +Conflicts: neutron-l3-agent Breaks: quantum-server (<< 2013.2~) Replaces: quantum-server (<< 2013.2~) Description: OpenStack virtual network service - VPN agent -- 2.45.2