From a2762ccf67e2d52ccf212495c35a0640c2563bdb Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Fri, 17 Jul 2015 17:01:29 +0300 Subject: [PATCH] Improve Neutron packages - 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 --- trusty/debian/control | 27 ++++++++++--------- ...ent.logrotate => neutron-common.logrotate} | 3 ++- trusty/debian/neutron-dhcp-agent.upstart | 2 +- trusty/debian/neutron-l3-agent.logrotate | 7 ----- trusty/debian/neutron-l3-agent.upstart | 2 +- .../debian/neutron-metadata-agent.logrotate | 7 ----- trusty/debian/neutron-metadata-agent.upstart | 2 +- trusty/debian/neutron-metering-agent.upstart | 2 +- .../neutron-plugin-bigswitch-agent.logrotate | 7 ----- .../neutron-plugin-bigswitch-agent.upstart | 2 +- .../debian/neutron-plugin-ibm-agent.logrotate | 7 ----- .../debian/neutron-plugin-ibm-agent.upstart | 2 +- ...neutron-plugin-linuxbridge-agent.logrotate | 7 ----- .../neutron-plugin-linuxbridge-agent.upstart | 2 +- .../neutron-plugin-mlnx-agent.logrotate | 7 ----- .../debian/neutron-plugin-mlnx-agent.upstart | 4 +-- .../debian/neutron-plugin-nec-agent.logrotate | 7 ----- .../debian/neutron-plugin-nec-agent.upstart | 2 +- ...tron-plugin-oneconvergence-agent.logrotate | 7 ----- ...eutron-plugin-oneconvergence-agent.upstart | 2 +- ...neutron-plugin-openvswitch-agent.logrotate | 7 ----- ...nvswitch-agent.neutron-ovs-cleanup.upstart | 2 +- .../neutron-plugin-openvswitch-agent.upstart | 2 +- trusty/debian/neutron-server.logrotate | 7 ----- trusty/debian/neutron-server.upstart | 2 +- 25 files changed, 31 insertions(+), 97 deletions(-) rename trusty/debian/{neutron-dhcp-agent.logrotate => neutron-common.logrotate} (63%) delete mode 100644 trusty/debian/neutron-l3-agent.logrotate delete mode 100644 trusty/debian/neutron-metadata-agent.logrotate delete mode 100644 trusty/debian/neutron-plugin-bigswitch-agent.logrotate delete mode 100644 trusty/debian/neutron-plugin-ibm-agent.logrotate delete mode 100644 trusty/debian/neutron-plugin-linuxbridge-agent.logrotate delete mode 100644 trusty/debian/neutron-plugin-mlnx-agent.logrotate delete mode 100644 trusty/debian/neutron-plugin-nec-agent.logrotate delete mode 100644 trusty/debian/neutron-plugin-oneconvergence-agent.logrotate delete mode 100644 trusty/debian/neutron-plugin-openvswitch-agent.logrotate delete mode 100644 trusty/debian/neutron-server.logrotate diff --git a/trusty/debian/control b/trusty/debian/control index cdf0571b9..af7d430b4 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -2,11 +2,16 @@ Source: neutron Section: net Priority: optional Maintainer: MOS Neutron Team -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), - python-anyjson (>= 0.3.3), - python-babel (>= 1.3), python-cliff (>= 1.10.0), python-coverage (>= 3.6), python-eventlet (>= 0.16.1), @@ -14,12 +19,12 @@ Build-Depends-Indep: 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-mysqldb, python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.3.11), python-novaclient (>= 1:2.22.0), @@ -36,25 +41,26 @@ Build-Depends-Indep: python-oslo.utils (>= 1.4.0), python-oslosphinx (>= 2.5.0), python-oslotest (>= 1.5.1), + python-gflags, 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-simplejson, 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), -XS-Python-Version: >= 2.7 + subunit Standards-Version: 3.9.6 XS-Testsuite: autopkgtest @@ -62,7 +68,6 @@ Package: neutron-server Architecture: all Depends: adduser, - conntrack, neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, @@ -86,8 +91,8 @@ Package: neutron-common Architecture: all Depends: adduser, + conntrack, python-neutron (= ${source:Version}), - python-neutron-fwaas, ${misc:Depends}, ${python:Depends} Breaks: @@ -392,8 +397,7 @@ Architecture: all Section: python Depends: alembic (>= 0.7.2), - python-anyjson (>= 0.3.3), - python-babel (>= 1.3), + iproute2, python-eventlet (>= 0.16.1), python-greenlet (>= 0.3.2), python-httplib2 (>= 0.7.5), @@ -402,7 +406,6 @@ Depends: 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), diff --git a/trusty/debian/neutron-dhcp-agent.logrotate b/trusty/debian/neutron-common.logrotate similarity index 63% rename from trusty/debian/neutron-dhcp-agent.logrotate rename to trusty/debian/neutron-common.logrotate index c7527e5e5..d58ac6860 100644 --- a/trusty/debian/neutron-dhcp-agent.logrotate +++ b/trusty/debian/neutron-common.logrotate @@ -1,7 +1,8 @@ -/var/log/neutron/dhcp-agent.log { +/var/log/neutron/*.log { daily missingok compress delaycompress notifempty + copytruncate } diff --git a/trusty/debian/neutron-dhcp-agent.upstart b/trusty/debian/neutron-dhcp-agent.upstart index 3b08cd605..2cd3165be 100644 --- a/trusty/debian/neutron-dhcp-agent.upstart +++ b/trusty/debian/neutron-dhcp-agent.upstart @@ -19,4 +19,4 @@ pre-start script 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 +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 diff --git a/trusty/debian/neutron-l3-agent.logrotate b/trusty/debian/neutron-l3-agent.logrotate deleted file mode 100644 index 4420fbf89..000000000 --- a/trusty/debian/neutron-l3-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/l3-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-l3-agent.upstart b/trusty/debian/neutron-l3-agent.upstart index 0b69d1385..6a11fd5e2 100644 --- a/trusty/debian/neutron-l3-agent.upstart +++ b/trusty/debian/neutron-l3-agent.upstart @@ -19,6 +19,6 @@ pre-start script fi end script -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 diff --git a/trusty/debian/neutron-metadata-agent.logrotate b/trusty/debian/neutron-metadata-agent.logrotate deleted file mode 100644 index 986234563..000000000 --- a/trusty/debian/neutron-metadata-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/metadata-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-metadata-agent.upstart b/trusty/debian/neutron-metadata-agent.upstart index 5007b9b8c..2441edc58 100644 --- a/trusty/debian/neutron-metadata-agent.upstart +++ b/trusty/debian/neutron-metadata-agent.upstart @@ -14,6 +14,6 @@ pre-start 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 diff --git a/trusty/debian/neutron-metering-agent.upstart b/trusty/debian/neutron-metering-agent.upstart index 85e02702b..f5ecbee39 100644 --- a/trusty/debian/neutron-metering-agent.upstart +++ b/trusty/debian/neutron-metering-agent.upstart @@ -14,6 +14,6 @@ pre-start 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 diff --git a/trusty/debian/neutron-plugin-bigswitch-agent.logrotate b/trusty/debian/neutron-plugin-bigswitch-agent.logrotate deleted file mode 100644 index 6b259a4ad..000000000 --- a/trusty/debian/neutron-plugin-bigswitch-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/bigswitch-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-plugin-bigswitch-agent.upstart b/trusty/debian/neutron-plugin-bigswitch-agent.upstart index f29fa8dab..23f01ac12 100644 --- a/trusty/debian/neutron-plugin-bigswitch-agent.upstart +++ b/trusty/debian/neutron-plugin-bigswitch-agent.upstart @@ -14,7 +14,7 @@ pre-start 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 diff --git a/trusty/debian/neutron-plugin-ibm-agent.logrotate b/trusty/debian/neutron-plugin-ibm-agent.logrotate deleted file mode 100644 index 4708934c2..000000000 --- a/trusty/debian/neutron-plugin-ibm-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/ibm-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-plugin-ibm-agent.upstart b/trusty/debian/neutron-plugin-ibm-agent.upstart index f6576c1c1..4aaa5b3ea 100644 --- a/trusty/debian/neutron-plugin-ibm-agent.upstart +++ b/trusty/debian/neutron-plugin-ibm-agent.upstart @@ -14,7 +14,7 @@ pre-start 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 diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate b/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate deleted file mode 100644 index 5ad23eabb..000000000 --- a/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/linuxbridge-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.upstart b/trusty/debian/neutron-plugin-linuxbridge-agent.upstart index adec5f457..0d72fe8fe 100644 --- a/trusty/debian/neutron-plugin-linuxbridge-agent.upstart +++ b/trusty/debian/neutron-plugin-linuxbridge-agent.upstart @@ -14,4 +14,4 @@ pre-start 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 diff --git a/trusty/debian/neutron-plugin-mlnx-agent.logrotate b/trusty/debian/neutron-plugin-mlnx-agent.logrotate deleted file mode 100644 index b77653ba1..000000000 --- a/trusty/debian/neutron-plugin-mlnx-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/mlnx-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-plugin-mlnx-agent.upstart b/trusty/debian/neutron-plugin-mlnx-agent.upstart index 16fbe83b8..bedabc1c8 100644 --- a/trusty/debian/neutron-plugin-mlnx-agent.upstart +++ b/trusty/debian/neutron-plugin-mlnx-agent.upstart @@ -11,9 +11,9 @@ chdir /var/run pre-start script mkdir -p /var/run/neutron - chown neutron:root /var/run/neutron + chown neutron:neutron /var/run/neutron end script -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 diff --git a/trusty/debian/neutron-plugin-nec-agent.logrotate b/trusty/debian/neutron-plugin-nec-agent.logrotate deleted file mode 100644 index a2595afcb..000000000 --- a/trusty/debian/neutron-plugin-nec-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/nec-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-plugin-nec-agent.upstart b/trusty/debian/neutron-plugin-nec-agent.upstart index 7ddb9966d..de2b2f6c0 100644 --- a/trusty/debian/neutron-plugin-nec-agent.upstart +++ b/trusty/debian/neutron-plugin-nec-agent.upstart @@ -14,4 +14,4 @@ pre-start 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 diff --git a/trusty/debian/neutron-plugin-oneconvergence-agent.logrotate b/trusty/debian/neutron-plugin-oneconvergence-agent.logrotate deleted file mode 100644 index fd255b931..000000000 --- a/trusty/debian/neutron-plugin-oneconvergence-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/nvsd-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-plugin-oneconvergence-agent.upstart b/trusty/debian/neutron-plugin-oneconvergence-agent.upstart index f6ffc700f..99bfe4ba6 100644 --- a/trusty/debian/neutron-plugin-oneconvergence-agent.upstart +++ b/trusty/debian/neutron-plugin-oneconvergence-agent.upstart @@ -14,5 +14,5 @@ pre-start 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 diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.logrotate b/trusty/debian/neutron-plugin-openvswitch-agent.logrotate deleted file mode 100644 index 405377861..000000000 --- a/trusty/debian/neutron-plugin-openvswitch-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/openvswitch-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart b/trusty/debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart index b0d90f428..9651601f2 100644 --- a/trusty/debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart +++ b/trusty/debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart @@ -7,7 +7,7 @@ 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 -- \ + 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 diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.upstart b/trusty/debian/neutron-plugin-openvswitch-agent.upstart index 457f7ad59..6d8ba2582 100644 --- a/trusty/debian/neutron-plugin-openvswitch-agent.upstart +++ b/trusty/debian/neutron-plugin-openvswitch-agent.upstart @@ -14,4 +14,4 @@ pre-start 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 diff --git a/trusty/debian/neutron-server.logrotate b/trusty/debian/neutron-server.logrotate deleted file mode 100644 index bba78e5f1..000000000 --- a/trusty/debian/neutron-server.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/server.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/trusty/debian/neutron-server.upstart b/trusty/debian/neutron-server.upstart index aadcd33db..a81b055b0 100644 --- a/trusty/debian/neutron-server.upstart +++ b/trusty/debian/neutron-server.upstart @@ -17,7 +17,7 @@ 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 -- \ + 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 -- 2.32.3