Switch Neutron packages to Ubuntu compatible naming scheme

- Added missing packages to control  file
- Added missing init scripts

Change-Id: I750af41a39a5853f7de26e6187dd040fbeedbf43

diff --git a/tests/runtests.sh b/tests/runtests.sh
index a15a6e40ca3ac4401013bfdfcfef2dc419c3e27f..50108c7222f46f5ad12329f2d9979ad3c4569672 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -23,7 +23,7 @@ install_packages() {
     then
         echo "mysql-server mysql-server/root_password select $MYSQL_PASS" | debconf-set-selections
         echo "mysql-server mysql-server/root_password_again select $MYSQL_PASS" | debconf-set-selections
-        apt-get install -y --force-yes rabbitmq-server mysql-server mysql-client-core-5.5 python-mysqldb keystone
+        DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes rabbitmq-server mysql-server mysql-client-core-5.5 python-mysqldb keystone
     else
         #yum install -y openstack-keystone rabbitmq-server mysql-server MySQL-client python-oslo-utils
         yum install -y openstack-keystone rabbitmq-server python-oslo-utils
@@ -40,7 +40,7 @@ install_packages() {
 install_neutron_server () {
     if $UBUNTU
     then
-        apt-get install -y --force-yes neutron-server
+        DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes neutron-server
     else
         yum install -y openstack-neutron openstack-neutron-ml2
     fi
@@ -210,10 +210,11 @@ check_neutron_openvswitch () {
     if ! $SERVICE_STARTED ; then
         if $UBUNTU; then
             restart_service openvswitch-switch
+            restart_service neutron-plugin-openvswitch-agent
         else
             restart_service openvswitch
+            restart_service neutron-openvswitch-agent
         fi
-        restart_service neutron-openvswitch-agent
         SERVICE_STARTED=true
     fi
 

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index a10d3fdb33ca02f1d6466d3a63905e83422322a8..d64da44f6056b57b0168365dbe3ca02f9cbb342f 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+neutron (2:7.0.0.0b2-1~u14.04+mos2) mos8.0; urgency=medium
+
+  * Switch to Ubuntu packages compatible naming scheme
+  * Add additional upstart scripts
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Fri, 09 Oct 2015 12:22:51 +0300
+
 neutron (2:7.0.0.0b2-1~u14.04+mos1) mos8.0; urgency=medium
 
   * Change version to reflect current state of MOS repository

diff --git a/trusty/debian/control b/trusty/debian/control
index 2959416c683b77306e34a44db2f34d2e415f15e4..8d19f165abce9fbc1a3915ebe27ed4c1c720798f 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -125,10 +125,6 @@ Depends: alembic (>= 0.8.0),
          ${misc:Depends},
          ${python:Depends},
 Recommends: iputils-arping,
-Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
-          neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
-Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
-        neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
 Provides: ${python:Provides},
 Description: OpenStack virtual network service - Python library
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -183,10 +179,6 @@ Provides: neutron-plugin,
           neutron-plugin-plumgrid,
           neutron-plugin-ryu,
           python-argparse,
-Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
-          neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
-Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
-        neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
 Description: OpenStack virtual network service - common files
  Neutron provides an API to dynamically request and configure virtual networks.
  These networks connect "interfaces" from other OpenStack services (such as
@@ -283,12 +275,9 @@ Description: OpenStack virtual network service - metering agent
  .
  This package provides the Neutron metering agent.
 
-Package: neutron-openvswitch-agent
+Package: neutron-plugin-openvswitch-agent
 Architecture: all
 Pre-Depends: openvswitch-switch (>= 1.9),
-Replaces: neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
-Breaks: neutron-plugin-openvswitch-agent (<<2015.1~b3-1),
-Provides: neutron-plugin-openvswitch-agent,
 Depends: neutron-common (= ${source:Version}),
          sudo,
          ${misc:Depends},
@@ -304,11 +293,8 @@ Description: OpenStack virtual network service - Open vSwitch agent
  This package provides the Open vSwitch agent. If you choose to use the Open
  vSwitch plugin on neutron-server, this agent should run on each compute node.
 
-Package: neutron-linuxbridge-agent
+Package: neutron-plugin-linuxbridge-agent
 Architecture: all
-Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
-Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1),
-Provides: neutron-plugin-linuxbridge-agent,
 Depends: bridge-utils,
          neutron-common (= ${source:Version}),
          sudo,
@@ -324,41 +310,129 @@ Description: OpenStack virtual network service - Linux bridge agent
  This package provides the Linux bridge agent. If you choose to use the Linux
  bridge plugin on neutron-server, this agent should run on each compute node.
 
-Package: neutron-plugin-linuxbridge-agent
-Depends: neutron-linuxbridge-agent,
+Package: neutron-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Neutron is a virtual network service for Openstack - Docs
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package contains the documentation
+
+Package: neutron-plugin-ml2
+Architecture: all
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
          ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - ML2 plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Modular Layer 2 plugin.
+
+Package: neutron-plugin-cisco
 Architecture: all
-Section: oldlibs
-description: transitional dummy package for switching to Neutron Linuxbridge agent.
- This is a transitional dummy package due to the move of the Linuxbridge agent from
- core plugin to ML2 MechanismDriver.
- Once you have upgraded, this package can safely be removed. This package provides a
- transition path from neutron-plugin-linuxbridge-agent to neutron-linuxbridge-agent.
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - Cisco plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Cisco plugin.
 
-Package: neutron-plugin-openvswitch-agent
-Depends: neutron-openvswitch-agent,
+Package: neutron-plugin-bigswitch
+Architecture: all
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
          ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - BigSwitch plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the BigSwitch plugin.
+
+Package: neutron-plugin-bigswitch-agent
 Architecture: all
-Section: oldlibs
-description: transitional dummy package for switching to Neutron OpenVswitch agent.
- This is a transitional dummy package due to the move of the OpenVswitch agent from
- core plugin to ML2 MechanismDriver.
- Once you have upgraded, this package can safely be removed. This package provides a
- transition path from neutron-plugin-openvswitch-agent to neutron-openvswitch-agent.
+Depends: neutron-plugin-bigswitch (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - BigSwitch plugin agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the BigSwitch plugin agent.
 
-Package: neutron-plugin-ml2
+Package: neutron-plugin-brocade
+Architecture: all
+Provides: neutron-plugin,
 Depends: neutron-common (= ${source:Version}),
          ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - Brocade plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Brocade plugin.
+
+Package: neutron-plugin-metaplugin
 Architecture: all
-Section: oldlibs
-Description: Transitional dummy package for switching to Debain-based packaging scheme
- This is a transitional dummy package due to move from Ubuntu packaging scheme to Debian one
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - Metaplugin plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Metaplugin plugin.
 
-Package: neutron-doc
+Package: neutron-plugin-midonet
 Architecture: all
-Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: Neutron is a virtual network service for Openstack - Docs
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - Midonet plugin
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
  request and configure virtual servers, Neutron provides an API to
@@ -368,4 +442,122 @@ Description: Neutron is a virtual network service for Openstack - Docs
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package contains the documentation
+ This package provides the Midonet plugin.
+
+Package: neutron-plugin-mlnx
+Architecture: all
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - Mellanox plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Mellanox plugin.
+
+Package: neutron-plugin-mlnx-agent
+Architecture: all
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
+         neutron-plugin-mlnx,
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - Mellanox plugin agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Mellanox plugin agent.
+
+Package: neutron-plugin-sriov-agent
+Architecture: all
+Depends: neutron-plugin-ml2 (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - IBM agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Mellanox SR-IOV agent.
+
+Package: neutron-plugin-oneconvergence
+Architecture: all
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - One Convergence plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the One Convergence plugin.
+
+Package: neutron-plugin-oneconvergence-agent
+Architecture: all
+Depends: neutron-plugin-oneconvergence (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - One Convergence agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the One Convergence agent.
+
+Package: neutron-plugin-nuage
+Architecture: all
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - Nuage plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Nuage plugin.
+
+Package: neutron-plugin-opencontrail
+Architecture: all
+Provides: neutron-plugin,
+Depends: neutron-common (= ${source:Version}),
+         ${misc:Depends},
+Description: Neutron is a virtual network service for Openstack - OpenContrail plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the OpenContail plugin.

diff --git a/trusty/debian/neutron-plugin-bigswitch-agent.init.in b/trusty/debian/neutron-plugin-bigswitch-agent.init.in
new file mode 100644 (file)
index 0000000..bcfb75b
--- /dev/null
+++ b/trusty/debian/neutron-plugin-bigswitch-agent.init.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          neutron-plugin-bigswitch-agent
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Should-Start:      mysql postgresql rabbitmq-server keystone
+# Should-Stop:       mysql postgresql rabbitmq-server keystone
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Neutron Bigswitch Agent
+# Description:       BigSwitch SDN agent for OpenStack Neutron
+### END INIT INFO
+
+# Authors: James Page <james.page@ubuntu.com>
+
+DESC="Openstack Neutron BigSwitch Plugin Agent"
+PROJECT_NAME=neutron
+NAME=${PROJECT_NAME}-plugin-bigswitch-agent
+DAEMON=/usr/bin/neutron-restproxy-agent
+# --config-file=/etc/neutron/neutron.conf will be happened 
+# to DAEMON_ARGS later by openstack-pkg-tools
+DAEMON_ARGS="--config-file=/etc/neutron/plugins/bigswitch/restproxy.ini"

diff --git a/trusty/debian/neutron-linuxbridge-agent.init.in b/trusty/debian/neutron-plugin-linuxbridge-agent.init.in
similarity index 96%
rename from trusty/debian/neutron-linuxbridge-agent.init.in
rename to trusty/debian/neutron-plugin-linuxbridge-agent.init.in
index da1fdb02a0151b774617505b90945ddea34480d9..7540ba052c3605d6b72dc30f8e636919c8fe9326 100644 (file)
--- a/trusty/debian/neutron-linuxbridge-agent.init.in
+++ b/trusty/debian/neutron-plugin-linuxbridge-agent.init.in
@@ -25,5 +25,6 @@ NAME=${PROJECT_NAME}-linuxbridge-agent
 # replaced by ml2 as core_plugin and lb as agent. Making ml2 mandatory
 # to use this agent
 
+DAEMON=/usr/bin/neutron-linuxbridge-agent
 DAEMON_ARGS="--config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"
 

diff --git a/trusty/debian/neutron-linuxbridge-agent.manpages b/trusty/debian/neutron-plugin-linuxbridge-agent.manpages
similarity index 100%
rename from trusty/debian/neutron-linuxbridge-agent.manpages
rename to trusty/debian/neutron-plugin-linuxbridge-agent.manpages

diff --git a/trusty/debian/neutron-plugin-mlnx-agent.init.in b/trusty/debian/neutron-plugin-mlnx-agent.init.in
new file mode 100644 (file)
index 0000000..902ad57
--- /dev/null
+++ b/trusty/debian/neutron-plugin-mlnx-agent.init.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          neutron-plugin-mlnx-agent
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Should-Start:      mysql postgresql rabbitmq-server keystone
+# Should-Stop:       mysql postgresql rabbitmq-server keystone
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Neutron Mellanox Agent
+# Description:       Mellanox SDN agent for OpenStack Neutron
+### END INIT INFO
+
+# Authors: James Page <james.page@ubuntu.com>
+
+DESC="OpenStack Neutron Mellanox Plugin Agent"
+PROJECT_NAME=neutron
+NAME=${PROJECT_NAME}-plugin-mlnx-agent
+# --config-file=/etc/neutron/neutron.conf will be happened 
+# to DAEMON_ARGS later by openstack-pkg-tools
+DAEMON_ARGS="--config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini"

diff --git a/trusty/debian/neutron-plugin-oneconvergence-agent.init.in b/trusty/debian/neutron-plugin-oneconvergence-agent.init.in
new file mode 100644 (file)
index 0000000..1d77c17
--- /dev/null
+++ b/trusty/debian/neutron-plugin-oneconvergence-agent.init.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          neutron-plugin-oneconvergence-agent
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Should-Start:      mysql postgresql rabbitmq-server keystone
+# Should-Stop:       mysql postgresql rabbitmq-server keystone
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Neutron One Convergence Agent
+# Description:       One Convergence SDN agent for OpenStack Neutron
+### END INIT INFO
+
+# Authors: James Page <james.page@ubuntu.com>
+
+DESC="OpenStack Neutron One Convergence Plugin Agent"
+PROJECT_NAME=neutron
+NAME=${PROJECT_NAME}-plugin-oneconvergence-agent
+DAEMON=/usr/bin/neutron-nvsd-agent
+# --config-file=/etc/neutron/neutron.conf will be happened 
+# to DAEMON_ARGS later by openstack-pkg-tools
+DAEMON_ARGS="--config-file=/etc/neutron/plugins/oneconvergence/nvsdplugin.ini"

diff --git a/trusty/debian/neutron-openvswitch-agent.init.in b/trusty/debian/neutron-plugin-openvswitch-agent.init.in
similarity index 96%
rename from trusty/debian/neutron-openvswitch-agent.init.in
rename to trusty/debian/neutron-plugin-openvswitch-agent.init.in
index bc6af291d3f3e40421c8c2481596af98e6c39f53..eeef95e4001d7c568eb196bd47e085da3c42b59a 100644 (file)
--- a/trusty/debian/neutron-openvswitch-agent.init.in
+++ b/trusty/debian/neutron-plugin-openvswitch-agent.init.in
@@ -21,4 +21,5 @@ CONFIG_FILE=/etc/neutron/plugins/ml2/openvswitch_agent.ini
 # Since Juno OVS plugin as been deprecated as core_plugin, it has been
 # replaced by ml2 as core_plugin and ovs as agent. Making ml2 mandatory
 # to use this agent
+DAEMON=/usr/bin/neutron-openvswitch-agent
 DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"

diff --git a/trusty/debian/neutron-openvswitch-agent.manpages b/trusty/debian/neutron-plugin-openvswitch-agent.manpages
similarity index 100%
rename from trusty/debian/neutron-openvswitch-agent.manpages
rename to trusty/debian/neutron-plugin-openvswitch-agent.manpages

diff --git a/trusty/debian/neutron-openvswitch-agent.upstart.in b/trusty/debian/neutron-plugin-openvswitch-agent.upstart.in
similarity index 100%
rename from trusty/debian/neutron-openvswitch-agent.upstart.in
rename to trusty/debian/neutron-plugin-openvswitch-agent.upstart.in

diff --git a/trusty/debian/neutron-plugin-sriov-agent.init.in b/trusty/debian/neutron-plugin-sriov-agent.init.in
new file mode 100644 (file)
index 0000000..92bf043
--- /dev/null
+++ b/trusty/debian/neutron-plugin-sriov-agent.init.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          neutron-plugin-sriov-agent
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Should-Start:      mysql postgresql rabbitmq-server keystone
+# Should-Stop:       mysql postgresql rabbitmq-server keystone
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Neutron SRIOV Agent
+# Description:       SRIOV agent for OpenStack Neutron
+### END INIT INFO
+
+# Authors: James Page <james.page@ubuntu.com>
+
+DESC="OpenStack Neutron SRIOV Plugin Agent"
+PROJECT_NAME=neutron
+NAME=${PROJECT_NAME}-plugin-sriov-agent
+DAEMON=/usr/bin/neutron-sriov-nic-agent
+# --config-file=/etc/neutron/neutron.conf will be happened 
+# to DAEMON_ARGS later by openstack-pkg-tools
+DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/ml2_conf_sriov.ini --config-file=/etc/neutron/plugins/ml2/sriov_agent.ini"