[Merge] lp:~james-page/neutron/systemd-enable into lp:~ubuntu-server-dev/neutron/kilo
Corey Bryant
corey.bryant at canonical.com
Mon Jan 12 14:43:38 UTC 2015
Inline comments below, I think it just affects init.in comments.
Diff comments:
> === modified file 'debian/changelog'
> --- debian/changelog 2015-01-06 14:47:39 +0000
> +++ debian/changelog 2015-01-12 13:50:32 +0000
> @@ -1,3 +1,24 @@
> +neutron (1:2015.1~b1-0ubuntu2) UNRELEASED; urgency=medium
> +
> + * Systemd enablement:
> + - d/control: Add dh-systemd and openstack-pkg-tools to BD's.
> + - d/rules: Enable use of pkgos, tidyup generated init files,
> + override targets to deal with neutron-ovs-cleanup task.
> + - d/*.init.in: Cherry pick pkgos template configurations from
> + Debian neutron package (thanks Thomas), copy and adapt for
> + other agents that are not covered by Debian packaging.
> + - d/*.upstart.in: Specialize upstart configurations for agents
> + which would like neutron-ovs-cleanup to run first.
> + - d/*.upstart: Drop in preference to generated files.
> + - d/*.service.in: Provide specialized systemd units for
> + neutron-ovs-cleanup and neutron-plugin-openvswitch-agent.
> + * d/control,compat: Bump debhelper compat level to 9.
> + * d/*.logrotate,neutron-common.logrotate: Move to single logrotate
> + configuration.
> + * d/rules: Correct path for execution of unit tests.
> +
> + -- James Page <james.page at ubuntu.com> Fri, 09 Jan 2015 16:16:25 +0000
> +
> neutron (1:2015.1~b1-0ubuntu1) vivid; urgency=medium
>
> [ Chuck Short ]
>
> === modified file 'debian/compat'
> --- debian/compat 2014-03-07 09:21:15 +0000
> +++ debian/compat 2015-01-12 13:50:32 +0000
> @@ -1,1 +1,1 @@
> -8
> +9
>
> === modified file 'debian/control'
> --- debian/control 2015-01-06 14:47:39 +0000
> +++ debian/control 2015-01-12 13:50:32 +0000
> @@ -3,7 +3,11 @@
> Priority: optional
> Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
> XSBC-Original-Maintainer: Chuck Short <zulcss at ubuntu.com>
> -Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
> +Build-Depends:
> + debhelper (>= 9~),
> + dh-systemd,
> + openstack-pkg-tools (>= 21ubuntu4~),
> + python-all (>= 2.6)
> Build-Depends-Indep:
> alembic (>= 0.7.1),
> python-cliff (>= 1.6.0),
> @@ -22,15 +26,15 @@
> python-netaddr (>= 0.7.12),
> python-neutronclient (>= 1:2.3.6),
> python-novaclient (>= 1:2.18.0),
> + python-oslo-context (>= 0.1.0),
> python-oslo.config (>= 1:1.4.0),
> - python-oslo-context (>= 0.1.0),
> python-oslo.db (>= 1.1.0),
> python-oslo.i18n (>= 1.0.0),
> + python-oslo.messaging (>= 1.4.0),
> python-oslo.middleware (>= 0.1.0),
> - python-oslo.messaging (>= 1.4.0),
> python-oslo.rootwrap (>= 1.3.0),
> + python-oslo.serialization (>= 1.0.0),
> python-oslo.utils (>= 1.1.0),
> - python-oslo.serialization (>= 1.0.0),
> python-oslotest (>= 1.2.0),
> python-paste,
> python-pastedeploy,
> @@ -43,8 +47,8 @@
> python-six (>= 1.7.0),
> python-sqlalchemy (>= 0.9.7),
> python-stevedore (>= 1.1.0),
> + python-testscenarios (>= 0.4),
> python-testtools (>= 0.9.36),
> - python-testscenarios (>= 0.4),
> python-webob (>= 1.2.3),
> python-webtest (>= 2.0),
> subunit,
> @@ -444,15 +448,15 @@
> python-netaddr (>= 0.7.12),
> python-neutronclient (>= 1:2.3.6),
> python-novaclient (>= 1:2.18.0),
> + python-oslo-context (>= 0.1.0),
> python-oslo.config (>= 1:1.4.0),
> - python-oslo-context (>= 0.1.0),
> python-oslo.db (>= 1.1.0),
> python-oslo.i18n (>= 1.0.0),
> + python-oslo.messaging (>= 1.4.0),
> python-oslo.middleware (>= 0.1.0),
> - python-oslo.messaging (>= 1.4.0),
> python-oslo.rootwrap (>= 1.3.0),
> + python-oslo.serialization (>= 1.0.0),
> python-oslo.utils (>= 1.1.0),
> - python-oslo.serialization (>= 1.0.0),
> python-paste,
> python-pastedeploy,
> python-requests (>= 2.2.0),
>
> === added file 'debian/neutron-common.logrotate'
> --- debian/neutron-common.logrotate 1970-01-01 00:00:00 +0000
> +++ debian/neutron-common.logrotate 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,8 @@
> +/var/log/neutron/*.log {
> + daily
> + missingok
> + compress
> + delaycompress
> + notifempty
> + copytruncate
> +}
>
> === added file 'debian/neutron-dhcp-agent.init.in'
> --- debian/neutron-dhcp-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-dhcp-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,23 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-dhcp-agent
> +# Required-Start: $network $local_fs $remote_fs $syslog
> +# Required-Stop: $remote_fs
> +# Should-Start: mysql postgresql rabbitmq-server keystone neutron-ovs-cleanup
> +# Should-Stop: mysql postgresql rabbitmq-server keystone
> +# Default-Start: 2 3 4 5
> +# Default-Stop: 0 1 6
> +# Short-Description: Neutron DHCP agent
> +# Description: Provide DHCP agent for neutron
> +### END INIT INFO
> +
> +# Author: Mehdi Abaakouk <sileht at sileht.net>
> +
> +# PATH should only include /usr/* if it runs after the mountnfs.sh script
> +PATH=/sbin:/usr/sbin:/bin:/usr/bin
> +DESC="OpenStack Neutron DHCP agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-dhcp-agent
> +# --config-file=/etc/neutron/neutron.conf will be happened
> +# to DAEMON_ARGS later by openstack-pkg-tools
> +DAEMON_ARGS="--config-file=/etc/neutron/dhcp_agent.ini"
>
> === removed file 'debian/neutron-dhcp-agent.logrotate'
> --- debian/neutron-dhcp-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-dhcp-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/dhcp-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-dhcp-agent.upstart'
> --- debian/neutron-dhcp-agent.upstart 2013-12-11 11:23:12 +0000
> +++ debian/neutron-dhcp-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,22 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron DHCP Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> - # Check to see if openvswitch plugin in use by checking
> - # status of cleanup upstart configuration
> - if status neutron-ovs-cleanup; then
> - start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-dhcp-agent
> - fi
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log
>
> === added file 'debian/neutron-dhcp-agent.upstart.in'
> --- debian/neutron-dhcp-agent.upstart.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-dhcp-agent.upstart.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,22 @@
> +# vim:set ft=upstart ts=2 et:
> +description "Neutron DHCP Agent"
> +author "Chuck Short <zulcss at ubuntu.com>"
> +
> +start on runlevel [2345]
> +stop on runlevel [!2345]
> +
> +respawn
> +
> +chdir /var/run
> +
> +pre-start script
> + mkdir -p /var/run/neutron
> + chown neutron:root /var/run/neutron
> + # Check to see if openvswitch plugin in use by checking
> + # status of cleanup upstart configuration
> + if status neutron-ovs-cleanup; then
> + start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-dhcp-agent
> + fi
> +end script
> +
> +exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log
>
> === added file 'debian/neutron-l3-agent.init.in'
> --- debian/neutron-l3-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-l3-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,24 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-l3-agent
> +# Required-Start: $network $local_fs $remote_fs $syslog
> +# Required-Stop: $remote_fs
> +# Should-Start: mysql postgresql rabbitmq-server keystone openvswitch-switch neutron-ovs-cleanup
> +# Should-Stop: mysql postgresql rabbitmq-server keystone openvswitch-switch
> +# Default-Start: 2 3 4 5
> +# Default-Stop: 0 1 6
> +# Short-Description: Neutron L3 agent
> +# Description: Provide L3 agent for neutron
> +### END INIT INFO
> +
> +# Authors: Mehdi Abaakouk <sileht at sileht.net>
> +# Thomas Goirand <zigo at 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 L3 agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-l3-agent
> +# --config-file=/etc/neutron/neutron.conf will be happened
> +# to DAEMON_ARGS later by openstack-pkg-tools
> +DAEMON_ARGS="--config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini"
>
> === removed file 'debian/neutron-l3-agent.logrotate'
> --- debian/neutron-l3-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-l3-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/l3-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-l3-agent.upstart'
> --- debian/neutron-l3-agent.upstart 2014-03-28 09:49:30 +0000
> +++ debian/neutron-l3-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,24 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron L3 Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> - # Check to see if openvswitch plugin in use by checking
> - # status of cleanup upstart configuration
> - if status neutron-ovs-cleanup; then
> - start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-l3-agent
> - fi
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \
> - --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini \
> - --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log
>
> === added file 'debian/neutron-l3-agent.upstart.in'
> --- debian/neutron-l3-agent.upstart.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-l3-agent.upstart.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,24 @@
> +# vim:set ft=upstart ts=2 et:
> +description "Neutron L3 Agent"
> +author "Chuck Short <zulcss at ubuntu.com>"
> +
> +start on runlevel [2345]
> +stop on runlevel [!2345]
> +
> +respawn
> +
> +chdir /var/run
> +
> +pre-start script
> + mkdir -p /var/run/neutron
> + chown neutron:root /var/run/neutron
> + # Check to see if openvswitch plugin in use by checking
> + # status of cleanup upstart configuration
> + if status neutron-ovs-cleanup; then
> + start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-l3-agent
> + fi
> +end script
> +
> +exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \
> + --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini \
> + --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log
>
> === added file 'debian/neutron-lbaas-agent.init.in'
> --- debian/neutron-lbaas-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-lbaas-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,23 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-lbaas-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 LBaaS agent
> +# Description: Provide LBaaS agent for neutron
> +### END INIT INFO
> +
> +# Author: Thomas Goirand <zigo at 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 LBaaS agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-lbaas-agent
> +# --config-file=/etc/neutron/neutron.conf will be happened
> +# to DAEMON_ARGS later by openstack-pkg-tools
> +DAEMON_ARGS="--config-file=/etc/neutron/lbaas_agent.ini"
>
> === removed file 'debian/neutron-lbaas-agent.logrotate'
> --- debian/neutron-lbaas-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-lbaas-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/lbaas-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-lbaas-agent.upstart'
> --- debian/neutron-lbaas-agent.upstart 2013-08-09 08:43:23 +0000
> +++ debian/neutron-lbaas-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,17 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron LBaaS Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-lbaas-agent -- --config-file=/etc/neutron/lbaas_agent.ini --config-file=/etc/neutron/neutron.conf --log-file=/var/log/neutron/lbaas-agent.log
>
> === added file 'debian/neutron-metadata-agent.init.in'
> --- debian/neutron-metadata-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-metadata-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,23 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-metadata-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 Metadata Agent agent
> +# Description: Provide Metadata agent for neutron
> +### END INIT INFO
> +
> +# Author: Thomas Goirand <zigo at 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 Metadata Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-metadata-agent
> +# --config-file=/etc/neutron/neutron.conf will be happened
> +# to DAEMON_ARGS later by openstack-pkg-tools
> +DAEMON_ARGS="--config-file=/etc/neutron/metadata_agent.ini"
>
> === removed file 'debian/neutron-metadata-agent.logrotate'
> --- debian/neutron-metadata-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-metadata-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/metadata-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-metadata-agent.upstart'
> --- debian/neutron-metadata-agent.upstart 2013-08-09 08:43:23 +0000
> +++ debian/neutron-metadata-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,19 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron Metadata Plugin Agent"
> -author "Yolanda Robla <yolanda.robla at canonical.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metadata-agent -- \
> - --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metadata_agent.ini \
> - --log-file=/var/log/neutron/metadata-agent.log
>
> === added file 'debian/neutron-metering-agent.init.in'
> --- debian/neutron-metering-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-metering-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,23 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-metering-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 Metering Agent agent
> +# Description: Provides Metering agent for neutron
> +### END INIT INFO
> +
> +# Author: Thomas Goirand <zigo at 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 Metering Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-metering-agent
> +# --config-file=/etc/neutron/neutron.conf will be happened
> +# to DAEMON_ARGS later by openstack-pkg-tools
> +DAEMON_ARGS="--config-file=/etc/neutron/metering_agent.ini"
>
> === removed file 'debian/neutron-metering-agent.upstart'
> --- debian/neutron-metering-agent.upstart 2014-03-18 15:54:37 +0000
> +++ debian/neutron-metering-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,19 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron Metering Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metering-agent -- \
> - --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metering_agent.ini \
> - --log-file=/var/log/neutron/metering_agent.log
>
> === added file 'debian/neutron-plugin-bigswitch-agent.init.in'
> --- debian/neutron-plugin-bigswitch-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-bigswitch-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,22 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-bigswitch-agent
Does this need to match NAME (below)?
> +# 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 at ubuntu.com>
> +
> +DESC="Openstack Neutron BigSwitch Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-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"
>
> === removed file 'debian/neutron-plugin-bigswitch-agent.logrotate'
> --- debian/neutron-plugin-bigswitch-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-plugin-bigswitch-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/bigswitch-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-plugin-bigswitch-agent.upstart'
> --- debian/neutron-plugin-bigswitch-agent.upstart 2014-03-07 09:37:41 +0000
> +++ debian/neutron-plugin-bigswitch-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,20 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron BigSwitch Plugin Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-restproxy-agent -- \
> - --config-file=/etc/neutron/neutron.conf \
> - --config-file=/etc/neutron/plugins/bigswitch/restproxy.ini \
> - --log-file=/var/log/neutron/bigswitch-agent.log
>
> === added file 'debian/neutron-plugin-ibm-agent.init.in'
> --- debian/neutron-plugin-ibm-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-ibm-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,21 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-ibm-agent
Does this need to match NAME (below)?
> +# 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 IBM Agent
> +# Description: IBM SDN agent for OpenStack Neutron
> +### END INIT INFO
> +
> +# Authors: James Page <james.page at ubuntu.com>
> +
> +DESC="Openstack Neutron IBM Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-ibm-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/ibm/sdnve_neutron_plugin.ini"
>
> === removed file 'debian/neutron-plugin-ibm-agent.logrotate'
> --- debian/neutron-plugin-ibm-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-plugin-ibm-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/ibm-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-plugin-ibm-agent.upstart'
> --- debian/neutron-plugin-ibm-agent.upstart 2014-03-07 09:37:41 +0000
> +++ debian/neutron-plugin-ibm-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,20 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron IBM SDN Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ibm-agent -- \
> - --config-file=/etc/neutron/neutron.conf \
> - --config-file=/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini \
> - --log-file=/var/log/neutron/ibm-agent.log
>
> === added file 'debian/neutron-plugin-linuxbridge-agent.init.in'
> --- debian/neutron-plugin-linuxbridge-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-linuxbridge-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,23 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-linuxbridge-agent
Does this need to match NAME (below)?
> +# 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 LinuxBridge Agent
> +# Description: Agent to use within neutron linuxbridge client
> +### END INIT INFO
> +
> +# Author: Ghe Rivero <ghe.rivero at stackops.com>
> +
> +# PATH should only include /usr/* if it runs after the mountnfs.sh script
> +PATH=/sbin:/usr/sbin:/bin:/usr/bin
> +DESC="Openstack Neutron LinuxBridge Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-linuxbridge-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.ini"
>
> === removed file 'debian/neutron-plugin-linuxbridge-agent.logrotate'
> --- debian/neutron-plugin-linuxbridge-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-plugin-linuxbridge-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/linuxbridge-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-plugin-linuxbridge-agent.upstart'
> --- debian/neutron-plugin-linuxbridge-agent.upstart 2014-10-03 17:45:30 +0000
> +++ debian/neutron-plugin-linuxbridge-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,17 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron API Server"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-linuxbridge-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log
>
> === added file 'debian/neutron-plugin-mlnx-agent.init.in'
> --- debian/neutron-plugin-mlnx-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-mlnx-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,21 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-mlnx-agent
Does this need to match NAME (below)?
> +# 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 at ubuntu.com>
> +
> +DESC="OpenStack Neutron Mellanox Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-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"
>
> === removed file 'debian/neutron-plugin-mlnx-agent.logrotate'
> --- debian/neutron-plugin-mlnx-agent.logrotate 2014-03-07 09:26:23 +0000
> +++ debian/neutron-plugin-mlnx-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/mlnx-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-plugin-mlnx-agent.upstart'
> --- debian/neutron-plugin-mlnx-agent.upstart 2014-03-07 09:26:23 +0000
> +++ debian/neutron-plugin-mlnx-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,19 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron MLNX Plugin Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-mlnx-agent -- \
> - --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini \
> - --log-file=/var/log/neutron/mlnx-agent.log
>
> === added file 'debian/neutron-plugin-nec-agent.init.in'
> --- debian/neutron-plugin-nec-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-nec-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,21 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-nec-agent
Does this need to match NAME (below)?
> +# 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 NEC Agent
> +# Description: NEC SDN agent for OpenStack Neutron
> +### END INIT INFO
> +
> +# Authors: James Page <james.page at ubuntu.com>
> +
> +DESC="OpenStack Neutron NEC Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-nec-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/nec/nec.ini"
>
> === removed file 'debian/neutron-plugin-nec-agent.logrotate'
> --- debian/neutron-plugin-nec-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-plugin-nec-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/nec-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-plugin-nec-agent.upstart'
> --- debian/neutron-plugin-nec-agent.upstart 2013-08-09 08:43:23 +0000
> +++ debian/neutron-plugin-nec-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,17 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron NEC Plugin Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-nec-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/nec/nec.ini --log-file=/var/log/neutron/nec-agent.log
>
> === added file 'debian/neutron-plugin-oneconvergence-agent.init.in'
> --- debian/neutron-plugin-oneconvergence-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-oneconvergence-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,22 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-oneconvergence-agent
Does this need to match NAME (below)?
> +# 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 at ubuntu.com>
> +
> +DESC="OpenStack Neutron One Convergence Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-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"
>
> === removed file 'debian/neutron-plugin-oneconvergence-agent.logrotate'
> --- debian/neutron-plugin-oneconvergence-agent.logrotate 2014-03-20 15:42:58 +0000
> +++ debian/neutron-plugin-oneconvergence-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/nvsd-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-plugin-oneconvergence-agent.upstart'
> --- debian/neutron-plugin-oneconvergence-agent.upstart 2014-04-07 16:24:11 +0000
> +++ debian/neutron-plugin-oneconvergence-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,18 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "One Convergence Plugin Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-nvsd-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/oneconvergence/nvsdplugin.ini --log-file=/var/log/neutron/nvsd-agent.log
> -
>
> === added file 'debian/neutron-plugin-openflow-agent.init.in'
> --- debian/neutron-plugin-openflow-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-openflow-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,22 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-openflow-agent
Does this need to match NAME (below)?
> +# 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 OpenFlow Agent
> +# Description: OpenFlow SDN agent for OpenStack Neutron
> +### END INIT INFO
> +
> +# Authors: James Page <james.page at ubuntu.com>
> +
> +DESC="OpenStack Neutron OpenFlow Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-openflow-agent
> +DAEMON=/usr/bin/neutron-ofagent-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_ofa.ini"
>
> === removed file 'debian/neutron-plugin-openflow-agent.logrotate'
> --- debian/neutron-plugin-openflow-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-plugin-openflow-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/openflow-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-plugin-openflow-agent.upstart'
> --- debian/neutron-plugin-openflow-agent.upstart 2014-03-07 09:37:41 +0000
> +++ debian/neutron-plugin-openflow-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,20 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron OpenFlow Plugin Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ofagent-agent -- \
> - --config-file=/etc/neutron/neutron.conf \
> - --config-file=/etc/neutron/plugins/ml2/ml2_conf_ofa.ini \
> - --log-file=/var/log/neutron/openflow-agent.log
>
> === added file 'debian/neutron-plugin-openvswitch-agent.init.in'
> --- debian/neutron-plugin-openvswitch-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-openvswitch-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,20 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-openvswitch-agent
> +# Required-Start: $network $local_fs $remote_fs $syslog
> +# Required-Stop: $remote_fs openvswitch-switch
> +# Should-Start: mysql postgresql rabbitmq-server keystone neutron-ovs-cleanup
> +# Should-Stop: mysql postgresql rabbitmq-server keystone
> +# Default-Start: 2 3 4 5
> +# Default-Stop: 0 1 6
> +# Short-Description: Neutron Open vSwitch Agent
> +# Description: Open vSwitch agent for OpenStack Neutron ML2 plugin
> +### END INIT INFO
> +
> +# Authors: Julien Danjou <acid at debian.org>, Thomas Goirand <zigo at debian.org>
> +
> +DESC="Openstack Neutron Open vSwitch Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-plugin-openvswitch-agent
> +DAEMON=/usr/bin/neutron-openvswitch-agent
> +DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"
>
> === removed file 'debian/neutron-plugin-openvswitch-agent.logrotate'
> --- debian/neutron-plugin-openvswitch-agent.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-plugin-openvswitch-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/openvswitch-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === added file 'debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.init.in'
> --- debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,18 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-ovs-cleanup
> +# Required-Start: $network $local_fs $remote_fs $syslog openvswitch-switch
> +# Required-Stop: $remote_fs
> +# Should-Start:
> +# Should-Stop:
> +# Default-Start: 2 3 4 5
> +# Default-Stop: 0 1 6
> +# Short-Description: Neutron OVS Cleanup
> +# Description: OpenvSwitch Cleanup for OpenStack Neutron
> +### END INIT INFO
> +
> +# Authors: James Page <james.page at ubuntu.com>
> +
> +DESC="OpenStack Neutron OVS cleanup"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-ovs-cleanup
>
> === added file 'debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.service.in'
> --- debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.service.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.service.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,17 @@
> +[Unit]
> +Description=OpenStack Neutron OVS cleanup
> +
> +[Service]
> +type=oneshot
> +User=neutron
> +Group=neutron
> +WorkingDirectory=/var/lib/neutron
> +PermissionsStartOnly=true
> +ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron
> +ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron
> +ExecStart=/etc/init.d/neutron-ovs-cleanup systemd-start
> +RemainAfterExit=yes
> +
> +[Install]
> +WantedBy=multi-user.target
> +
>
> === removed file 'debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart'
> --- debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart 2013-12-11 11:57:43 +0000
> +++ debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart 1970-01-01 00:00:00 +0000
> @@ -1,13 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron OVS cleanup"
> -author "James Page <james.page at ubuntu.com>"
> -
> -start on started openvswitch-switch
> -stop on runlevel [!2345]
> -
> -pre-start script
> - [ ! -x /usr/bin/neutron-ovs-cleanup ] && exit 0
> - start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ovs-cleanup -- \
> - --log-file /var/log/neutron/ovs-cleanup.log \
> - --config-file /etc/neutron/neutron.conf --verbose
> -end script
>
> === added file 'debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart.in'
> --- debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,13 @@
> +# vim:set ft=upstart ts=2 et:
> +description "Neutron OVS cleanup"
> +author "James Page <james.page at ubuntu.com>"
> +
> +start on started openvswitch-switch
> +stop on runlevel [!2345]
> +
> +pre-start script
> + [ ! -x /usr/bin/neutron-ovs-cleanup ] && exit 0
> + start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ovs-cleanup -- \
> + --log-file /var/log/neutron/ovs-cleanup.log \
> + --config-file /etc/neutron/neutron.conf --verbose
> +end script
>
> === added file 'debian/neutron-plugin-openvswitch-agent.service.in'
> --- debian/neutron-plugin-openvswitch-agent.service.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-openvswitch-agent.service.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,19 @@
> +[Unit]
> +Description=Openstack Neutron Open vSwitch Plugin Agent
> +After=mysql.service postgresql.service rabbitmq-server.service keystone.service
> +Requires=neutron-ovs-cleanup.service
> +
> +[Service]
> +User=neutron
> +Group=neutron
> +WorkingDirectory=/var/lib/neutron
> +PermissionsStartOnly=true
> +ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron
> +ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron
> +ExecStart=/etc/init.d/neutron-plugin-openvswitch-agent systemd-start
> +Restart=on-failure
> +LimitNOFILE=65535
> +
> +[Install]
> +WantedBy=multi-user.target
> +
>
> === removed file 'debian/neutron-plugin-openvswitch-agent.upstart'
> --- debian/neutron-plugin-openvswitch-agent.upstart 2013-12-11 11:23:12 +0000
> +++ debian/neutron-plugin-openvswitch-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,17 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron OpenvSwitch Plugin Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345] and started neutron-ovs-cleanup
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/openvswitch-agent.log
>
> === added file 'debian/neutron-plugin-openvswitch-agent.upstart.in'
> --- debian/neutron-plugin-openvswitch-agent.upstart.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-openvswitch-agent.upstart.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,17 @@
> +# vim:set ft=upstart ts=2 et:
> +description "Neutron OpenvSwitch Plugin Agent"
> +author "Chuck Short <zulcss at ubuntu.com>"
> +
> +start on runlevel [2345] and started neutron-ovs-cleanup
> +stop on runlevel [!2345]
> +
> +respawn
> +
> +chdir /var/run
> +
> +pre-start script
> + mkdir -p /var/run/neutron
> + chown neutron:root /var/run/neutron
> +end script
> +
> +exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/openvswitch-agent.log
>
> === added file 'debian/neutron-plugin-sriov-agent.init.in'
> --- debian/neutron-plugin-sriov-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-plugin-sriov-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,22 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-plugin-sriov-agent
Does this need to match NAME (below)?
> +# 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 at ubuntu.com>
> +
> +DESC="OpenStack Neutron SRIOV Plugin Agent"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-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"
>
> === removed file 'debian/neutron-plugin-sriov-agent.logrotate'
> --- debian/neutron-plugin-sriov-agent.logrotate 2014-08-28 16:34:02 +0000
> +++ debian/neutron-plugin-sriov-agent.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/sriov-agent.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-plugin-sriov-agent.upstart'
> --- debian/neutron-plugin-sriov-agent.upstart 2014-08-28 16:34:02 +0000
> +++ debian/neutron-plugin-sriov-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,20 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron SRIOV SDN Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/usr/bin/neutron-sriov-nic-agent -- \
> - --config-file=/etc/neutron/neutron.conf \
> - --config-file=/etc/neutron/plugins/ml2/ml2_conf_sriov \
> - --log-file=/var/log/neutron/sriov-agent.log
>
> === added file 'debian/neutron-server.init.in'
> --- debian/neutron-server.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-server.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,18 @@
> +#! /bin/sh
> +### BEGIN INIT INFO
> +# Provides: neutron-server
> +# Required-Start: $remote_fs $syslog
> +# Required-Stop: $remote_fs $syslog
> +# 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-server
> +# Description: Provides the Neutron networking service
> +### END INIT INFO
> +
> +DESC="OpenStack Neutron Server"
> +PROJECT_NAME=neutron
> +NAME=${PROJECT_NAME}-server
> +[ -r /etc/default/neutron-server ] && . /etc/default/neutron-server
> +[ -r "$NEUTRON_PLUGIN_CONFIG" ] && DAEMON_ARGS="--config-file=$NEUTRON_PLUGIN_CONFIG"
>
> === removed file 'debian/neutron-server.logrotate'
> --- debian/neutron-server.logrotate 2014-03-07 09:21:15 +0000
> +++ debian/neutron-server.logrotate 1970-01-01 00:00:00 +0000
> @@ -1,7 +0,0 @@
> -/var/log/neutron/server.log {
> - daily
> - missingok
> - compress
> - delaycompress
> - notifempty
> -}
>
> === removed file 'debian/neutron-server.upstart'
> --- debian/neutron-server.upstart 2013-08-09 08:43:23 +0000
> +++ debian/neutron-server.upstart 1970-01-01 00:00:00 +0000
> @@ -1,23 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron API Server"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> -end script
> -
> -script
> - [ -r /etc/default/neutron-server ] && . /etc/default/neutron-server
> - [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG"
> - exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-server -- \
> - --config-file /etc/neutron/neutron.conf \
> - --log-file /var/log/neutron/server.log $CONF_ARG
> -end script
>
> === added file 'debian/neutron-vpn-agent.init.in'
> --- debian/neutron-vpn-agent.init.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-vpn-agent.init.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,23 @@
> +#!/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 neutron-ovs-cleanup
> +# 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 at 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
> +# --config-file=/etc/neutron/neutron.conf will be happened
> +# to DAEMON_ARGS later by openstack-pkg-tools
> +DAEMON_ARGS="--config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini --config-file=/etc/neutron/vpn_agent.ini"
>
> === removed file 'debian/neutron-vpn-agent.upstart'
> --- debian/neutron-vpn-agent.upstart 2014-04-13 19:54:40 +0000
> +++ debian/neutron-vpn-agent.upstart 1970-01-01 00:00:00 +0000
> @@ -1,25 +0,0 @@
> -# vim:set ft=upstart ts=2 et:
> -description "Neutron VPN Agent"
> -author "Chuck Short <zulcss at ubuntu.com>"
> -
> -start on runlevel [2345]
> -stop on runlevel [!2345]
> -
> -respawn
> -
> -chdir /var/run
> -
> -pre-start script
> - mkdir -p /var/run/neutron
> - chown neutron:root /var/run/neutron
> - # Check to see if openvswitch plugin in use by checking
> - # status of cleanup upstart configuration
> - if status neutron-ovs-cleanup; then
> - start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-vpn-agent
> - fi
> -end script
> -
> -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
> - --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
> - --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \
> - --log-file=/var/log/neutron/vpn_agent.log
>
> === added file 'debian/neutron-vpn-agent.upstart.in'
> --- debian/neutron-vpn-agent.upstart.in 1970-01-01 00:00:00 +0000
> +++ debian/neutron-vpn-agent.upstart.in 2015-01-12 13:50:32 +0000
> @@ -0,0 +1,25 @@
> +# vim:set ft=upstart ts=2 et:
> +description "Neutron VPN Agent"
> +author "Chuck Short <zulcss at ubuntu.com>"
> +
> +start on runlevel [2345]
> +stop on runlevel [!2345]
> +
> +respawn
> +
> +chdir /var/run
> +
> +pre-start script
> + mkdir -p /var/run/neutron
> + chown neutron:root /var/run/neutron
> + # Check to see if openvswitch plugin in use by checking
> + # status of cleanup upstart configuration
> + if status neutron-ovs-cleanup; then
> + start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-vpn-agent
> + fi
> +end script
> +
> +exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
> + --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
> + --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \
> + --log-file=/var/log/neutron/vpn_agent.log
>
> === modified file 'debian/rules'
> --- debian/rules 2015-01-06 14:47:39 +0000
> +++ debian/rules 2015-01-12 13:50:32 +0000
> @@ -3,18 +3,27 @@
> # Uncomment this to turn on verbose mode.
> #export DH_VERBOSE=1
>
> +include /usr/share/openstack-pkg-tools/pkgos.make
> +
> %:
> - dh $@ --with python2
> + dh $@ --with python2,systemd
>
> override_dh_install:
> dh_install --fail-missing -X/usr/etc
>
> +override_dh_systemd_enable:
> + dh_systemd_enable -pneutron-plugin-openvswitch-agent --name=neutron-ovs-cleanup \
> + neutron-ovs-cleanup.service
> + dh_systemd_enable
> +
> override_dh_installinit:
> - dh_installinit
> - dh_installinit -pneutron-plugin-openvswitch-agent --no-start --name=neutron-ovs-cleanup
> + dh_installinit -pneutron-plugin-openvswitch-agent --no-start \
> + --name=neutron-ovs-cleanup
> + dh_installinit --error-handler=true
>
> override_dh_auto_clean:
> - dh_clean
> + dh_auto_clean
> + rm -f debian/*.upstart debian/*.init debian/*.service
>
> get-orig-source:
> uscan --verbose --force-download --rename --destdir=../build-area
> @@ -28,7 +37,7 @@
> testr init && \
> set -e && \
> TEMP_REZ=`mktemp -t` && \
> - testr run --subunit neutron.tests.unit.test_wsgi | tee $$TEMP_REZ | subunit2pyunit; \
> + testr run --subunit neutron.tests.unit | tee $$TEMP_REZ | subunit2pyunit; \
> cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats; \
> rm -f $$TEMP_REZ ; \
> testr slowest; \
>
--
https://code.launchpad.net/~james-page/neutron/systemd-enable/+merge/246144
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~james-page/neutron/systemd-enable into lp:~ubuntu-server-dev/neutron/kilo.
More information about the Ubuntu-reviews
mailing list