From d5e6c785ee5d66572eaba4bcea181494855b5535 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 16 Dec 2013 22:56:01 +0800
Subject: [PATCH] Added openswan as dependency for the vpn-agent.

Change-Id: I01150a2facee4e95977a997af71e01df9fce702b

Rewritten-From: b6d33ebc116e94b42512745943494958b20b9cdf
---
 trusty/debian/control                | 19 ++++++++++++-------
 trusty/debian/neutron-common.install |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/trusty/debian/control b/trusty/debian/control
index e974639ac..4967c9835 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -44,8 +44,8 @@ Build-Depends-Indep: alembic (>= 0.4.1),
                      python-paste,
                      python-pastedeploy,
                      python-pyudev,
-                     python-routes,
                      python-requests (>= 1.1),
+                     python-routes,
                      python-setuptools,
                      python-setuptools-git,
                      python-simplejson,
@@ -245,7 +245,7 @@ Depends: adduser,
          ${shlibs:Depends}
 Recommends: openvswitch-switch
 Conflicts: neutron-vpn-agent
-Breaks: quantum-l3-agent (<< 2013.2~)  
+Breaks: quantum-l3-agent (<< 2013.2~)
 Replaces: quantum-l3-agent (<< 2013.2~)
 Description: OpenStack virtual network service - l3 agent
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -266,7 +266,7 @@ Depends: adduser,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
-Breaks: quantum-dhcp-agent (<< 2013.2~)  
+Breaks: quantum-dhcp-agent (<< 2013.2~)
 Replaces: quantum-dhcp-agent (<< 2013.2~)
 Description: OpenStack virtual network service - DHCP agent
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -322,6 +322,7 @@ Depends: adduser,
          debconf,
          lsb-base,
          neutron-common (= ${source:Version}),
+         openswan,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
@@ -363,8 +364,10 @@ Depends: neutron-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
-Breaks: python-quantum (<< 2013.2~), quantum-plugin-openvswitch-agent (<< 2013.2~)
-Replaces: python-quantum (<< 2013.2~), quantum-plugin-openvswitch-agent (<< 2013.2~)
+Breaks: python-quantum (<< 2013.2~),
+        quantum-plugin-openvswitch-agent (<< 2013.2~)
+Replaces: python-quantum (<< 2013.2~),
+          quantum-plugin-openvswitch-agent (<< 2013.2~)
 Recommends: openvswitch-datapath-dkms
 Description: OpenStack virtual network service - Open vSwitch agent
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -384,8 +387,10 @@ Depends: bridge-utils,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
-Breaks: python-quantum (<< 2013.2~), quantum-plugin-linuxbridge-agent (<< 2013.2~)
-Replaces: python-quantum (<< 2013.2~), quantum-plugin-linuxbridge-agent (<< 2013.2~)
+Breaks: python-quantum (<< 2013.2~),
+        quantum-plugin-linuxbridge-agent (<< 2013.2~)
+Replaces: python-quantum (<< 2013.2~),
+          quantum-plugin-linuxbridge-agent (<< 2013.2~)
 Description: OpenStack virtual network service - Linux bridge agent
  Neutron provides an API to dynamically request and configure virtual networks.
  These networks connect "interfaces" from other OpenStack services (such as
diff --git a/trusty/debian/neutron-common.install b/trusty/debian/neutron-common.install
index 7035c110c..2d7365751 100644
--- a/trusty/debian/neutron-common.install
+++ b/trusty/debian/neutron-common.install
@@ -1,10 +1,10 @@
 debian/neutron_sudoers	/etc/sudoers.d
+debian/plugin_guess_func	/usr/share/neutron-common
 etc/api-paste.ini	/usr/share/neutron-common
+etc/fwaas_driver.ini	/etc/neutron
 etc/neutron.conf	/usr/share/neutron-common
 etc/neutron/plugins	/etc/neutron
 etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d
 etc/policy.json		/etc/neutron
 etc/rootwrap.conf	/etc/neutron
-etc/fwaas_driver.ini	/etc/neutron
 usr/bin/neutron*
-debian/plugin_guess_func	/usr/share/neutron-common
-- 
2.45.2