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

Rewritten-From: f17e5be3b8243764793bdc27e129c111e655f9f0

diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.init.in b/trusty/debian/neutron-plugin-linuxbridge-agent.init.in
index 110ef4252dbaedc45180e108c6ab5fc52a986b63..ba75df7ac865c4cb634462aabe16b54f2774bad4 100644 (file)
--- 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}-linuxbridge-agent
+NAME=${PROJECT_NAME}-plugin-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 d5f9f48089a9271583114e84cb3dfe1afd402291..de480de1e24646e35d9ceefd038356f830ca9696 100644 (file)
--- 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}-openvswitch-agent
+NAME=${PROJECT_NAME}-plugin-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