From: gustavo panizzo <gfa@zumbi.com.ar>
Date: Thu, 9 Apr 2015 11:06:11 +0000 (+0800)
Subject: Revert "add -plugin- to the names of the lb and ovs agents"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=260281f250027344dbea6d1545211793495b2997;p=openstack-build%2Fneutron-build.git

Revert "add -plugin- to the names of the lb and ovs agents"

This reverts commit f17e5be3b8243764793bdc27e129c111e655f9f0.

Rewritten-From: d417e7909abba072ed74760fdb0ea2e367dee430
---

diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.init.in b/trusty/debian/neutron-plugin-linuxbridge-agent.init.in
index ba75df7ac..110ef4252 100644
--- a/trusty/debian/neutron-plugin-linuxbridge-agent.init.in
+++ b/trusty/debian/neutron-plugin-linuxbridge-agent.init.in
@@ -17,7 +17,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Openstack Neutron LinuxBridge Plugin Agent"
 PROJECT_NAME=neutron
-NAME=${PROJECT_NAME}-plugin-linuxbridge-agent
+NAME=${PROJECT_NAME}-linuxbridge-agent
 # --config-file=/etc/neutron/neutron.conf will be happened
 # to DAEMON_ARGS later by openstack-pkg-tools
 
diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.init.in b/trusty/debian/neutron-plugin-openvswitch-agent.init.in
index de480de1e..d5f9f4808 100644
--- a/trusty/debian/neutron-plugin-openvswitch-agent.init.in
+++ b/trusty/debian/neutron-plugin-openvswitch-agent.init.in
@@ -15,7 +15,7 @@
 
 DESC="Openstack Neutron OpenVSwitch Plugin Agent"
 PROJECT_NAME=neutron
-NAME=${PROJECT_NAME}-plugin-openvswitch-agent
+NAME=${PROJECT_NAME}-openvswitch-agent
 CONF_FILE=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
 
 # Since Juno OVS plugin as been deprecated as core_plugin, it has been