Removed vpnaas because it's now a separate package.

Rewritten-From: 33c0259020fc0f96d9f743753eb963c2e4abdd59

diff --git a/trusty/debian/control b/trusty/debian/control
index aeeffa2c60450a8420c4bc37bdff5216d74941b0..3b59ae7129edd77d9eafb5dda4f416cd5b79de4c 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -279,27 +279,6 @@ Description: OpenStack virtual network service - metering agent
  .
  This package provides the Neutron metering agent.
 
-Package: neutron-vpn-agent
-Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: adduser,
-         debconf,
-         lsb-base,
-         neutron-common (= ${source:Version}),
-         ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends}
-Suggests: openswan
-Provides: neutron-plugin-vpn-agent
-Conflicts: neutron-l3-agent
-Description: OpenStack virtual network service - VPN agent
- Neutron provides an API to dynamically request and configure virtual networks.
- These networks connect "interfaces" from other OpenStack services (such as
- vNICs from Nova VMs). The Neutron API supports extensions to provide advanced
- network capabilities, including QoS, ACLs, and network monitoring.
- .
- This package provides the Neutron VPN agent.
-
 Package: neutron-plugin-openvswitch-agent
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~), openvswitch-switch (>= 1.9)

diff --git a/trusty/debian/neutron-vpn-agent.init.in b/trusty/debian/neutron-vpn-agent.init.in
deleted file mode 100644 (file)
index 053c2ca..0000000
--- a/trusty/debian/neutron-vpn-agent.init.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          neutron-vpn-agent
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Should-Start:      mysql postgresql rabbitmq-server keystone openvswitch-switch
-# Should-Stop:       mysql postgresql rabbitmq-server keystone openvswitch-switch
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Neutron VPN Agent agent
-# Description:       Provides VPN agent for neutron
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.org>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack Neutron VPN Agent"
-PROJECT_NAME=neutron
-NAME=${PROJECT_NAME}-vpn-agent
-DAEMON=/usr/bin/${NAME}
-# --config-file=/etc/neutron/neutron.conf will be happened 
-# to DAEMON_ARGS later by openstack-pkg-tools
-DAEMON_ARGS="--config-file=/etc/neutron/vpn_agent.ini"

diff --git a/trusty/debian/neutron-vpn-agent.install b/trusty/debian/neutron-vpn-agent.install
deleted file mode 100644 (file)
index 6cdb8e7..0000000
--- a/trusty/debian/neutron-vpn-agent.install
+++ /dev/null
@@ -1 +0,0 @@
-etc/vpn_agent.ini etc/neutron