- fix build and runtime dependencies
- fix a problem with Mellanox agent upstart script
- use universal logrotate configuration
- use chgid on all daemons
Related-bug: #
1462251
Change-Id: I44bc699a9a6ac379b83b6f9e5d3676c256d587e7
25 files changed:
Section: net
Priority: optional
Maintainer: MOS Neutron Team <mos-neutron@mirantis.com>
Section: net
Priority: optional
Maintainer: MOS Neutron Team <mos-neutron@mirantis.com>
-Build-Depends: debhelper (>= 9), python-all (>= 2.7.1), python-sphinx (>= 1.1.2)
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ python-all (>= 2.7.1),
+ python-sphinx (>= 1.1.2),
+ openstack-pkg-tools (>= 23~),
+ python-pbr,
+ python-setuptools
Build-Depends-Indep:
alembic (>= 0.7.2),
Build-Depends-Indep:
alembic (>= 0.7.2),
- python-anyjson (>= 0.3.3),
- python-babel (>= 1.3),
python-cliff (>= 1.10.0),
python-coverage (>= 3.6),
python-eventlet (>= 0.16.1),
python-cliff (>= 1.10.0),
python-coverage (>= 3.6),
python-eventlet (>= 0.16.1),
python-greenlet (>= 0.3.2),
python-hacking (>= 0.10.0),
python-httplib2 (>= 0.7.5),
python-greenlet (>= 0.3.2),
python-hacking (>= 0.10.0),
python-httplib2 (>= 0.7.5),
- python-iso8601 (>= 0.1.9),
python-jinja2 (>= 2.6),
python-jsonrpclib,
python-keystoneclient (>= 1:1.1.0),
python-keystonemiddleware (>= 1.5.0),
python-mock (>= 1.0),
python-jinja2 (>= 2.6),
python-jsonrpclib,
python-keystoneclient (>= 1:1.1.0),
python-keystonemiddleware (>= 1.5.0),
python-mock (>= 1.0),
python-netaddr (>= 0.7.12),
python-neutronclient (>= 1:2.3.11),
python-novaclient (>= 1:2.22.0),
python-netaddr (>= 0.7.12),
python-neutronclient (>= 1:2.3.11),
python-novaclient (>= 1:2.22.0),
python-oslo.utils (>= 1.4.0),
python-oslosphinx (>= 2.5.0),
python-oslotest (>= 1.5.1),
python-oslo.utils (>= 1.4.0),
python-oslosphinx (>= 2.5.0),
python-oslotest (>= 1.5.1),
python-paste,
python-pastedeploy (>= 1.5.0),
python-pbr (>= 0.10),
python-paste,
python-pastedeploy (>= 1.5.0),
python-pbr (>= 0.10),
+ python-psycopg2,
+ python-pyudev,
python-requests (>= 2.2.0),
python-requests-mock (>= 0.6.0),
python-retrying (>= 1.2.3),
python-routes (>= 1.12.3),
python-setuptools,
python-requests (>= 2.2.0),
python-requests-mock (>= 0.6.0),
python-retrying (>= 1.2.3),
python-routes (>= 1.12.3),
python-setuptools,
python-six (>= 1.9.0),
python-sphinx (>= 1.1.2),
python-sqlalchemy (>= 0.9.7),
python-stevedore (>= 1.3.0),
python-six (>= 1.9.0),
python-sphinx (>= 1.1.2),
python-sqlalchemy (>= 0.9.7),
python-stevedore (>= 1.3.0),
- python-subunit (>= 0.0.18),
python-tempest-lib (>= 0.4.0),
python-testscenarios (>= 0.4),
python-testtools (>= 0.9.36),
python-webob (>= 1.2.3),
python-tempest-lib (>= 0.4.0),
python-testscenarios (>= 0.4),
python-testtools (>= 0.9.36),
python-webob (>= 1.2.3),
-XS-Python-Version: >= 2.7
Standards-Version: 3.9.6
XS-Testsuite: autopkgtest
Standards-Version: 3.9.6
XS-Testsuite: autopkgtest
Architecture: all
Depends:
adduser,
Architecture: all
Depends:
adduser,
neutron-common (= ${source:Version}),
${misc:Depends},
${python:Depends},
neutron-common (= ${source:Version}),
${misc:Depends},
${python:Depends},
Architecture: all
Depends:
adduser,
Architecture: all
Depends:
adduser,
python-neutron (= ${source:Version}),
python-neutron (= ${source:Version}),
${misc:Depends},
${python:Depends}
Breaks:
${misc:Depends},
${python:Depends}
Breaks:
Section: python
Depends:
alembic (>= 0.7.2),
Section: python
Depends:
alembic (>= 0.7.2),
- python-anyjson (>= 0.3.3),
- python-babel (>= 1.3),
python-eventlet (>= 0.16.1),
python-greenlet (>= 0.3.2),
python-httplib2 (>= 0.7.5),
python-eventlet (>= 0.16.1),
python-greenlet (>= 0.3.2),
python-httplib2 (>= 0.7.5),
python-jsonrpclib,
python-keystoneclient (>= 1:1.1.0),
python-keystonemiddleware (>= 1.5.0),
python-jsonrpclib,
python-keystoneclient (>= 1:1.1.0),
python-keystonemiddleware (>= 1.5.0),
- python-kombu (>= 2.5.0),
python-netaddr (>= 0.7.12),
python-neutronclient (>= 1:2.3.11),
python-novaclient (>= 1:2.22.0),
python-netaddr (>= 0.7.12),
python-neutronclient (>= 1:2.3.11),
python-novaclient (>= 1:2.22.0),
-/var/log/neutron/dhcp-agent.log {
+/var/log/neutron/*.log {
daily
missingok
compress
delaycompress
notifempty
daily
missingok
compress
delaycompress
notifempty
-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
+exec start-stop-daemon --start --chuid neutron: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
+++ /dev/null
-/var/log/neutron/l3-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \
+exec start-stop-daemon --start --chuid neutron: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
--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
+++ /dev/null
-/var/log/neutron/metadata-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
chown neutron:root /var/run/neutron
end script
chown neutron:root /var/run/neutron
end script
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metadata-agent -- \
+exec start-stop-daemon --start --chuid neutron: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
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metadata_agent.ini \
--log-file=/var/log/neutron/metadata-agent.log
chown neutron:root /var/run/neutron
end script
chown neutron:root /var/run/neutron
end script
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metering-agent -- \
+exec start-stop-daemon --start --chuid neutron: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
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metering_agent.ini \
--log-file=/var/log/neutron/metering_agent.log
+++ /dev/null
-/var/log/neutron/bigswitch-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
chown neutron:root /var/run/neutron
end script
chown neutron:root /var/run/neutron
end script
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-restproxy-agent -- \
+exec start-stop-daemon --start --chuid neutron: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
--config-file=/etc/neutron/neutron.conf \
--config-file=/etc/neutron/plugins/bigswitch/restproxy.ini \
--log-file=/var/log/neutron/bigswitch-agent.log
+++ /dev/null
-/var/log/neutron/ibm-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
chown neutron:root /var/run/neutron
end script
chown neutron:root /var/run/neutron
end script
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ibm-agent -- \
+exec start-stop-daemon --start --chuid neutron: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
--config-file=/etc/neutron/neutron.conf \
--config-file=/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini \
--log-file=/var/log/neutron/ibm-agent.log
+++ /dev/null
-/var/log/neutron/linuxbridge-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
chown neutron:root /var/run/neutron
end script
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/linuxbridge/linuxbridge_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log
+exec start-stop-daemon --start --chuid neutron:neutron --exec /usr/bin/neutron-linuxbridge-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log
+++ /dev/null
-/var/log/neutron/mlnx-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
pre-start script
mkdir -p /var/run/neutron
pre-start script
mkdir -p /var/run/neutron
- chown neutron:root /var/run/neutron
+ chown neutron:neutron /var/run/neutron
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-mlnx-agent -- \
+exec start-stop-daemon --start --chuid neutron: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
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini \
--log-file=/var/log/neutron/mlnx-agent.log
+++ /dev/null
-/var/log/neutron/nec-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
chown neutron:root /var/run/neutron
end script
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
+exec start-stop-daemon --start --chuid neutron: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
+++ /dev/null
-/var/log/neutron/nvsd-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
chown neutron:root /var/run/neutron
end script
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
+exec start-stop-daemon --start --chuid neutron: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
+++ /dev/null
-/var/log/neutron/openvswitch-agent.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
pre-start script
[ ! -x /usr/bin/neutron-ovs-cleanup ] && exit 0
pre-start script
[ ! -x /usr/bin/neutron-ovs-cleanup ] && exit 0
- start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ovs-cleanup -- \
+ start-stop-daemon --start --chuid neutron:neutron --exec /usr/bin/neutron-ovs-cleanup -- \
--log-file /var/log/neutron/ovs-cleanup.log \
--config-file /etc/neutron/neutron.conf --verbose
end script
--log-file /var/log/neutron/ovs-cleanup.log \
--config-file /etc/neutron/neutron.conf --verbose
end script
chown neutron:root /var/run/neutron
end script
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/plugin.ini --log-file=/var/log/neutron/ovs-agent.log
+exec start-stop-daemon --start --chuid neutron:neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugin.ini --log-file=/var/log/neutron/ovs-agent.log
+++ /dev/null
-/var/log/neutron/server.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
script
[ -r /etc/default/neutron-server ] && . /etc/default/neutron-server
[ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG"
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 -- \
+ exec start-stop-daemon --start --chuid neutron:neutron --exec /usr/bin/neutron-server -- \
--config-file /etc/neutron/neutron.conf \
--log-file /var/log/neutron/server.log $CONF_ARG
end script
--config-file /etc/neutron/neutron.conf \
--log-file /var/log/neutron/server.log $CONF_ARG
end script