From 3650bade146bf59a7828feda89ddb602dfea6047 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Sat, 25 Apr 2015 21:50:38 +0300 Subject: [PATCH] Add Neutron 2015.1 for Ubuntu 14.04 - Updated specs for 2015.1 - Updated dependencies according to global-requirements [0] [0] https://github.com/openstack/requirements/blob/stable/kilo/global-requirements.txt - updated tests Change-Id: I483159e824b89ada7240b738f055f35a23c5f77b --- debian/changelog | 907 ------------------ debian/compat | 1 - debian/neutron-lbaas-agent.install | 1 - debian/neutron-lbaas-agent.logrotate | 7 - debian/neutron-lbaas-agent.upstart | 17 - debian/neutron-plugin-cisco.install | 2 - debian/neutron-plugin-hyperv.install | 2 - debian/neutron-plugin-openflow-agent.install | 1 - .../neutron-plugin-openflow-agent.logrotate | 7 - debian/neutron-plugin-openflow-agent.upstart | 20 - debian/neutron-plugin-vmware.install | 3 - debian/neutron-plugin-vpn-agent.postinst | 15 - debian/neutron-plugin-vpn-agent.postrm | 15 - debian/neutron-plugin-vpn-agent.preinst | 15 - debian/neutron-vpn-agent.upstart | 24 - .../patches/disable-failing-cisco-test.patch | 25 - debian/patches/disable-udev-tests.patch | 29 - .../patches/fix-quantum-configuration.patch | 37 - debian/patches/series | 2 - debian/pydist-overrides | 3 - debian/tests/bigswitch-plugin | 19 - debian/tests/brocade-plugin | 19 - debian/tests/cisco-plugin | 19 - debian/tests/control | 6 - debian/tests/hyperv-plugin | 19 - debian/tests/midonet-plugin | 19 - debian/tests/nec-plugin | 19 - debian/tests/neutron-daemons | 14 - debian/tests/openvswitch-plugin | 18 - debian/tests/plumgrid-plugin | 19 - debian/tests/vmware-plugin | 19 - debian/watch | 3 - tests/runtests.sh | 116 ++- trusty/debian/changelog | 7 + trusty/debian/compat | 1 + {debian => trusty/debian}/control | 286 +++--- {debian => trusty/debian}/copyright | 0 .../cron.d/neutron-dhcp-agent-netns-cleanup | 0 .../cron.d/neutron-l3-agent-netns-cleanup | 0 .../cron.d/neutron-lbaas-agent-netns-cleanup | 0 .../debian/diff | 0 .../debian}/mans/neutron-linuxbridge-agent.8 | 0 .../debian}/mans/neutron-nec-agent.8 | 0 .../debian}/mans/neutron-openvswitch-agent.8 | 0 .../debian}/mans/neutron-rootwrap.8 | 0 trusty/debian/mans/neutron-ryu-agent.8 | 11 + .../debian}/mans/neutron-server.8 | 0 {debian => trusty/debian}/neutron-common.dirs | 1 + .../debian}/neutron-common.install | 7 +- .../debian}/neutron-common.postinst | 9 +- .../debian}/neutron-dhcp-agent.install | 0 .../debian}/neutron-dhcp-agent.logrotate | 0 .../debian}/neutron-dhcp-agent.upstart | 0 .../debian}/neutron-l3-agent.install | 0 .../debian}/neutron-l3-agent.logrotate | 0 .../debian}/neutron-l3-agent.upstart | 1 + .../debian}/neutron-metadata-agent.install | 0 .../debian}/neutron-metadata-agent.logrotate | 0 .../debian}/neutron-metadata-agent.upstart | 0 .../debian}/neutron-metering-agent.install | 0 .../debian}/neutron-metering-agent.upstart | 0 .../debian}/neutron-ovs-cleanup.upstart | 0 .../neutron-plugin-bigswitch-agent.install | 0 .../neutron-plugin-bigswitch-agent.logrotate | 0 .../neutron-plugin-bigswitch-agent.upstart | 0 .../debian}/neutron-plugin-bigswitch.install | 0 .../debian}/neutron-plugin-brocade.install | 0 trusty/debian/neutron-plugin-cisco.install | 3 + .../debian}/neutron-plugin-ibm-agent.install | 0 .../neutron-plugin-ibm-agent.logrotate | 0 .../debian}/neutron-plugin-ibm-agent.upstart | 0 .../debian}/neutron-plugin-ibm.install | 0 .../neutron-plugin-linuxbridge-agent.install | 0 ...neutron-plugin-linuxbridge-agent.logrotate | 0 .../neutron-plugin-linuxbridge-agent.manpages | 0 .../neutron-plugin-linuxbridge-agent.upstart | 0 .../neutron-plugin-linuxbridge.install | 0 .../debian}/neutron-plugin-metaplugin.install | 0 .../neutron-plugin-metering-agent.postinst | 0 .../neutron-plugin-metering-agent.postrm | 0 .../neutron-plugin-metering-agent.preinst | 0 .../debian}/neutron-plugin-midonet.install | 0 .../debian}/neutron-plugin-ml2.install | 0 .../debian}/neutron-plugin-mlnx-agent.install | 0 .../neutron-plugin-mlnx-agent.logrotate | 0 .../debian}/neutron-plugin-mlnx-agent.upstart | 0 .../debian}/neutron-plugin-mlnx.install | 0 .../debian}/neutron-plugin-nec-agent.install | 0 .../neutron-plugin-nec-agent.logrotate | 0 .../debian}/neutron-plugin-nec-agent.manpages | 0 .../debian}/neutron-plugin-nec-agent.upstart | 0 .../debian}/neutron-plugin-nec.install | 0 trusty/debian/neutron-plugin-nuage.install | 1 + ...eutron-plugin-oneconvergence-agent.install | 0 ...tron-plugin-oneconvergence-agent.logrotate | 0 ...eutron-plugin-oneconvergence-agent.upstart | 0 .../neutron-plugin-oneconvergence.install | 0 .../neutron-plugin-opencontrail.install | 1 + .../neutron-plugin-openvswitch-agent.install | 1 + ...neutron-plugin-openvswitch-agent.logrotate | 0 .../neutron-plugin-openvswitch-agent.manpages | 0 ...nvswitch-agent.neutron-ovs-cleanup.upstart | 0 .../neutron-plugin-openvswitch-agent.upstart | 0 .../neutron-plugin-openvswitch.install | 0 .../debian}/neutron-plugin-plumgrid.install | 0 .../debian/neutron-plugin-sriov-agent.install | 1 + trusty/debian/neutron-plugin-vmware.install | 1 + .../debian}/neutron-server.default | 0 .../debian}/neutron-server.install | 0 .../debian}/neutron-server.logrotate | 0 .../debian}/neutron-server.manpages | 0 .../debian}/neutron-server.upstart | 0 {debian => trusty/debian}/neutron_sudoers | 0 ...irements.txt-adjust-for-Ubuntu-14.04.patch | 27 + .../patches/fix-neutron-configuration.patch | 20 +- trusty/debian/patches/series | 3 + trusty/debian/patches/skip-iptest.patch | 11 + trusty/debian/pydist-overrides | 16 + .../debian}/python-neutron.install | 0 {debian => trusty/debian}/rules | 2 +- {debian => trusty/debian}/source/format | 0 trusty/debian/tests/bigswitch-plugin | 7 + trusty/debian/tests/brocade-plugin | 7 + trusty/debian/tests/cisco-plugin | 7 + trusty/debian/tests/control | 4 + .../debian}/tests/linuxbridge-plugin | 0 trusty/debian/tests/midonet-plugin | 7 + trusty/debian/tests/ml2-plugin | 7 + trusty/debian/tests/nec-plugin | 7 + trusty/debian/tests/neutron-agents | 36 + trusty/debian/tests/neutron-server | 28 + trusty/debian/tests/plumgrid-plugin | 9 + .../debian}/tests/python-neutron | 0 trusty/debian/tests/test-plugin | 29 + .../debian}/tests/test_import_neutron.py | 0 trusty/debian/tests/vmware-plugin | 7 + 136 files changed, 470 insertions(+), 1537 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/neutron-lbaas-agent.install delete mode 100644 debian/neutron-lbaas-agent.logrotate delete mode 100644 debian/neutron-lbaas-agent.upstart delete mode 100644 debian/neutron-plugin-cisco.install delete mode 100644 debian/neutron-plugin-hyperv.install delete mode 100644 debian/neutron-plugin-openflow-agent.install delete mode 100644 debian/neutron-plugin-openflow-agent.logrotate delete mode 100644 debian/neutron-plugin-openflow-agent.upstart delete mode 100644 debian/neutron-plugin-vmware.install delete mode 100644 debian/neutron-plugin-vpn-agent.postinst delete mode 100644 debian/neutron-plugin-vpn-agent.postrm delete mode 100644 debian/neutron-plugin-vpn-agent.preinst delete mode 100644 debian/neutron-vpn-agent.upstart delete mode 100644 debian/patches/disable-failing-cisco-test.patch delete mode 100644 debian/patches/disable-udev-tests.patch delete mode 100644 debian/patches/fix-quantum-configuration.patch delete mode 100644 debian/patches/series delete mode 100644 debian/pydist-overrides delete mode 100644 debian/tests/bigswitch-plugin delete mode 100644 debian/tests/brocade-plugin delete mode 100644 debian/tests/cisco-plugin delete mode 100644 debian/tests/control delete mode 100644 debian/tests/hyperv-plugin delete mode 100644 debian/tests/midonet-plugin delete mode 100644 debian/tests/nec-plugin delete mode 100644 debian/tests/neutron-daemons delete mode 100644 debian/tests/openvswitch-plugin delete mode 100644 debian/tests/plumgrid-plugin delete mode 100644 debian/tests/vmware-plugin delete mode 100644 debian/watch create mode 100644 trusty/debian/changelog create mode 100644 trusty/debian/compat rename {debian => trusty/debian}/control (87%) rename {debian => trusty/debian}/copyright (100%) rename {debian => trusty/debian}/cron.d/neutron-dhcp-agent-netns-cleanup (100%) rename {debian => trusty/debian}/cron.d/neutron-l3-agent-netns-cleanup (100%) rename {debian => trusty/debian}/cron.d/neutron-lbaas-agent-netns-cleanup (100%) rename debian/neutron-vpn-agent.install => trusty/debian/diff (100%) rename {debian => trusty/debian}/mans/neutron-linuxbridge-agent.8 (100%) rename {debian => trusty/debian}/mans/neutron-nec-agent.8 (100%) rename {debian => trusty/debian}/mans/neutron-openvswitch-agent.8 (100%) rename {debian => trusty/debian}/mans/neutron-rootwrap.8 (100%) create mode 100644 trusty/debian/mans/neutron-ryu-agent.8 rename {debian => trusty/debian}/mans/neutron-server.8 (100%) rename {debian => trusty/debian}/neutron-common.dirs (83%) rename {debian => trusty/debian}/neutron-common.install (89%) rename {debian => trusty/debian}/neutron-common.postinst (60%) rename {debian => trusty/debian}/neutron-dhcp-agent.install (100%) rename {debian => trusty/debian}/neutron-dhcp-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-dhcp-agent.upstart (100%) rename {debian => trusty/debian}/neutron-l3-agent.install (100%) rename {debian => trusty/debian}/neutron-l3-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-l3-agent.upstart (89%) rename {debian => trusty/debian}/neutron-metadata-agent.install (100%) rename {debian => trusty/debian}/neutron-metadata-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-metadata-agent.upstart (100%) rename {debian => trusty/debian}/neutron-metering-agent.install (100%) rename {debian => trusty/debian}/neutron-metering-agent.upstart (100%) rename {debian => trusty/debian}/neutron-ovs-cleanup.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-bigswitch-agent.install (100%) rename {debian => trusty/debian}/neutron-plugin-bigswitch-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-plugin-bigswitch-agent.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-bigswitch.install (100%) rename {debian => trusty/debian}/neutron-plugin-brocade.install (100%) create mode 100644 trusty/debian/neutron-plugin-cisco.install rename {debian => trusty/debian}/neutron-plugin-ibm-agent.install (100%) rename {debian => trusty/debian}/neutron-plugin-ibm-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-plugin-ibm-agent.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-ibm.install (100%) rename {debian => trusty/debian}/neutron-plugin-linuxbridge-agent.install (100%) rename {debian => trusty/debian}/neutron-plugin-linuxbridge-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-plugin-linuxbridge-agent.manpages (100%) rename {debian => trusty/debian}/neutron-plugin-linuxbridge-agent.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-linuxbridge.install (100%) rename {debian => trusty/debian}/neutron-plugin-metaplugin.install (100%) rename {debian => trusty/debian}/neutron-plugin-metering-agent.postinst (100%) rename {debian => trusty/debian}/neutron-plugin-metering-agent.postrm (100%) rename {debian => trusty/debian}/neutron-plugin-metering-agent.preinst (100%) rename {debian => trusty/debian}/neutron-plugin-midonet.install (100%) rename {debian => trusty/debian}/neutron-plugin-ml2.install (100%) rename {debian => trusty/debian}/neutron-plugin-mlnx-agent.install (100%) rename {debian => trusty/debian}/neutron-plugin-mlnx-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-plugin-mlnx-agent.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-mlnx.install (100%) rename {debian => trusty/debian}/neutron-plugin-nec-agent.install (100%) rename {debian => trusty/debian}/neutron-plugin-nec-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-plugin-nec-agent.manpages (100%) rename {debian => trusty/debian}/neutron-plugin-nec-agent.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-nec.install (100%) create mode 100644 trusty/debian/neutron-plugin-nuage.install rename {debian => trusty/debian}/neutron-plugin-oneconvergence-agent.install (100%) rename {debian => trusty/debian}/neutron-plugin-oneconvergence-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-plugin-oneconvergence-agent.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-oneconvergence.install (100%) create mode 100644 trusty/debian/neutron-plugin-opencontrail.install rename {debian => trusty/debian}/neutron-plugin-openvswitch-agent.install (75%) rename {debian => trusty/debian}/neutron-plugin-openvswitch-agent.logrotate (100%) rename {debian => trusty/debian}/neutron-plugin-openvswitch-agent.manpages (100%) rename {debian => trusty/debian}/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-openvswitch-agent.upstart (100%) rename {debian => trusty/debian}/neutron-plugin-openvswitch.install (100%) rename {debian => trusty/debian}/neutron-plugin-plumgrid.install (100%) create mode 100644 trusty/debian/neutron-plugin-sriov-agent.install create mode 100644 trusty/debian/neutron-plugin-vmware.install rename {debian => trusty/debian}/neutron-server.default (100%) rename {debian => trusty/debian}/neutron-server.install (100%) rename {debian => trusty/debian}/neutron-server.logrotate (100%) rename {debian => trusty/debian}/neutron-server.manpages (100%) rename {debian => trusty/debian}/neutron-server.upstart (100%) rename {debian => trusty/debian}/neutron_sudoers (100%) create mode 100644 trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch rename {debian => trusty/debian}/patches/fix-neutron-configuration.patch (60%) create mode 100644 trusty/debian/patches/series create mode 100644 trusty/debian/patches/skip-iptest.patch create mode 100644 trusty/debian/pydist-overrides rename {debian => trusty/debian}/python-neutron.install (100%) rename {debian => trusty/debian}/rules (92%) rename {debian => trusty/debian}/source/format (100%) create mode 100644 trusty/debian/tests/bigswitch-plugin create mode 100644 trusty/debian/tests/brocade-plugin create mode 100644 trusty/debian/tests/cisco-plugin create mode 100644 trusty/debian/tests/control rename {debian => trusty/debian}/tests/linuxbridge-plugin (100%) create mode 100644 trusty/debian/tests/midonet-plugin create mode 100644 trusty/debian/tests/ml2-plugin create mode 100644 trusty/debian/tests/nec-plugin create mode 100644 trusty/debian/tests/neutron-agents create mode 100644 trusty/debian/tests/neutron-server create mode 100644 trusty/debian/tests/plumgrid-plugin rename {debian => trusty/debian}/tests/python-neutron (100%) create mode 100755 trusty/debian/tests/test-plugin rename {debian => trusty/debian}/tests/test_import_neutron.py (100%) create mode 100644 trusty/debian/tests/vmware-plugin diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 9fdd72944..000000000 --- a/debian/changelog +++ /dev/null @@ -1,907 +0,0 @@ -neutron (1:2014.2~b2-0ubuntu1) utopic; urgency=medium - - * New upstream release. - * debian/patches/fix-neutron-configuration.patch: Refreshed - * debian/control: - - Removed python-d2to1 build dependency. - - Add python-hacking build dependency. - - Add python-oslo.messaging as a build dependency. - - Add python-oslo.db as a build dependency. - - -- Chuck Short Fri, 25 Jul 2014 11:06:46 -0400 - -neutron (1:2014.2~b1-0ubuntu3) utopic; urgency=medium - - * SECURITY UPDATE: specify /etc/neutron/rootwrap.conf for use with - nova-rootwrap - - CVE-2013-1068 (LP: #1185019) - - -- Chuck Short Wed, 18 Jun 2014 12:43:51 -0400 - -neutron (1:2014.2~b1-0ubuntu2) utopic; urgency=medium - - * debian/tests/neutron-daemons: Dont test neutron-lbaas since - it needs to be configured properly in order to run the tests. - (LP: #1240712) - - -- Chuck Short Fri, 13 Jun 2014 10:25:04 -0400 - -neutron (1:2014.2~b1-0ubuntu1) utopic; urgency=medium - - [ Chuck Short ] - * debian/control: Open up juno release - * debian/patches/fix-quantum-configuration.patch: Refreshed - * debian/patches/disable-udev-tests.patch: Refreshed - * debian/patches/disable-failing-metaplugin-tests.patch: Dropped - * debian/patches/skip-lb-test.patch: Dropped - * debian/patches/skip-ipv6-tests.patch: Dropped - * debian/control: Add pep8 as a dependency. - * debian/patches/use-concurrency.patch: Dropped - * debian/neutron-common.dirs: Add lock directory. - * debian/neutron-plugin-vmware.install: Dropped neutron-check-nvp-config. - * debian/rules: Remove last bits of quantum. - * debian/neutron-common.install: Add neutron-sanity-check. - - [ Adrien Cunin ] - * Renamed patch debian/patches/fix-{quantum,neutron}-configuration.patch - * Removed references to Quantum in debian/cron.d/*'s comments - * Removed debian/NEWS as it was only mentioning the now finished - quantum/neutron name transition - - -- Chuck Short Thu, 12 Jun 2014 15:10:36 -0400 - -neutron (1:2014.1-0ubuntu3) utopic; urgency=medium - - * Add allow-stderr autopkgtest restriction for the dpkg error spew. - - -- Martin Pitt Tue, 13 May 2014 09:37:40 +0200 - -neutron (1:2014.1-0ubuntu2) utopic; urgency=medium - - * Rebuild for sqlalchemy 0.9. - - -- Chuck Short Thu, 08 May 2014 11:24:37 -0500 - - -neutron (1:2014.1-0ubuntu1) trusty; urgency=medium - - [ Chuck Short ] - * New upstream release (LP: #1288245). - - -- James Page Thu, 17 Apr 2014 13:04:17 +0100 - -neutron (1:2014.1~rc2-0ubuntu4) trusty; urgency=medium - - * d/neutron-vpn-agent.upstart: Wait for neutron-ovs-cleanup service to - start if installed to ensure that Open vSwitch state is cleaned up - on reboot (LP: #1307208). - - -- James Page Mon, 14 Apr 2014 11:07:44 +0100 - -neutron (1:2014.1~rc2-0ubuntu3) trusty; urgency=medium - - * Fix the Breaks/Replaces from the previous version, as they were - accidentally added to the wrong package (and with the wrong versioning). - - -- Steve Langasek Thu, 10 Apr 2014 23:36:09 +0000 - -neutron (1:2014.1~rc2-0ubuntu2) trusty; urgency=medium - - * Ensure that VPN and L3 agents are not installed together (LP: #1303876): - - d/control: Add Conflicts on neutron-l3-agent to neutron-vpn-agent, - drop dependency from neutron-vpn-agent -> neutron-l3-agent. - - d/neutron-{common,vpn-agent,l3-agent}.install: Move configuration and - rootwrap filters to -common package for use by both agent types. - - d/control: Add appropriate Breaks/Replaces for config file moves. - - d/neutron-vpn-agent.upstart: Include fwaas_driver.ini on config file - path inline with l3-agent configuration. - - d/control: Align Depends of neutron-vpn-agent with neutron-l3-agent. - - -- James Page Thu, 10 Apr 2014 14:34:18 +0100 - -neutron (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium - - [ James Page ] - * d/neutron-plugin-oneconvergence-agent.upstart: Rename upstart - configuration to match package name (LP: #1301957). - * d/neutron-vpn-agent.install: Install missing vpnaas.filters for - rootwrap (LP: #1303876). - - [ Chuck Short ] - * New upstream release candidate (LP: #1288245). - - -- Chuck Short Wed, 09 Apr 2014 08:51:40 -0400 - -neutron (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium - - [ Chuck Short ] - * debian/rules: Run testr init before tests. - * debian/patches/disable-udev-tests.patch: Refresh. - * d/control,neutron-plugin-oneconvergence*: Add One Convergence plugin - and agent (LP: #1293632). - - [ James Page ] - * New upstream release candidate (LP: #1288696, #1291535). - * d/control,neutron-mlnx-plugin{-agent}.install: Split out Mellanox - plugin configuration from agent package (LP: #1255420). - * d/control,neutron-{plugin-}{vpn|metering}-agent.*: Drop -plugin from - metering and vpn agents (they are not plugins) and deal with associated - change in name of upstart configurations. - * d/neutron-l3-agent.{install,upstart}: Install fwaas_driver.ini with - l3-agent and add to config-file path in upstart configuration - (LP: #1298676). - * d/neutron-vpn-agent.upstart,control: Include l3_agent.ini on upstart - config-file path, add dependency on neutron-l3-agent (LP: #1298675). - - -- James Page Tue, 01 Apr 2014 16:22:54 +0100 - -neutron (1:2014.1~b3-0ubuntu1) trusty; urgency=medium - - [ Chuck Short ] - * New upstream release. - * debian/rules: Re-enabled tests. - * debian/patches/requirements.patch: Dropped no longer needed. - * debian/patches/sql-alchemy-0.8.3-compat.patch: Dropped no longer needed. - * debian/patches/bump-sqlalchemy-version.patch: Dropped no longer needed. - * debian/neutron-plugin-vmware.install: Install usr/bin/neutron-nsx-manage. - * debian/patches/use-concurrency.patch: Set default concurrency to 1. - - [ James Page ] - * d/control,neutron-plugin-ibm*: Add plugin and agent packages for IBM - SDN-VE. - * d/control,neutron-openflow-*: Add agent package for OpenFlow ML2 agent. - * d/control,neutron-plugin-bigswitch-agent*: Add agent package for - BigSwitch. - * d/neutron-plugin-mlnx-agent.{upstart,logrotate}: Correct log path - and add logrotate configuration (LP: #1284144). - - [ Corey Bryant ] - * Renamed Nicira NVP plugin to VMware NSX (LP: #1273877): - - debian/neutron-plugin-*.install: Update path and file for rename - - debian/tests/*-plugin: Replace nicira-plugin with vmware-plugin - - debian/control: - + Change neutron-plugin-nicira to transtional package - + Add neutron-plugin-vmware package which breaks/replaces - neutron-plugin-nicira package. - - -- James Page Fri, 07 Mar 2014 09:38:32 +0000 - -neutron (1:2014.1~b2-0ubuntu6) trusty; urgency=medium - - * debian/rules: Temporarily disable testsuite due to upstream breakage. - - -- Chuck Short Thu, 06 Feb 2014 08:33:08 -0500 - -neutron (1:2014.1~b2-0ubuntu5) trusty; urgency=medium - - * debian/patches/disable-udev-tests.patch: Skip more tests - because of udev failures. - * debian/patches/skip-ipv6-tests.patch: Skip tests that fail - on the buildds due to ipv6. - - -- Chuck Short Mon, 03 Feb 2014 09:02:45 -0500 - -neutron (1:2014.1~b2-0ubuntu4) trusty; urgency=medium - - * debian/rules: Really run_tests.sh. - - -- Chuck Short Thu, 30 Jan 2014 11:44:21 -0500 - -neutron (1:2014.1~b2-0ubuntu3) trusty; urgency=medium - - * debian/rules: Switch back to run_test.sh since locking - issues have been fixed. - - -- Chuck Short Thu, 30 Jan 2014 10:49:22 -0500 - -neutron (1:2014.1~b2-0ubuntu2) trusty; urgency=medium - - * debian/patches/skip-lb-test.patch: Skipped lb configuration - test. - - -- Chuck Short Mon, 27 Jan 2014 12:01:50 -0500 - -neutron (1:2014.1~b2-0ubuntu1) trusty; urgency=low - - [ James Page ] - * Switch to using Modular Layer 2 plugin by default: - - d/control,neutron-plugin-ml2.install: Add ML2 plugin package - (LP: #1243147). - - d/p/fix-quantum-configuration,d/control,d/neutron-server.default: - Switch to using the ML2 plugin by default. - - d/control,neutron-plugin-openvswitch-agent: - Use neutron-plugin-ml2 and configuration for openvswitch-agent. - * d/neutron-plugin-mlnx-agent.upstart: Reference correct configuration - file (LP: #1257732). - * Add neutron-ovs-cleanup upstart configuration for OVS plugin - (LP: #1249708): - - d/rules: Install new configuration in neutron-plugin-openvswitch-agent - package, don't restart on install/upgrade (only needed for reboots). - - d/neutron-plugin-openvswitch-agent.upstart: Ensure startup happens - after neutron-ovs-cleanup. - - d/neutron-{l3|dhcp}-agent.upstart: If neutron-ovs-cleanup job is - installed, wait for it to reach running state prior to starting - agents. - * d/control: Add versioned BD/Depends on python-psutil >= 0.6.1. - * d/p/requirements.patch: Drop upper version boundary for psutil for - compatibility with Trusty. - * d/p/requirements.patch: Lift upper boundary for WebOb to < 1.4. - * d/p/disable-failing-metaplugin-tests.patch: Disable metaplugin tests that - are currently failing. - * d/p/disable-ml2-notification-tests.patch: Dropped, tests now pass. - * d/rules: Fail package build on unit test failures. - * d/p/disable-failing-cisco-test.patch: Disable failing Cisco mechanism test. - * d/control,d/p/remove-jsonrpclib.patch: Add BD on python-jsonrpclib and drop - patch that excludes it from requirements.txt. - - [ Chuck Short ] - * New upstream release. - * debian/rules: Run testr directly - * debian/patches/sql-alchemy-0.8.3-compat.patch: Fix tests sqlalchemy 0.8.3 - compat. - * debian/neturon-nicira.install: Add usr/bin/neutron-check-nsx-config. - - -- Chuck Short Fri, 24 Jan 2014 09:17:12 -0500 - -neutron (1:2014.1~b1-0ubuntu1) trusty; urgency=low - - [ Chuck Short ] - * New upstream release. - * debian/control: open icehouse release. - - [ James Page ] - * debian/patches: Refresh patches against upstream master. - * debian/control: Drop quantum-* transitional packages, no longer needed. - - -- Chuck Short Thu, 05 Dec 2013 11:40:39 -0500 - -neutron (1:2013.2-0ubuntu1) saucy; urgency=low - - * New upstream release (LP: #1236462). - - -- Chuck Short Thu, 17 Oct 2013 10:52:39 -0400 - -neutron (1:2013.2~rc3-0ubuntu1) saucy; urgency=low - - * New upstream release candidate (LP: #1240665). - - -- Chuck Short Wed, 16 Oct 2013 15:37:02 -0400 - -neutron (1:2013.2~rc2-0ubuntu1) saucy; urgency=low - - * New upstream release candidate (LP: #1239156). - - -- James Page Sat, 12 Oct 2013 16:51:28 +0100 - -neutron (1:2013.2~rc1-0ubuntu2) saucy; urgency=low - - * d/tests/control,neutron-server: Limit neutron-server tests to core - neutron daemons to avoid tests failures for plugin agents which don't - start correctly without additional configuration. - - -- James Page Thu, 03 Oct 2013 23:05:05 +0100 - -neutron (1:2013.2~rc1-0ubuntu1) saucy; urgency=low - - [ Yolanda Robla ] - * debian/tests: added testing agents - - [ Chuck Short ] - * debian/patches/disable-udev-tests.patch: Refreshed. - * debian/patches/disable-ml2-notification-tests.patch: Refreshed. - * debian/control: - - Dropped python-setuptools-git python-netifaces, and python-nose from - build dependencies. - - Dropped python-configobj, python-gflags from binary dependencies. - - Added build python-requests python-six, and python-jinja2 build - dependencies. - - Added versioned dependencies for python-amqplib, - python-pbr, python-novaclient, python-cliff, - python-testtools, and python-eventlet. - - Bumped versioned depends for python-stevedore, pyhton-novaclient, - python-oslo.config, and testrepository - - [ James Page ] - * New upstream release candidate: - - d/patches: Refreshed. - * d/rules: unpatch/patch neutron.conf around test execution to ensure that - as many tests as possible actually pass. - - -- James Page Thu, 03 Oct 2013 15:18:04 +0100 - -neutron (1:2013.2~b3-0ubuntu6) saucy; urgency=low - - * debian/rules: Dont ftbfs the tests if they fail. - - -- Chuck Short Tue, 10 Sep 2013 20:37:18 -0400 - -neutron (1:2013.2~b3-0ubuntu5) saucy; urgency=low - - * debian/tests/neutron-daemons: Fix typo. - * debian/rules: FTBFS if testsuite fails. - - -- Chuck Short Tue, 10 Sep 2013 17:27:25 -0400 - -neutron (1:2013.2~b3-0ubuntu4) saucy; urgency=low - - * debian/patches/remove_jsonrpclib.patch: Remove jsonrpclib - its not needed other than the arista driver. - - -- Chuck Short Tue, 10 Sep 2013 15:19:22 -0400 - -neutron (1:2013.2~b3-0ubuntu3) saucy; urgency=low - - * debian/tests: Fixed autopkg tests. - - -- Chuck Short Tue, 10 Sep 2013 12:10:05 -0400 - -neutron (1:2013.2~b3-0ubuntu2) saucy; urgency=low - - * debian/control, debian/neutron-plugin-vpn-agent.install, - debian/neutron-plugin-vpn-agent.install: Add vpn agent. - * debian/control, debian/usr/bin/neutron-metering-agent.install, - debian/usr/bin/neutron-metering-agent.install: Add metering agent. - - -- Chuck Short Mon, 09 Sep 2013 22:35:59 -0400 - -neutron (1:2013.2~b3-0ubuntu1) saucy; urgency=low - - [ Chuck Short ] - * New upstream release. - * debian/patches/fix-quantum-configuration.patch: Refreshed. - * debian/patches/neutron-conf.patch: Dropped. - * debian/patches/ignore-quantum-binaries.patch: Dropped - * debian/control: Add python-babel as a build depends. - * debian/neutron-common.install: Add neutron-usage-audit binary. - * debian/rules: Pass the tests even if it fails, temporary measure - until we figure out why the tests fail. - - [ Adam Gandelman ] - * debian/rules: Limit testr concurrency to 1 CPU. - * debian/patches: Refresh. - - [ James Page ] - * d/*.upstart: Added respawn stanza (LP: #1170393), tidied - descriptions and rationalized stop on stanzas to be consistent. - * d/neutron-dhcp-agent.install: Drop neutron-dhcp-agent-dnsmasq-lease- - update inline with upstream. - * d/rules: Ignore deprecated quantum binaries when checking for - missing files. - * d/control: Update/add versioned depends for upgrades: - - python-anyjson >= 0.3.3 - - python-stevedore >= 0.9 - - python-oslo.config >= 1:1.2.0 - - python-keystoneclient >= 1:0.2.0 - * d/*: Wrap and sort. - - -- Chuck Short Mon, 09 Sep 2013 13:12:57 -0400 - -neutron (1:2013.2~b2-0ubuntu3) saucy; urgency=low - - * d/p/neutron-conf.patch: Cherry picked commit from upstream VCS which - fixes a number of 'quantum' references across all configuration files. - * d/neutron_sudoers: Remove typo to re-enable passwordless sudo for neutron. - * d/p/fix-quantum-conf.patch: Enable use of neutron-rootwrap by default, - fixup problem with use of /var/lib/quantum for keystone signing_dir. - - -- James Page Wed, 24 Jul 2013 16:09:08 +0100 - -neutron (1:2013.2~b2-0ubuntu2) saucy; urgency=low - - * d/neutron-server.upstart: Execute correct server binary, fixup - use of flags in /etc/default/neutron-server. - * d/p/bump-sqlalchemy-version.patch: Support SQLAlchemy >= 0.8 until - upstream catches up. - * Re-jig test disablement patches: - - d/p/disable-udev-tests.patch: Disable tests that use udev as it - is not always available. - - d/p/disable-ml2-notification-tests.patch: Disable failing ML2 plugin - tests pending further investigation. - * d/p/fix-quantum-configuration.patch: Remove rej and orig cruft, re-added - missing default core_plugin configuration. - * d/control: Drop pep8 from BD's, no longer required. - - -- James Page Wed, 24 Jul 2013 11:41:56 +0100 - -neutron (1:2013.2~b2-0ubuntu1) saucy; urgency=low - - [ Chuck Short ] - * New upstream version. - * debian/patches/fix-quantum-configuration.patch: Refreshed - * Renamed quantum -> neutron inline with upstream: - - debian/neutron*.install: Update paths and files for rename. - - debian/cron.d: Update for new neutron names. - - debian/control: - + Add transtional packages. - + Add breaks/replaces with previous versions of quantum. - * debian/patches/fix-ubuntu-tests.patch: Refreshed - * debian/patches/ignore-quantum-binaries.patch: Don't install quantum - binaries. - * Add new mlnx agent package. - - [ James Page ] - * d/control: Update VCS fields for new branch locations. - * d/NEWS: Let users know they need to migrate configuration manually as part - of the quantum->neutron rename. - * d/neutron-common.install: Include rootwrap for Xen dom0 installs. - - [ Adam Gandelman ] - * debian/control: Set minimum python-kombu version >= 2.5.12. - - -- Chuck Short Fri, 19 Jul 2013 12:11:18 -0400 - -quantum (1:2013.2~b1-0ubuntu2) saucy; urgency=low - - [ Adam Gandelman ] - * debian/control: - - Add version requirement to python-stevedore (>= 0.8), also add to - python-quantum depends. - - Add version requirement to python-fixtures (>= 0.3.12). - * debian/patches/*: Refreshed. - - [ Yolanda Robla ] - * debian/tests: added autopkg tests - - [Chuck Short] - * debian/patches/fix-ubuntu-tests.patch: Rediff to skip tests - that were randomly failing in the PPAS or locally. - - -- Chuck Short Wed, 19 Jun 2013 12:06:15 -0500 - -quantum (1:2013.2~b1-0ubuntu1) saucy; urgency=low - - * New upstream release. - * debian/patches/fix-quantum-configuration.patch: Refreshed - * debian/control: Add testrepository. - * debian/control: Add subunit. - * debian/control: Add python-d21o1 and python-pbr as build-depends. - * debian/control: Add python-stevedore. - - -- Chuck Short Fri, 31 May 2013 09:37:25 -0500 - -quantum (1:2013.1-0ubuntu2) raring; urgency=low - - * Fix invalid multi-line cron jobs (LP: #1170312): - - d/cron.d/*: Consolidate jobs into a single command line, set syntax - highlighting to type 'crontab'. - - -- James Page Mon, 22 Apr 2013 15:58:12 +0100 - -quantum (1:2013.1-0ubuntu1) raring; urgency=low - - * New upstream release. - - -- Chuck Short Thu, 04 Apr 2013 14:03:41 -0500 - -quantum (1:2013.1~rc2-0ubuntu1) raring; urgency=low - - * New upstream release. - - -- Chuck Short Tue, 26 Mar 2013 08:33:56 -0500 - -quantum (1:2013.1~rc1-0ubuntu1) raring; urgency=low - - [ Chuck Short ] - * debian/patches/fix-quantum-configuration.patch: Refreshed - * debian/control: Add python-testtools and python-fixtures a build-dep. - * debian/control: Drop python-gflags no longer needed. - * debian/control: Drop python-unittest2 no longer needed. - - [ James Page ] - * New upstream release candidate. - * d/watch: Update uversionmangle to deal with upstream versioning - changes, remove tarballs.openstack.org. - * d/rules: Disable PEP-8 tests until fixed upstream. - * d/control,quantum-plugin-midonet.install: Added plugin package for - Midonet. - * d/control,quantum-lbaas-*: Added Load Balancing as-a Service agent - package. - * d/control: Bumped Standards-Version, no changes. - * d/p/fix-quantum-configuration.patch: Added midonet sqlite path to - patch, fixed up linuxbridge path. - * d/p/fix-ubuntu-tests.patch: Re-added skipTest for linuxbridge tests - that attempt to setup udev monitors. - * d/quantum-metadata-agent.*: Refactor metadata-agent into separate - package and add Depends from quantum-l3-agent and quantum-dhcp-agent. - * d/quantum-plugin-nicira.install: Add quantum-check-nvp-config binary. - * d/control: Add iputils-arping to quantum-l3-agent Depends (LP: #1153066). - * d/control: python-oslo-config -> python-oslo.config. - * d/control: Bump python-quantumclient >= 1:2.2.0 inline with upstream. - - -- James Page Fri, 15 Mar 2013 09:37:28 +0000 - -quantum (2013.1.g3-0ubuntu1) raring; urgency=low - - [ Adam Gandelman ] - * debian/patches/fix-quantum-configuration.patch: Refreshed and update to - reflect new global root_wrap configuration defined only in - /etc/quantum/quantum.conf. - * debian/patches/fix-ubuntu-tests.patch: Refreshed, added skipTests for - linuxbridge tests that attempt to setup udev monitors. - * debian/{control, quantum-server.install}: Drop quantum-ns-metadata-proxy, - quantum-metadata-agent, quantum-debug from quantum-server package and set a - Break/Replaces on the last quantum-server package that shipped them. - (LP: #1112203) - * debian/{control, quantum-plugin-nec.install}: Drop rootwrap filters, - only install /w the agent. - * debian/control: Add Breaks/Replaces between quantum-plugin-nec and new - quantum-plugin-nec-agent. - - [ Yolanda Robla ] - * debian/patches: refreshed patches - - [ James Page ] - * d/p/fix-quantum-configuration.patch: Add root_wrap helper to AGENT - section of /etc/quantum/quantum.conf to support new global configuration. - * d/control,quantum-plugin-{bigswitch,brocade,plumgrid}.install: Add new - plugin packages for BigSwitch, Brocade, Hyper-V and PLUMgrid. - * d/p/fix-quantum-configuration.patch: Set sqlite location for new plugins. - * d/control,quantum-plugin-nec-agent.*: Add new plugin agent package for NEC. - * d/quantum-common.install: Added new binaries and common rootwrap.d config. - * d/control: Removed VCS fields, updated maintainer. - * Wrapped and sorted debian/*. - * d/control: Add BD on python-oslo-config. - * d/control: Add BD on python-netifaces to fix RYU unit tests. - - [ Chuck Short ] - * New upstream release. - - -- Chuck Short Fri, 22 Feb 2013 09:54:36 -0600 - -quantum (2013.1~g2-0ubuntu1) raring; urgency=low - - [ Chuck Short ] - * New upstream version. - * debian/patches/fix-quantum-configuration.patch: Refreshed. - - [ Yolanda Robla ] - * debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add - upstart configuration for Metadata Agent. - * debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy, - quantum-metadata-agent and metadata_agent.ini. - * debian/patches/fix-quantum-configuration.patch: Update rootwrap - configuration in metadata_agent.ini file. - * debian/changelog: Updated package version - * d/p/fix-quantum-configuration.patch: refresh patches - * debian/patches/fix-ubuntu-tests.patch: Refreshed. - * debian/control: added python-novaclient dependency - - [ James Page ] - * d/*.install: Install entry points from bin directory instead - of easy-install ones generated during the package build process - (LP: #1085038). - * d/control: Drop BD on python-dev-all; its not required. - * d/rules: Install multiple upstart configurations for quantum-l3-agent. - * d/control: Tidy package descriptions. - * d/*.postrm: Drop as debhelper will generate update-rc.d calls in - maintainer scripts if required. - * d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum - is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap* - is owned by root:root. - * d/*agent*.postinst: Dropped as permissions now correctly set in - quantum-common. - * d/patches/fix-quantum-configuration.patch: Re-add dropped fixes rootwrap and - sqlite defaults for all plugins. - * d/control: Added new BD on alembic (>= 0.4.1~), version python-mock >= 1.0b1. - - [ Maru Newby ] - * debian/control: Remove unnecessary openvswitch-vswitch dependency - from quantum-plugin-openvswitch (LP: #1076747). - - -- Yolanda Robla Tue, 22 Jan 2013 11:40:00 +0100 - -quantum (2013.1~g1-0ubuntu1) raring; urgency=low - - [ Adam Gandelman ] - * debian/patches/*: Refreshed for opening of Grizzly. - - [ Chuck Short ] - * New upstream release. - * debian/rules: FTFBS if there is missing binaries. - * debian/quantum-server.install: Add quantum-debug. - - -- Chuck Short Fri, 23 Nov 2012 09:43:14 -0600 - -quantum (2012.2-0ubuntu1) quantal; urgency=low - - [ Chuck Short ] - * New upstream release. - - [ Adam Gandelman ] - * debian/cron.d/quantum-{l3, dhcp]-agent-netns-cleanup: Schedule hourly - cleanups of leaked Quantum network namespsaces using the - quantum-netns-cleanup utility. - - -- Chuck Short Thu, 27 Sep 2012 13:19:33 -0500 - -quantum (2012.2~rc3-0ubuntu1) quantal; urgency=low - - * New upstream release. - - -- Chuck Short Wed, 26 Sep 2012 15:14:31 -0500 - -quantum (2012.2~rc2-0ubuntu1) quantal; urgency=low - - [ Adam Gandelman ] - * debian/quantum-server.{default, upstart}: Use default file to specify - path to plugin config, which is passed to quantum-server as - '--config-file' during startup. (LP: #1009294) - * debian/control: - - Remove quantum-server's dependency on 'quantum-plugin'. - - Specify >= 1:0.1.0.1-0ubuntu1 requirement for python-quantumclient. - - Add dnsmasq dependencies to quantum-dhcp-agent Depends. - - [ Chuck Short ] - * New upstream version. - * debian/patches/fix-ubuntu-tests.patch: Refreshed. - - -- Chuck Short Fri, 21 Sep 2012 13:01:18 -0500 - -quantum (2012.2~rc1-0ubuntu1) quantal; urgency=low - - [ Adam Gandelman ] - * debain/*.postrm: Fix argument-less calls to update-rc.d, redirect - to /dev/null. (LP: #1047560) - * debian/quantum-server.upstart: Invoke start-stop-daemon properly. - (LP: #1047404) - * debain/*.postrm, *.upstart: Ensure files are named for corresponding - agent package, not plugin package. - * debian/control: - - Group agents with plugins. - - Fix some copy/paste mistakes. - - Set dependencies between agents and corresponding plugins. - - Recommend quantum-plugin-openvswitch for quantum-server. - - Require the same version of quantum-common and python-quantum. - - Add quantum-netns-cleanup utility to quantum-common. - * debian/patches/fix-quantum-configuration.patch: Use correct database - for linuxbridge plugin, use OVS plugin by default, call quantum-rootwrap - correctly. (LP: #1048668) - * Fix all use of /usr/sbin, things should go in /usr/bin. - * Remove dhcp and l3 plugins, they are not actually plugins. - * Rename packages quantum-plugin-{l3, dhcp}-agent to - quantum-{l3, dhcp}-agent. - * debain/quantum-*-agent.upstart: Specify config files as a - parameter to --config-file, specify log files for all. - * debian/*.logrotate: Add logrotate configs for server and agents. - * Install quantum_sudoers with quantum-common, not quantum-server. - * Install rootwrap filters only with the packages that require them. - * debian/*-agent.upstart: Specify --config-file=/etc/quantum/quantum.conf - in addition to plugin-specific config. Specify log files for all agents. - * Allow group 'adm' read access to /var/log/quantum. - * debian/quantum-server.postinst: Drop, all has been moved to quantum-common. - * Add packaging for quantum-plugin-nec. - - [ Chuck Short ] - * New usptream release. - - -- Chuck Short Wed, 12 Sep 2012 13:41:20 -0500 - -quantum (2012.2~rc1~20120907.1154-0ubuntu1) quantal; urgency=low - - [ Adam Gandelman ] - * debian/control: Add missing python-keystone dependency. - * wrap-and-sort. - - [ Chuck Short ] - * debian/rules: - - Run testsuite on build. - - Use get-orig-source. - - Add python-amqplib, python-anyjson, python-httplib2, python-iso8601, - python-kombu, python-lxml, python-netadr, python-pyudev to build depends - and run time deps. - - Add python-mock, python-mox, and python-unitest2 to build deps. - - Add adduser as a dep to quantum-common. - * debian/control: Bump standards version to 3.9.3 - * debian/quantum-common.install: Add missing configuration files. - (LP: #988999) - * debian/quantum-plugin-linuxbridge.install: Make isntallable. - * Add manpages: gratitously ripped from debian. - * Fix up lintian warnings. (LP: #1025203), (LP: #1021921) - * Add metaplugin plugin. - * debian/patches/fix-namespace.patch: Dropped it was causing - python namespace issues. - (LP: #1045064) - * debian/*.upstart: - - Specify configuration file and log directory. - - Start on the right transition. - * debian/rules: - - Allow to disable testsuite. - - Dont fail if the testsuite fails. - * debian/patches/fix-quantum-configuration.patch: Fix configuration files. - * Add packaging for quantum-plugin-l3 and quantum-plugin-l3-agent - * Add packaging for quantum-plugin-dhcp-agent and quantum-plugin-dchp-agent - * debian/patches/fix-ubuntu-tests.patch: Fix testsuite failures. - - [ Soren Hansen ] - * Update debian/watch to account for symbolically named tarballs and - use newer URL. - * Add python-configobj as a build and run time dependency. Recently added - tests need it, and the Cisco plugin has needed it for a while. - * Fix Launchpad URLs in debian/watch. - - -- Chuck Short Fri, 07 Sep 2012 18:50:09 -0500 - -quantum (2012.2~f3-0ubuntu1~cloud0) precise-folsom; urgency=low - - * New upstream release. - - -- Chuck Short Fri, 17 Aug 2012 10:42:58 -0500 - -quantum (2012.2~f2-0ubuntu1~cloud0) precise-folsom; urgency=low - - [ Chuck Short ] - * New upstream release. - - [ Adam Gandelman ] - * debian/control, pydist-overrides: Add python-setuptools-git as a - Build-Depends, override as necessary. - - -- Chuck Short Fri, 06 Jul 2012 12:41:43 -0400 - -quantum (2012.2~f1-0ubuntu1~cloud0) precise-folsom; urgency=low - - [ Chuck Short ] - * New upstream release. - * Add missing upsart jobs for agents. - * Add sudo wrapper for quantum-rootwrap. (LP: #999142) - - [ Adam Gandelman ] - * debian/control: Fix spacing issues that cause mk-build-deps to fail. - * debian/quantum-server.install: Install new plugins config directory - instead of old .ini. - - -- Chuck Short Fri, 22 Jun 2012 12:49:23 -0400 - -quantum (2012.1-0ubuntu1) precise; urgency=low - - [Adam Gandelman] - * Open precise-folsom-proposed. - * Merge with current precise-folsom-folsom-proposed. - - [Chuck Short] - * New upstream release. - * Add missing upsart jobs for agents. - * Add sudo wrapper for quantum-rootwrap. (LP: #999142) - - -- Chuck Short Fri, 01 Jun 2012 10:26:49 -0400 - -quantum (2012.1-0ubuntu4) precise; urgency=low - - * debian/control: Add breaks replaces since files have moved around. - * Fix typo in upstart job. - - -- Chuck Short Mon, 23 Apr 2012 11:23:38 -0400 - -quantum (2012.1-0ubuntu3) precise; urgency=low - - * Split out agents into its own packages. (LP: #979192) - Thanks to Ghe Rivero. - * Add upstart job. (LP: #979190) - * Fix installation issues. (LP: #979159) - - -- Chuck Short Thu, 12 Apr 2012 13:39:06 -0400 - -quantum (2012.1-0ubuntu2) precise; urgency=low - - * Fix lintian warnings about empty packages. - - -- Chuck Short Fri, 06 Apr 2012 22:14:42 -0400 - -quantum (2012.1-0ubuntu1) precise; urgency=low - - * New upstream release. - - -- Chuck Short Thu, 05 Apr 2012 11:07:46 -0400 - -quantum (2012.1~rc2-0ubuntu1) precise; urgency=low - - * New upstream release: - - debian/quantum-plugin-{ryu,openvswitch}.install: - Install agents. - - -- Chuck Short Tue, 03 Apr 2012 20:29:11 -0400 - -quantum (2012.1~rc1-0ubuntu5) precise; urgency=low - - * Add missing files. (LP: #972019, LP: #971981, LP: #960731) - - -- Chuck Short Mon, 02 Apr 2012 20:29:29 -0400 - -quantum (2012.1~rc1-0ubuntu4) precise; urgency=low - - * Make quantum installable again (LP: #965551): - - debian/control: quantum-server depends on quantum-common. - - debian/control: Add python-quantumclient dependency. - - debian/upstart: Rename and update upstart job. - - Fix typos in debian/quantum-common.postinst. - - -- Chuck Short Fri, 30 Mar 2012 14:14:42 -0400 - -quantum (2012.1~rc1-0ubuntu3) precise; urgency=low - - * debian/control: Fix spelling typos. (LP: #960713) - - -- Paolo Rotolo Fri, 23 Mar 2012 21:35:54 +0100 - -quantum (2012.1~rc1-0ubuntu2) precise; urgency=low - - * debian/control: Fix spelling typos. - * debian/upstart: Fix typo in upstart job - * debian/control: Rename quantum to quantum-server again. - * debian/control: Fix empty plugins. - * debian/upstart: use start-stop-daemon in upstart job. - * debian/patches/fix-namespace.patch: Fix namespace patch - * debian/control: Update vcs info. (LP: #960690) - - -- Chuck Short Tue, 20 Mar 2012 13:58:24 -0400 - -quantum (2012.1~rc1~20120316.764-0ubuntu1) precise; urgency=low - - * New upstream release. - * debian/watch: Watch correct URL - - -- Adam Gandelman Fri, 16 Mar 2012 12:04:48 -0700 - -quantum (2012.1~e4-0ubuntu1) precise; urgency=low - - * New upstream release. - * debian/rules: Take in account the new build changes. - * debian/quantum-server.install: Install the right files due to - build changes. - * Client no longer is a part of quantum. - * debian/control: Add python-lxml - * Add ryu and niciria plugins. - * debian/rules: Run right tests script. - - -- Chuck Short Mon, 05 Mar 2012 09:47:22 -0500 - -quantum (2012.1~e2+git20120112-0ubuntu1) precise; urgency=low - - * New upstream release. - * debian/rules: - - Fix git snapshot creation. - - Fix running test suite during the build. - * debian/control: Add adduser for quantum-server. - * debian/quantum-plugin-{cisco,openvswitch}.install: Install - everything needed for the plugins. - - -- Chuck Short Thu, 12 Jan 2012 04:19:33 -0500 - -quantum (2012.1~e2-0ubuntu2) precise; urgency=low - - * debian/control: Build for architecture all. - - -- Chuck Short Mon, 19 Dec 2011 10:28:16 -0500 - -quantum (2012.1~e2-0ubuntu1) precise; urgency=low - - * New upstream release. - * debian/rules: Add alternate get-orig-source. - * debian/patches/fix-version.patch: Removed no longer needed. - * Fix lintian warnings. - - -- Chuck Short Fri, 16 Dec 2011 15:26:41 -0500 - -quantum (2012.1~e2~20111209.f8152-0ubuntu1) precise; urgency=low - - * New upstream release. - * debian/rules, debian/README.Source: Add support fo generating - new tarballs from git since tarball snapshots are not available - from jenkins yet. - * debian/rules: Update for new build system. - * debian/rules: Clean up files when running clean. - * debian/quantum-server.install, debian/quantum-server.dirs, - debian/quantum-plugins.*: Update for build system changes. - * debian/quantum-server.postinst: Fix user creation. - * debian/rules: Enable testsuite when building. - * Fix lintian errors (LP: #899352) - * debian/patches/fix-quantum-version.patch: Fix generating *.pyc - when trying to build. - - -- Chuck Short Fri, 09 Dec 2011 15:31:35 -0500 - -quantum (2012.1~e1-0ubuntu1) precise; urgency=low - - * Initial release. - - -- Chuck Short Fri, 18 Nov 2011 15:29:53 -0500 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb75d..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/neutron-lbaas-agent.install b/debian/neutron-lbaas-agent.install deleted file mode 100644 index 23968000b..000000000 --- a/debian/neutron-lbaas-agent.install +++ /dev/null @@ -1 +0,0 @@ -debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d diff --git a/debian/neutron-lbaas-agent.logrotate b/debian/neutron-lbaas-agent.logrotate deleted file mode 100644 index 5efb4dcd9..000000000 --- a/debian/neutron-lbaas-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/lbaas-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/debian/neutron-lbaas-agent.upstart b/debian/neutron-lbaas-agent.upstart deleted file mode 100644 index 19f847e52..000000000 --- a/debian/neutron-lbaas-agent.upstart +++ /dev/null @@ -1,17 +0,0 @@ -# vim:set ft=upstart ts=2 et: -description "Neutron LBaaS Agent" -author "Chuck Short " - -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 diff --git a/debian/neutron-plugin-cisco.install b/debian/neutron-plugin-cisco.install deleted file mode 100644 index ab1f247e5..000000000 --- a/debian/neutron-plugin-cisco.install +++ /dev/null @@ -1,2 +0,0 @@ -etc/neutron/plugins/cisco/* etc/neutron/plugins/cisco -usr/bin/neutron-cisco-cfg-agent usr/bin diff --git a/debian/neutron-plugin-hyperv.install b/debian/neutron-plugin-hyperv.install deleted file mode 100644 index 546708862..000000000 --- a/debian/neutron-plugin-hyperv.install +++ /dev/null @@ -1,2 +0,0 @@ -etc/neutron/plugins/hyperv/* etc/neutron/plugins/hyperv -usr/bin/neutron-hyperv-agent usr/bin diff --git a/debian/neutron-plugin-openflow-agent.install b/debian/neutron-plugin-openflow-agent.install deleted file mode 100644 index 9a57b1e89..000000000 --- a/debian/neutron-plugin-openflow-agent.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/neutron-ofagent-agent usr/bin diff --git a/debian/neutron-plugin-openflow-agent.logrotate b/debian/neutron-plugin-openflow-agent.logrotate deleted file mode 100644 index bb7a79901..000000000 --- a/debian/neutron-plugin-openflow-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/neutron/openflow-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/debian/neutron-plugin-openflow-agent.upstart b/debian/neutron-plugin-openflow-agent.upstart deleted file mode 100644 index 15c45d890..000000000 --- a/debian/neutron-plugin-openflow-agent.upstart +++ /dev/null @@ -1,20 +0,0 @@ -# vim:set ft=upstart ts=2 et: -description "Neutron OpenFlow Plugin Agent" -author "Chuck Short " - -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 diff --git a/debian/neutron-plugin-vmware.install b/debian/neutron-plugin-vmware.install deleted file mode 100644 index 36e4c01c4..000000000 --- a/debian/neutron-plugin-vmware.install +++ /dev/null @@ -1,3 +0,0 @@ -etc/neutron/plugins/vmware/* etc/neutron/plugins/vmware -usr/bin/neutron-check-nsx-config usr/bin -usr/bin/neutron-nsx-manage usr/bin diff --git a/debian/neutron-plugin-vpn-agent.postinst b/debian/neutron-plugin-vpn-agent.postinst deleted file mode 100644 index 5bbe40871..000000000 --- a/debian/neutron-plugin-vpn-agent.postinst +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-vpn-agent.conf \ - 1:2014.1~b3-0ubuntu2~ neutron-plugin-vpn-agent -- "$@" -fi - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/neutron-plugin-vpn-agent.postrm b/debian/neutron-plugin-vpn-agent.postrm deleted file mode 100644 index 5bbe40871..000000000 --- a/debian/neutron-plugin-vpn-agent.postrm +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-vpn-agent.conf \ - 1:2014.1~b3-0ubuntu2~ neutron-plugin-vpn-agent -- "$@" -fi - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/neutron-plugin-vpn-agent.preinst b/debian/neutron-plugin-vpn-agent.preinst deleted file mode 100644 index 5bbe40871..000000000 --- a/debian/neutron-plugin-vpn-agent.preinst +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - dpkg-maintscript-helper rm_conffile /etc/init/neutron-plugin-vpn-agent.conf \ - 1:2014.1~b3-0ubuntu2~ neutron-plugin-vpn-agent -- "$@" -fi - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/neutron-vpn-agent.upstart b/debian/neutron-vpn-agent.upstart deleted file mode 100644 index 4697efef5..000000000 --- a/debian/neutron-vpn-agent.upstart +++ /dev/null @@ -1,24 +0,0 @@ -# vim:set ft=upstart ts=2 et: -description "Neutron VPN Agent" -author "Chuck Short " - -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 --log-file=/var/log/neutron/vpn_agent.log diff --git a/debian/patches/disable-failing-cisco-test.patch b/debian/patches/disable-failing-cisco-test.patch deleted file mode 100644 index 6ef11e26e..000000000 --- a/debian/patches/disable-failing-cisco-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Skip failing cisco test - ====================================================================== - FAIL: neutron.tests.unit.ml2.drivers.test_cisco_mech.TestCiscoBasicGet.test_single_get_admin - neutron.tests.unit.ml2.drivers.test_cisco_mech.TestCiscoBasicGet.test_single_get_admin - ---------------------------------------------------------------------- - _StringException - - ---------------------------------------------------------------------- -Author: James Page -Forwarded: not-needed -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1262195 - ---- a/neutron/tests/unit/ml2/drivers/test_cisco_mech.py -+++ b/neutron/tests/unit/ml2/drivers/test_cisco_mech.py -@@ -147,8 +147,8 @@ class CiscoML2MechanismTestCase(test_db_ - - class TestCiscoBasicGet(CiscoML2MechanismTestCase, - test_db_plugin.TestBasicGet): -- -- pass -+ def test_single_get_admin(self): -+ pass - - - class TestCiscoV2HTTPResponse(CiscoML2MechanismTestCase, diff --git a/debian/patches/disable-udev-tests.patch b/debian/patches/disable-udev-tests.patch deleted file mode 100644 index 32bb099cf..000000000 --- a/debian/patches/disable-udev-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py -index c367710..09c3d46 100644 ---- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py -+++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py -@@ -48,6 +48,7 @@ class FakeIpDevice(object): - class TestLinuxBridge(base.BaseTestCase): - - def setUp(self): -+ self.skipTest("udev not consistently available in Ubuntu buildds") - super(TestLinuxBridge, self).setUp() - interface_mappings = {'physnet1': 'eth1'} - root_helper = cfg.CONF.AGENT.root_helper -@@ -96,6 +97,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase): - 'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff'] - - def setUp(self): -+ self.skipTest("udev not consistently available in Ubuntu buildds") - super(TestLinuxBridgeAgent, self).setUp() - # disable setting up periodic state reporting - cfg.CONF.set_override('report_interval', 0, 'AGENT') -@@ -218,6 +220,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase): - - class TestLinuxBridgeManager(base.BaseTestCase): - def setUp(self): -+ self.skipTest("udev not consistently available in Ubuntu buildds") - super(TestLinuxBridgeManager, self).setUp() - self.interface_mappings = {'physnet1': 'eth1'} - self.root_helper = cfg.CONF.AGENT.root_helper - diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch deleted file mode 100644 index 4b4780b7f..000000000 --- a/debian/patches/fix-quantum-configuration.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/etc/neutron.conf -+++ b/etc/neutron.conf -@@ -7,7 +7,7 @@ - - # Where to store Neutron state files. This directory must be writable by the - # user executing the agent. --# state_path = /var/lib/neutron -+state_path = /var/lib/neutron - - # Where to store lock files - lock_path = $state_path/lock -@@ -50,7 +50,7 @@ - # previous versions, the class name of a plugin can be specified instead of its - # entrypoint name. - # --# core_plugin = -+core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 - # Example: core_plugin = ml2 - - # (ListOpt) List of service plugin entrypoints to be loaded from the -@@ -490,6 +490,7 @@ - # root filter facility. - # Change to "sudo" to skip the filtering and just run the comand directly - # root_helper = sudo -+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf - - # =========== items for agent management extension ============= - # seconds between nodes reporting state to server; should be less than -@@ -512,7 +513,7 @@ - # connection = mysql://root:pass@127.0.0.1:3306/neutron - # Replace 127.0.0.1 above with the IP address of the database used by the - # main neutron server. (Leave it as is if the database runs on this host.) --# connection = sqlite:// -+connection = sqlite:////var/lib/neutron/neutron.sqlite - # NOTE: In deployment the [database] section and its connection attribute may - # be set in the corresponding core plugin '.ini' file. However, it is suggested - # to put the [database] section and its connection attribute in this diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 767b46cbe..000000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -fix-neutron-configuration.patch -disable-udev-tests.patch diff --git a/debian/pydist-overrides b/debian/pydist-overrides deleted file mode 100644 index 7b448d324..000000000 --- a/debian/pydist-overrides +++ /dev/null @@ -1,3 +0,0 @@ -quantum_server quantum-server -quantum_common quantum-common -setuptools-git diff --git a/debian/tests/bigswitch-plugin b/debian/tests/bigswitch-plugin deleted file mode 100644 index 07504152a..000000000 --- a/debian/tests/bigswitch-plugin +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -#------------------------- -# Testing bigswitch-plugin -#------------------------- -set -e -apt-get -y install neutron-plugin-bigswitch - -# update plugin path -sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/bigswitch\/restproxy\.ini\"/g' /etc/default/neutron-server -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.bigswitch\.plugin\.NeutronRestProxyV2/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-bigswitch - echo "OK" -else - echo "ERROR: BIGSWITCH PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-bigswitch - exit 1 -fi diff --git a/debian/tests/brocade-plugin b/debian/tests/brocade-plugin deleted file mode 100644 index 9b8725afe..000000000 --- a/debian/tests/brocade-plugin +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -#----------------------- -# Testing brocade-plugin -#----------------------- -set -e -apt-get -y install neutron-plugin-brocade - -# update plugin path -sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/brocade\/brocade\.ini\"/g' /etc/default/neutron-server -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.brocade\.NeutronPlugin\.BrocadePluginV2/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-brocade - echo "OK" -else - echo "ERROR: BROCADE PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-brocade - exit 1 -fi diff --git a/debian/tests/cisco-plugin b/debian/tests/cisco-plugin deleted file mode 100644 index 87062ef9c..000000000 --- a/debian/tests/cisco-plugin +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -#--------------------- -# Testing cisco-plugin -#--------------------- -set -e -apt-get -y install neutron-plugin-cisco - -# update plugin path -sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/cisco\/cisco_plugins\.ini\"/g' /etc/default/neutron-server -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.cisco\.network_plugin\.PluginV2/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-cisco - echo "OK" -else - echo "ERROR: CISCO PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-cisco - exit 1 -fi diff --git a/debian/tests/control b/debian/tests/control deleted file mode 100644 index 2de9b23d6..000000000 --- a/debian/tests/control +++ /dev/null @@ -1,6 +0,0 @@ -Tests: neutron-daemons python-neutron cisco-plugin nec-plugin bigswitch-plugin - hyperv-plugin brocade-plugin plumgrid-plugin vmware-plugin openvswitch-plugin - linuxbridge-plugin midonet-plugin -Depends: neutron-server, neutron-l3-agent, neutron-dhcp-agent, neutron-metadata-agent, - neutron-lbaas-agent, python-neutron, rabbitmq-server -Restrictions: needs-root allow-stderr diff --git a/debian/tests/hyperv-plugin b/debian/tests/hyperv-plugin deleted file mode 100644 index 5f31e6f13..000000000 --- a/debian/tests/hyperv-plugin +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -#---------------------- -# Testing hyperv-plugin -#---------------------- -set -e -apt-get -y install neutron-plugin-hyperv - -# update plugin path -sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/hyperv\/hyperv_neutron_plugin\.ini\"/g' /etc/default/neutron-server -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.hyperv\.hyperv_neutron_plugin\.HyperVNeutronPlugin/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-hyperv - echo "OK" -else - echo "ERROR: HYPERV PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-hyperv - exit 1 -fi diff --git a/debian/tests/midonet-plugin b/debian/tests/midonet-plugin deleted file mode 100644 index 18644c705..000000000 --- a/debian/tests/midonet-plugin +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -#----------------------- -# Testing midonet-plugin -#----------------------- -set -e -apt-get -y install neutron-plugin-midonet - -# update plugin path -sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/midonet\/midonet\.ini\"/g' /etc/default/neutron-server -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.midonet\.MidonetPluginV2/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-midonet - echo "OK" -else - echo "ERROR: MIDONET PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-midonet - exit 1 -fi diff --git a/debian/tests/nec-plugin b/debian/tests/nec-plugin deleted file mode 100644 index c656e083f..000000000 --- a/debian/tests/nec-plugin +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -#------------------- -# Testing nec-plugin -#------------------- -set -e -apt-get -y install neutron-plugin-nec - -# update plugin path -sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/nec\/nec\.ini\"/g' /etc/default/neutron-server -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nec\.nec_plugin\.NECPluginV2/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-nec - echo "OK" -else - echo "ERROR: NEC PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-nec - exit 1 -fi diff --git a/debian/tests/neutron-daemons b/debian/tests/neutron-daemons deleted file mode 100644 index 408d3d581..000000000 --- a/debian/tests/neutron-daemons +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -#----------------------- -# Testing neutron-daemon -#----------------------- -set -e -DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent') -for daemon in "${DAEMONS[@]}"; do - if pidof -x $daemon > /dev/null; then - echo "OK" - else - echo "ERROR: ${daemon} IS NOT RUNNING" - exit 1 - fi -done diff --git a/debian/tests/openvswitch-plugin b/debian/tests/openvswitch-plugin deleted file mode 100644 index a9bfb9be1..000000000 --- a/debian/tests/openvswitch-plugin +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -#--------------------------- -# Testing openvswitch-plugin -#--------------------------- -set -e -apt-get -y install neutron-plugin-openvswitch - -# update plugin path -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.openvswitch\.ovs_neutron_plugin\.OVSNeutronPluginV2/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-openvswitch - echo "OK" -else - echo "ERROR: OPENVSWITCH PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-openvswitch - exit 1 -fi diff --git a/debian/tests/plumgrid-plugin b/debian/tests/plumgrid-plugin deleted file mode 100644 index cf7311ac5..000000000 --- a/debian/tests/plumgrid-plugin +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -#------------------------ -# Testing plumgrid-plugin -#------------------------ -set -e -apt-get -y install neutron-plugin-plumgrid - -# update plugin path -sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/plumgrid\/plumgrid\.ini\"/g' /etc/default/neutron-server -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.plumgrid\.plumgrid_plugin\.plumgrid_plugin\.NeutronPluginPLUMgridV2/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-plumgrid - echo "OK" -else - echo "ERROR: PLUMGRID PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-plumgrid - exit 1 -fi diff --git a/debian/tests/vmware-plugin b/debian/tests/vmware-plugin deleted file mode 100644 index 86933cdc6..000000000 --- a/debian/tests/vmware-plugin +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -#---------------------- -# Testing vmware-plugin -#---------------------- -set -e -apt-get -y install neutron-plugin-vmware - -# update plugin path -sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/vmware\/nsx\.ini\"/g' /etc/default/neutron-server -sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nicira\.NeutronPlugin\.NvpPluginV2/g' /etc/neutron/neutron.conf -service neutron-server restart > /dev/null 2>&1 -if pidof -x neutron-server > /dev/null; then - apt-get -y remove --purge neutron-plugin-vmware - echo "OK" -else - echo "ERROR: VMWARE PLUGIN IS NOT RUNNING" - apt-get -y remove --purge neutron-plugin-vmware - exit 1 -fi diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 7ad7723bf..000000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ - https://launchpad.net/neutron/+download https://launchpad.net/neutron/.*/.*/.*/neutron-(.*)\.tar\.gz diff --git a/tests/runtests.sh b/tests/runtests.sh index 7d63238c8..340390c58 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -1,9 +1,11 @@ -#!/bin/bash -ex +#!/bin/bash +set -ex PACKAGE=$1 UBUNTU=false FAILURE=false FAILED_TESTS="" +SERVICE_STARTED=false PLATFORM=$(python -mplatform) TOKEN=$(openssl rand -hex 10) MYSQL_PASS=mysql_pass @@ -11,14 +13,7 @@ AUTH="--os-auth-url http://127.0.0.1:35357 --os-token $TOKEN --os-endpoint http: NEUTRON_AUTH="--os-username neutron --os-password neutron --os-tenant-name neutron --os-auth-url http://127.0.0.1:35357/v2.0" CORE_PLUGIN="neutron.plugins.ml2.plugin.Ml2Plugin" -if [[ $PLATFORM =~ Ubuntu ]] -then UBUNTU=true -else - #Tests for RPM packages are disabled - #until migration to CentOS 7 is completed - echo "RPM tests are temporarily disabled" - exit 0 -fi +if [[ $PLATFORM =~ Ubuntu ]]; then UBUNTU=true; fi if [ -z $PACKAGE ]; then echo "Package for testing is not specified"; exit 1; fi echo "127.0.10.1 $(hostname)" >> /etc/hosts @@ -28,13 +23,17 @@ 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 bridge-utils + 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 bridge-utils + #yum install -y openstack-keystone rabbitmq-server mysql-server MySQL-client python-oslo-utils + yum install -y openstack-keystone rabbitmq-server python-oslo-utils + #CentOS 7 temporary workaround + yum install -y http://dev.mysql.com/get/mysql-community-release-el7-5.noarch.rpm + yum install -y mysql-community-server mysql-community-client #Install some plugins because they are required for db-migration scripts (bug #1371184) #Ubuntu neutron-server package include them - yum install -y openstack-neutron-bigswitch openstack-neutron-brocade openstack-neutron-cisco openstack-neutron-hyperv openstack-neutron-vmware openstack-neutron-openvswitch \ - openstack-neutron-linuxbridge openstack-neutron-metaplugin openstack-neutron-mellanox openstack-neutron-nec openstack-neutron-nuage + #yum install -y openstack-neutron-bigswitch openstack-neutron-brocade openstack-neutron-cisco openstack-neutron-hyperv openstack-neutron-vmware openstack-neutron-openvswitch \ + # openstack-neutron-ryu openstack-neutron-linuxbridge openstack-neutron-metaplugin openstack-neutron-mellanox openstack-neutron-nec openstack-neutron-nuage fi } @@ -47,13 +46,31 @@ install_neutron_server () { fi } +setup_rabbitmq () { + #Setup firewall on CentOS 7 + if ! $UBUNTU ; then + firewall-cmd --permanent --add-port=5672/tcp + firewall-cmd --reload + setsebool -P nis_enabled 1 + fi + + restart_service rabbitmq-server + if [ $? -ne 0 ]; then + echo "RabbitMQ server failed to start" + cat /var/log/rabbitmq/startup_err + cat /var/log/rabbitmq/startup_log + fi +} + setup_database() { #Setup databases - service mysql restart || service mysqld restart + restart_service mysql if ! $UBUNTU then mysqladmin -u root password $MYSQL_PASS fi + mysql -uroot -p$MYSQL_PASS -Bse "drop database if exists keystone" + mysql -uroot -p$MYSQL_PASS -Bse "drop database if exists neutron" mysql -uroot -p$MYSQL_PASS -Bse "create database keystone" mysql -uroot -p$MYSQL_PASS -Bse "create database neutron" mysql -uroot -p$MYSQL_PASS -Bse "GRANT ALL PRIVILEGES ON neutron.* TO 'neutron'@'localhost' IDENTIFIED BY 'neutron'" @@ -81,7 +98,7 @@ EOF then service keystone restart else - service openstack-keystone start + systemctl restart openstack-keystone fi sleep 10 #Setup Neutron credentials @@ -123,8 +140,6 @@ root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf [database] connection = mysql://neutron:neutron@127.0.0.1/neutron?charset=utf8 [service_providers] -service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default -service_provider=VPN:openswan:neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default EOF cat > /etc/neutron/l3_agent.ini << EOF @@ -140,17 +155,7 @@ EOF fi touch /etc/neutron/plugin.ini - for i in {1..5} - do - service rabbitmq-server restart - if [ $? -eq 0 ]; then break; fi - echo "RabbitMQ server failed to start" - cat /var/log/rabbitmq/startup_err - cat /var/log/rabbitmq/startup_log - done - - #br-int is required for OVS agent - brctl addbr br-int + setup_rabbitmq } upgrade_neutron_db () { @@ -158,13 +163,14 @@ upgrade_neutron_db () { } start_neutron_server () { - service neutron-server restart + restart_service neutron-server # Sleep is to let Neutron server successfully reconnect to AMQP sleep 10 } try () { TEST_FUNCTION=$1 + SERVICE_STARTED=false for i in {1..5} do FAILURE=false @@ -178,6 +184,15 @@ try () { done } +restart_service () { + local SERVICE=$1 + if $UBUNTU; then + service $SERVICE restart + else + systemctl restart $SERVICE + fi +} + check_neutron_server() { #Execute tests neutron $NEUTRON_AUTH net-create mynet1 @@ -186,28 +201,33 @@ check_neutron_server() { } check_neutron_openvswitch () { - # Workaround for bug #1371184 if ! $UBUNTU then chown root:neutron /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini fi - if ! $UBUNTU - then - service openvswitch start - service neutron-openvswitch-agent start - else - service openvswitch-switch restart - service neutron-plugin-openvswitch-agent restart + + 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 + SERVICE_STARTED=true fi + sleep 10 STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Open vSwitch agent" | awk -F "|" '{print $5}' | tr -d " ") if [ "$STATUS" != ":-)" ]; then echo "OVS agent check failed"; FAILURE=true; fi } check_neutron_l3_agent () { - - service neutron-l3-agent restart + if ! $SERVICE_STARTED ; then + restart_service neutron-l3-agent + SERVICE_STARTED=true + fi #This sleep here and in other functions is intended to let the agent add information to the queue sleep 10 STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "L3 agent" | awk -F "|" '{print $5}' | tr -d " ") @@ -215,24 +235,30 @@ check_neutron_l3_agent () { } check_neutron_dhcp_agent () { - - service neutron-dhcp-agent restart + if ! $SERVICE_STARTED ; then + restart_service neutron-dhcp-agent + SERVICE_STARTED=true + fi sleep 10 STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "DHCP agent" | awk -F "|" '{print $5}' | tr -d " ") if [ "$STATUS" != ":-)" ]; then echo "DHCP agent check failed"; FAILURE=true; fi } check_neutron_metadata_agent () { - - service neutron-metadata-agent restart + if ! $SERVICE_STARTED ; then + restart_service neutron-metadata-agent + SERVICE_STARTED=true + fi sleep 10 STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metadata agent" | awk -F "|" '{print $5}' | tr -d " ") if [ "$STATUS" != ":-)" ]; then echo "Metadata agent check failed"; FAILURE=true; fi } check_neutron_metering_agent () { - - service neutron-metering-agent restart + if ! $SERVICE_STARTED ; then + restart_service neutron-metering-agent + SERVICE_STARTED=true + fi sleep 10 STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metering agent" | awk -F "|" '{print $5}' | tr -d " ") if [ "$STATUS" != ":-)" ]; then echo "Metering agent check failed"; FAILURE=true; fi diff --git a/trusty/debian/changelog b/trusty/debian/changelog new file mode 100644 index 000000000..af1f2fa85 --- /dev/null +++ b/trusty/debian/changelog @@ -0,0 +1,7 @@ +neutron (1:2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium + + * Updated specs for master + * Updated dependencies according to global-requirements [0] + [0] https://github.com/openstack/requirements/blob/stable/kilo/global-requirements.txt + + -- Sergey Kolekonov Sat, 25 Apr 2015 20:47:49 +0300 diff --git a/trusty/debian/compat b/trusty/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/trusty/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/trusty/debian/control similarity index 87% rename from debian/control rename to trusty/debian/control index c0f2f7d1b..a7dd8a8d0 100644 --- a/debian/control +++ b/trusty/debian/control @@ -1,59 +1,61 @@ Source: neutron Section: net Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Chuck Short -Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6) +Maintainer: MOS Neutron Team +Build-Depends: debhelper (>= 9), python-all (>= 2.7.1) Build-Depends-Indep: - alembic (>= 0.7.1), - pep8, - python-amqplib (>= 0.6.1), + alembic (>= 0.7.2), python-anyjson (>= 0.3.3), - python-babel, - python-cliff (>= 1.7.0), - python-configobj, - python-coverage, - python-hacking, - python-eventlet (>= 0.15.2), + python-babel (>= 1.3), + python-cliff (>= 1.10.0), + python-coverage (>= 3.6), + python-eventlet (>= 0.16.1), python-fixtures (>= 0.3.14), python-greenlet (>= 0.3.2), + python-hacking (>= 0.10.0), python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), - python-jinja2, + python-jinja2 (>= 2.6), python-jsonrpclib, - python-keystonemiddleware (>= 1.0.0), - python-keystoneclient (>= 1:0.11.1), - python-kombu (>= 2.5.12), - python-lxml (>= 2.3), + python-keystoneclient (>= 1:1.1.0), + python-keystonemiddleware (>= 1.5.0), python-mock (>= 1.0), - python-mox, - python-netaddr, - python-neutronclient (>= 1:2.3.6), - python-novaclient (>= 2.18.0), - python-oslo.config (>= 1.6.0), - python-oslo.messaging (>= 1.4.0), - python-oslo.db, + python-netaddr (>= 0.7.12), + python-neutronclient (>= 1:2.3.11), + python-novaclient (>= 1:2.22.0), + python-oslo-concurrency (>= 1.8.0), + python-oslo-config (>= 1:1.9.3), + python-oslo-context (>= 0.2.0), + python-oslo-db (>= 1.7.0), + python-oslo-i18n (>= 1.5.0), + python-oslo-log (>= 1.0.0), + python-oslo-messaging (>= 1.8.0), + python-oslo-middleware (>= 1.0.0), + python-oslo-rootwrap (>= 1.6.0), + python-oslo-serialization (>= 1.4.0), + python-oslo-utils (>= 1.4.0), + python-oslosphinx (>= 2.5.0), + python-oslotest (>= 1.5.1), python-paste, - python-pastedeploy, - python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), - python-psutil (>= 1.1.1), - python-pyudev, + python-pastedeploy (>= 1.5.0), + python-pbr (>= 0.10), python-requests (>= 2.2.0), - python-routes, + python-requests-mock (>= 0.6.0), + python-retrying (>= 1.2.3), + python-routes (>= 1.12.3), python-setuptools, python-simplejson, - python-six (>= 1.7.0), - python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 1.1.0), - python-testtools (>= 0.9.32), - python-webob, - python-webtest, - subunit, - testrepository ( >= 0.0.17) -XS-Python-Version: >= 2.6 -Standards-Version: 3.9.4 -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/juno/files -Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/neutron/juno + 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 +Standards-Version: 3.9.6 XS-Testsuite: autopkgtest Package: neutron-server @@ -85,6 +87,7 @@ Architecture: all Depends: adduser, python-neutron (= ${source:Version}), +# python-neutron-fwaas, ${misc:Depends}, ${python:Depends} Breaks: @@ -102,6 +105,7 @@ Description: Neutron is a virtual network service for Openstack - common 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 + python-pbr (>= 0.10), advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . @@ -215,28 +219,6 @@ Description: Neutron is a virtual network service for Openstack - BigSwitch plug . This package provides the BigSwitch plugin agent. -Package: neutron-plugin-hyperv -Architecture: all -Provides: neutron-plugin -Depends: - neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Breaks: quantum-plugin-hyperv ( << 1:2013.2~b2-0ubuntu1~ ) -Replaces: quantum-plugin-hyperv ( << 1:2013.2~b2-0ubuntu1~ ) -Description: Neutron is a virtual network service for Openstack - Hyper-V 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 Hyper-V plugin. - Package: neutron-plugin-brocade Architecture: all Provides: neutron-plugin @@ -338,8 +320,11 @@ Package: neutron-l3-agent Architecture: all Depends: iputils-arping, + keepalived, neutron-common (= ${source:Version}), neutron-metadata-agent (= ${source:Version}), +# python-neutron-fwaas, + radvd, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -402,66 +387,53 @@ Description: Neutron is a virtual network service for Openstack - metadata agent . This package provides the metadata proxy agent. -Package: neutron-lbaas-agent -Architecture: all -Depends: - haproxy, - neutron-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Breaks: quantum-lbaas-agent ( << 1:2013.2~b2-0ubuntu1~ ) -Replaces: quantum-lbass-agent ( << 1:2013.2~b2-0ubuntu1~ ) -Description: Neutron is a virtual network service for Openstack - LBaaS 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 Load Balancing as-a Service (LBaaS) agent. - Package: python-neutron Architecture: all Section: python Depends: - alembic (>= 0.7.1), - python-amqplib (>= 0.6.1), + alembic (>= 0.7.2), python-anyjson (>= 0.3.3), - python-argparse, - python-babel, - python-eventlet (>= 0.15.2), + python-babel (>= 1.3), + python-eventlet (>= 0.16.1), python-greenlet (>= 0.3.2), python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), - python-jinja2, - python-keystonemiddleware (>= 1.0.0), - python-keystoneclient (>= 1:0.11.1), - python-kombu (>= 2.5.12), + python-jinja2 (>= 2.6), + 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.6), - python-novaclient (>= 1:2.18.0), - python-oslo.config (>= 1:1.6.0), + python-neutronclient (>= 1:2.3.11), + python-novaclient (>= 1:2.22.0), + python-oslo-concurrency (>= 1.8.0), + python-oslo-config (>= 1:1.9.3), + python-oslo-context (>= 0.2.0), + python-oslo-db (>= 1.7.0), + python-oslo-i18n (>= 1.5.0), + python-oslo-log (>= 1.0.0), + python-oslo-messaging (>= 1.8.0), + python-oslo-middleware (>= 1.0.0), + python-oslo-rootwrap (>= 1.6.0), + python-oslo-serialization (>= 1.4.0), + python-oslo-utils (>= 1.4.0), python-paste, - python-pastedeploy(>= 1.5.0), - python-psutil (>= 1.1.1), + python-pastedeploy (>= 1.5.0), + python-pbr (>= 0.10), python-requests (>= 2.2.0), - python-oslo.rootwrap (>= 1.3.0), - python-routes, - python-six (>= 1.7.0), - python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 1.1.0), - python-webob, + python-retrying (>= 1.2.3), + python-routes (>= 1.12.3), + python-six (>= 1.9.0), + python-sqlalchemy (>= 0.9.7), + python-stevedore (>= 1.3.0), + python-webob (>= 1.2.3), ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Breaks: python-quantum ( << 1:2013.2~b2-0ubuntu1~ ) Replaces: python-quantum ( << 1:2013.2~b2-0ubuntu1~ ) -Description: Neutron is a virutal network service for Openstack - Python library +Description: Neutron is a virtual network service for Openstack - Python library 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 @@ -475,9 +447,10 @@ Description: Neutron is a virutal network service for Openstack - Python library Package: neutron-plugin-openvswitch Architecture: all -Provides: neutron-plugin +Section: oldlibs +Priority: extra Depends: - neutron-common (= ${source:Version}), + neutron-plugin-ml2, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -493,7 +466,8 @@ Description: Neutron is a virtual network service for Openstack - Open vSwitch p advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the Open vSwitch plugin. + This package is a transitional package to migrate openvswitch plugin + users to the Modular Layer 2 (ml2) plugin. Package: neutron-plugin-ml2 Architecture: all @@ -540,9 +514,10 @@ Description: Neutron is a virtual network service for Openstack - Open vSwitch p Package: neutron-plugin-linuxbridge Architecture: all -Provides: neutron-plugin +Section: oldlibs +Priority: extra Depends: - neutron-common (= ${source:Version}), + neutron-plugin-ml2, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -558,13 +533,14 @@ Description: Neutron is a virtual network service for Openstack - linuxbridge pl advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the linuxbridge plugin. + This package is a transitional package to migrate linuxbridge plugin + users to the Modular Layer 2 (ml2) plugin. Package: neutron-plugin-linuxbridge-agent Architecture: all Depends: bridge-utils, - neutron-plugin-linuxbridge (= ${source:Version}), + neutron-plugin-ml2 (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -647,19 +623,16 @@ Description: Neutron is a virtual network service for Openstack - Mellanox plugi . This package provides the Mellanox plugin agent. -Package: neutron-vpn-agent +Package: neutron-metering-agent Architecture: all Depends: - iputils-arping, neutron-common (= ${source:Version}), - neutron-metadata-agent (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ ) -Replaces: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ ) -Conflicts: neutron-l3-agent -Description: Neutron is a virtual network service for Openstack - VPN agent +Breaks: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Replaces: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ ) +Description: Neutron is a virtual network service for Openstack - metering 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 @@ -669,24 +642,23 @@ Description: Neutron is a virtual network service for Openstack - VPN agent advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the VPN agent, which also provides L3 agent support. + This package provides the metering agent. -Package: neutron-plugin-vpn-agent +Package: neutron-plugin-metering-agent Architecture: all -Depends: neutron-vpn-agent, ${misc:Depends} +Depends: neutron-metering-agent, ${misc:Depends} Description: transitional dummy package This is a transitional dummy package. It can safely be removed. -Package: neutron-metering-agent +Package: neutron-plugin-ibm Architecture: all +Provides: neutron-plugin Depends: neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ ) -Replaces: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ ) -Description: Neutron is a virtual network service for Openstack - metering agent +Description: Neutron is a virtual network service for Openstack - IBM SDN 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 @@ -696,22 +668,35 @@ Description: Neutron is a virtual network service for Openstack - metering agent advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the metering agent. + This package provides the IBM SDN plugin. -Package: neutron-plugin-metering-agent +Package: neutron-plugin-ibm-agent Architecture: all -Depends: neutron-metering-agent, ${misc:Depends} -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. +Depends: + neutron-plugin-ibm (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs: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 IBM agent. -Package: neutron-plugin-openflow-agent +Package: neutron-plugin-sriov-agent Architecture: all Depends: - neutron-plugin-ml2 (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - Openflow agent +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 @@ -721,9 +706,9 @@ Description: Neutron is a virtual network service for Openstack - Openflow agent advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the Openflow agent. + This package provides the Mellanox SR-IOV agent. -Package: neutron-plugin-ibm +Package: neutron-plugin-oneconvergence Architecture: all Provides: neutron-plugin Depends: @@ -731,7 +716,7 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - IBM SDN plugin +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 @@ -741,16 +726,16 @@ Description: Neutron is a virtual network service for Openstack - IBM SDN plugin advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the IBM SDN plugin. + This package provides the One Convergence plugin. -Package: neutron-plugin-ibm-agent +Package: neutron-plugin-oneconvergence-agent Architecture: all Depends: - neutron-plugin-ibm (= ${source:Version}), + neutron-plugin-oneconvergence (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - IBM agent +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 @@ -760,9 +745,9 @@ Description: Neutron is a virtual network service for Openstack - IBM agent advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the IBM agent. + This package provides the One Convergence agent. -Package: neutron-plugin-oneconvergence +Package: neutron-plugin-nuage Architecture: all Provides: neutron-plugin Depends: @@ -770,7 +755,7 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - One Convergence plugin +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 @@ -780,16 +765,17 @@ Description: Neutron is a virtual network service for Openstack - One Convergenc advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the One Convergence plugin. + This package provides the Nuage plugin. -Package: neutron-plugin-oneconvergence-agent +Package: neutron-plugin-opencontrail Architecture: all +Provides: neutron-plugin Depends: - neutron-plugin-oneconvergence (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Neutron is a virtual network service for Openstack - One Convergence agent +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 @@ -799,4 +785,4 @@ Description: Neutron is a virtual network service for Openstack - One Convergenc advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the One Convergence agent. + This package provides the OpenContail plugin. diff --git a/debian/copyright b/trusty/debian/copyright similarity index 100% rename from debian/copyright rename to trusty/debian/copyright diff --git a/debian/cron.d/neutron-dhcp-agent-netns-cleanup b/trusty/debian/cron.d/neutron-dhcp-agent-netns-cleanup similarity index 100% rename from debian/cron.d/neutron-dhcp-agent-netns-cleanup rename to trusty/debian/cron.d/neutron-dhcp-agent-netns-cleanup diff --git a/debian/cron.d/neutron-l3-agent-netns-cleanup b/trusty/debian/cron.d/neutron-l3-agent-netns-cleanup similarity index 100% rename from debian/cron.d/neutron-l3-agent-netns-cleanup rename to trusty/debian/cron.d/neutron-l3-agent-netns-cleanup diff --git a/debian/cron.d/neutron-lbaas-agent-netns-cleanup b/trusty/debian/cron.d/neutron-lbaas-agent-netns-cleanup similarity index 100% rename from debian/cron.d/neutron-lbaas-agent-netns-cleanup rename to trusty/debian/cron.d/neutron-lbaas-agent-netns-cleanup diff --git a/debian/neutron-vpn-agent.install b/trusty/debian/diff similarity index 100% rename from debian/neutron-vpn-agent.install rename to trusty/debian/diff diff --git a/debian/mans/neutron-linuxbridge-agent.8 b/trusty/debian/mans/neutron-linuxbridge-agent.8 similarity index 100% rename from debian/mans/neutron-linuxbridge-agent.8 rename to trusty/debian/mans/neutron-linuxbridge-agent.8 diff --git a/debian/mans/neutron-nec-agent.8 b/trusty/debian/mans/neutron-nec-agent.8 similarity index 100% rename from debian/mans/neutron-nec-agent.8 rename to trusty/debian/mans/neutron-nec-agent.8 diff --git a/debian/mans/neutron-openvswitch-agent.8 b/trusty/debian/mans/neutron-openvswitch-agent.8 similarity index 100% rename from debian/mans/neutron-openvswitch-agent.8 rename to trusty/debian/mans/neutron-openvswitch-agent.8 diff --git a/debian/mans/neutron-rootwrap.8 b/trusty/debian/mans/neutron-rootwrap.8 similarity index 100% rename from debian/mans/neutron-rootwrap.8 rename to trusty/debian/mans/neutron-rootwrap.8 diff --git a/trusty/debian/mans/neutron-ryu-agent.8 b/trusty/debian/mans/neutron-ryu-agent.8 new file mode 100644 index 000000000..8823f9d56 --- /dev/null +++ b/trusty/debian/mans/neutron-ryu-agent.8 @@ -0,0 +1,11 @@ +.TH neutron\-ryu\-agent 8 +.SH NAME +neutron\-ryu\-agent \- OpenStack Virtual network service \- ryu agent + +.SH SYNOPSIS +.B neutron\-ryu\-agent + +.SH DESCRIPTION +.B neutron\-ryu\-agent + +This man page is a stub. Please contribute. diff --git a/debian/mans/neutron-server.8 b/trusty/debian/mans/neutron-server.8 similarity index 100% rename from debian/mans/neutron-server.8 rename to trusty/debian/mans/neutron-server.8 diff --git a/debian/neutron-common.dirs b/trusty/debian/neutron-common.dirs similarity index 83% rename from debian/neutron-common.dirs rename to trusty/debian/neutron-common.dirs index 24f43e390..0daad4e51 100644 --- a/debian/neutron-common.dirs +++ b/trusty/debian/neutron-common.dirs @@ -4,3 +4,4 @@ var/lib/neutron/lock etc/neutron etc/neutron/rootwrap.d etc/neutron/plugins +etc/neutron/policy.d diff --git a/debian/neutron-common.install b/trusty/debian/neutron-common.install similarity index 89% rename from debian/neutron-common.install rename to trusty/debian/neutron-common.install index 83f327bbc..5d05579af 100644 --- a/debian/neutron-common.install +++ b/trusty/debian/neutron-common.install @@ -4,17 +4,18 @@ etc/api-paste.ini etc/neutron etc/l3_agent.ini etc/neutron etc/neutron.conf etc/neutron etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d +etc/neutron/rootwrap.d/ipset-firewall.filters etc/neutron/rootwrap.d etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d -etc/neutron/rootwrap.d/ipset-firewall.filters etc/neutron/rootwrap.d etc/policy.json etc/neutron etc/rootwrap.conf etc/neutron usr/bin/neutron-db-manage usr/bin usr/bin/neutron-debug usr/bin +usr/bin/neutron-keepalived-state-change usr/bin usr/bin/neutron-netns-cleanup usr/bin usr/bin/neutron-ovs-cleanup usr/bin usr/bin/neutron-rootwrap usr/bin +usr/bin/neutron-rootwrap-daemon usr/bin usr/bin/neutron-rootwrap-xen-dom0 usr/bin -usr/bin/neutron-usage-audit usr/bin usr/bin/neutron-sanity-check usr/bin -usr/bin/neutron-sriov-nic-agent usr/bin +usr/bin/neutron-usage-audit usr/bin diff --git a/debian/neutron-common.postinst b/trusty/debian/neutron-common.postinst similarity index 60% rename from debian/neutron-common.postinst rename to trusty/debian/neutron-common.postinst index b92b417f2..6de03ad3b 100644 --- a/debian/neutron-common.postinst +++ b/trusty/debian/neutron-common.postinst @@ -18,7 +18,14 @@ then chmod 0750 /var/log/neutron/ chown -R root:neutron /etc/neutron/ - chmod 0750 /etc/neutron/ + # NOTE(jamespage): In order to execute unit test in decomposed + # vendor drivers, /etc/neutron must be readable + # other than by root or neutron; limitation of + # access to neutron.conf is sufficient as this + # file contains access details for DB, keystone + # and message bus. + chmod 0755 /etc/neutron/ + chmod -f 0640 /etc/neutron/neutron.conf || : chown root:root /etc/neutron/rootwrap.conf chown -R root:root /etc/neutron/rootwrap.d chmod 0755 /etc/neutron/rootwrap.d diff --git a/debian/neutron-dhcp-agent.install b/trusty/debian/neutron-dhcp-agent.install similarity index 100% rename from debian/neutron-dhcp-agent.install rename to trusty/debian/neutron-dhcp-agent.install diff --git a/debian/neutron-dhcp-agent.logrotate b/trusty/debian/neutron-dhcp-agent.logrotate similarity index 100% rename from debian/neutron-dhcp-agent.logrotate rename to trusty/debian/neutron-dhcp-agent.logrotate diff --git a/debian/neutron-dhcp-agent.upstart b/trusty/debian/neutron-dhcp-agent.upstart similarity index 100% rename from debian/neutron-dhcp-agent.upstart rename to trusty/debian/neutron-dhcp-agent.upstart diff --git a/debian/neutron-l3-agent.install b/trusty/debian/neutron-l3-agent.install similarity index 100% rename from debian/neutron-l3-agent.install rename to trusty/debian/neutron-l3-agent.install diff --git a/debian/neutron-l3-agent.logrotate b/trusty/debian/neutron-l3-agent.logrotate similarity index 100% rename from debian/neutron-l3-agent.logrotate rename to trusty/debian/neutron-l3-agent.logrotate diff --git a/debian/neutron-l3-agent.upstart b/trusty/debian/neutron-l3-agent.upstart similarity index 89% rename from debian/neutron-l3-agent.upstart rename to trusty/debian/neutron-l3-agent.upstart index 4a358a5ca..35dd41288 100644 --- a/debian/neutron-l3-agent.upstart +++ b/trusty/debian/neutron-l3-agent.upstart @@ -22,3 +22,4 @@ 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 \ --log-file=/var/log/neutron/l3-agent.log +# --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log diff --git a/debian/neutron-metadata-agent.install b/trusty/debian/neutron-metadata-agent.install similarity index 100% rename from debian/neutron-metadata-agent.install rename to trusty/debian/neutron-metadata-agent.install diff --git a/debian/neutron-metadata-agent.logrotate b/trusty/debian/neutron-metadata-agent.logrotate similarity index 100% rename from debian/neutron-metadata-agent.logrotate rename to trusty/debian/neutron-metadata-agent.logrotate diff --git a/debian/neutron-metadata-agent.upstart b/trusty/debian/neutron-metadata-agent.upstart similarity index 100% rename from debian/neutron-metadata-agent.upstart rename to trusty/debian/neutron-metadata-agent.upstart diff --git a/debian/neutron-metering-agent.install b/trusty/debian/neutron-metering-agent.install similarity index 100% rename from debian/neutron-metering-agent.install rename to trusty/debian/neutron-metering-agent.install diff --git a/debian/neutron-metering-agent.upstart b/trusty/debian/neutron-metering-agent.upstart similarity index 100% rename from debian/neutron-metering-agent.upstart rename to trusty/debian/neutron-metering-agent.upstart diff --git a/debian/neutron-ovs-cleanup.upstart b/trusty/debian/neutron-ovs-cleanup.upstart similarity index 100% rename from debian/neutron-ovs-cleanup.upstart rename to trusty/debian/neutron-ovs-cleanup.upstart diff --git a/debian/neutron-plugin-bigswitch-agent.install b/trusty/debian/neutron-plugin-bigswitch-agent.install similarity index 100% rename from debian/neutron-plugin-bigswitch-agent.install rename to trusty/debian/neutron-plugin-bigswitch-agent.install diff --git a/debian/neutron-plugin-bigswitch-agent.logrotate b/trusty/debian/neutron-plugin-bigswitch-agent.logrotate similarity index 100% rename from debian/neutron-plugin-bigswitch-agent.logrotate rename to trusty/debian/neutron-plugin-bigswitch-agent.logrotate diff --git a/debian/neutron-plugin-bigswitch-agent.upstart b/trusty/debian/neutron-plugin-bigswitch-agent.upstart similarity index 100% rename from debian/neutron-plugin-bigswitch-agent.upstart rename to trusty/debian/neutron-plugin-bigswitch-agent.upstart diff --git a/debian/neutron-plugin-bigswitch.install b/trusty/debian/neutron-plugin-bigswitch.install similarity index 100% rename from debian/neutron-plugin-bigswitch.install rename to trusty/debian/neutron-plugin-bigswitch.install diff --git a/debian/neutron-plugin-brocade.install b/trusty/debian/neutron-plugin-brocade.install similarity index 100% rename from debian/neutron-plugin-brocade.install rename to trusty/debian/neutron-plugin-brocade.install diff --git a/trusty/debian/neutron-plugin-cisco.install b/trusty/debian/neutron-plugin-cisco.install new file mode 100644 index 000000000..d00f500f2 --- /dev/null +++ b/trusty/debian/neutron-plugin-cisco.install @@ -0,0 +1,3 @@ +etc/neutron/plugins/cisco/* etc/neutron/plugins/cisco +usr/bin/neutron-cisco-apic-service-agent +usr/bin/neutron-cisco-apic-host-agent diff --git a/debian/neutron-plugin-ibm-agent.install b/trusty/debian/neutron-plugin-ibm-agent.install similarity index 100% rename from debian/neutron-plugin-ibm-agent.install rename to trusty/debian/neutron-plugin-ibm-agent.install diff --git a/debian/neutron-plugin-ibm-agent.logrotate b/trusty/debian/neutron-plugin-ibm-agent.logrotate similarity index 100% rename from debian/neutron-plugin-ibm-agent.logrotate rename to trusty/debian/neutron-plugin-ibm-agent.logrotate diff --git a/debian/neutron-plugin-ibm-agent.upstart b/trusty/debian/neutron-plugin-ibm-agent.upstart similarity index 100% rename from debian/neutron-plugin-ibm-agent.upstart rename to trusty/debian/neutron-plugin-ibm-agent.upstart diff --git a/debian/neutron-plugin-ibm.install b/trusty/debian/neutron-plugin-ibm.install similarity index 100% rename from debian/neutron-plugin-ibm.install rename to trusty/debian/neutron-plugin-ibm.install diff --git a/debian/neutron-plugin-linuxbridge-agent.install b/trusty/debian/neutron-plugin-linuxbridge-agent.install similarity index 100% rename from debian/neutron-plugin-linuxbridge-agent.install rename to trusty/debian/neutron-plugin-linuxbridge-agent.install diff --git a/debian/neutron-plugin-linuxbridge-agent.logrotate b/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate similarity index 100% rename from debian/neutron-plugin-linuxbridge-agent.logrotate rename to trusty/debian/neutron-plugin-linuxbridge-agent.logrotate diff --git a/debian/neutron-plugin-linuxbridge-agent.manpages b/trusty/debian/neutron-plugin-linuxbridge-agent.manpages similarity index 100% rename from debian/neutron-plugin-linuxbridge-agent.manpages rename to trusty/debian/neutron-plugin-linuxbridge-agent.manpages diff --git a/debian/neutron-plugin-linuxbridge-agent.upstart b/trusty/debian/neutron-plugin-linuxbridge-agent.upstart similarity index 100% rename from debian/neutron-plugin-linuxbridge-agent.upstart rename to trusty/debian/neutron-plugin-linuxbridge-agent.upstart diff --git a/debian/neutron-plugin-linuxbridge.install b/trusty/debian/neutron-plugin-linuxbridge.install similarity index 100% rename from debian/neutron-plugin-linuxbridge.install rename to trusty/debian/neutron-plugin-linuxbridge.install diff --git a/debian/neutron-plugin-metaplugin.install b/trusty/debian/neutron-plugin-metaplugin.install similarity index 100% rename from debian/neutron-plugin-metaplugin.install rename to trusty/debian/neutron-plugin-metaplugin.install diff --git a/debian/neutron-plugin-metering-agent.postinst b/trusty/debian/neutron-plugin-metering-agent.postinst similarity index 100% rename from debian/neutron-plugin-metering-agent.postinst rename to trusty/debian/neutron-plugin-metering-agent.postinst diff --git a/debian/neutron-plugin-metering-agent.postrm b/trusty/debian/neutron-plugin-metering-agent.postrm similarity index 100% rename from debian/neutron-plugin-metering-agent.postrm rename to trusty/debian/neutron-plugin-metering-agent.postrm diff --git a/debian/neutron-plugin-metering-agent.preinst b/trusty/debian/neutron-plugin-metering-agent.preinst similarity index 100% rename from debian/neutron-plugin-metering-agent.preinst rename to trusty/debian/neutron-plugin-metering-agent.preinst diff --git a/debian/neutron-plugin-midonet.install b/trusty/debian/neutron-plugin-midonet.install similarity index 100% rename from debian/neutron-plugin-midonet.install rename to trusty/debian/neutron-plugin-midonet.install diff --git a/debian/neutron-plugin-ml2.install b/trusty/debian/neutron-plugin-ml2.install similarity index 100% rename from debian/neutron-plugin-ml2.install rename to trusty/debian/neutron-plugin-ml2.install diff --git a/debian/neutron-plugin-mlnx-agent.install b/trusty/debian/neutron-plugin-mlnx-agent.install similarity index 100% rename from debian/neutron-plugin-mlnx-agent.install rename to trusty/debian/neutron-plugin-mlnx-agent.install diff --git a/debian/neutron-plugin-mlnx-agent.logrotate b/trusty/debian/neutron-plugin-mlnx-agent.logrotate similarity index 100% rename from debian/neutron-plugin-mlnx-agent.logrotate rename to trusty/debian/neutron-plugin-mlnx-agent.logrotate diff --git a/debian/neutron-plugin-mlnx-agent.upstart b/trusty/debian/neutron-plugin-mlnx-agent.upstart similarity index 100% rename from debian/neutron-plugin-mlnx-agent.upstart rename to trusty/debian/neutron-plugin-mlnx-agent.upstart diff --git a/debian/neutron-plugin-mlnx.install b/trusty/debian/neutron-plugin-mlnx.install similarity index 100% rename from debian/neutron-plugin-mlnx.install rename to trusty/debian/neutron-plugin-mlnx.install diff --git a/debian/neutron-plugin-nec-agent.install b/trusty/debian/neutron-plugin-nec-agent.install similarity index 100% rename from debian/neutron-plugin-nec-agent.install rename to trusty/debian/neutron-plugin-nec-agent.install diff --git a/debian/neutron-plugin-nec-agent.logrotate b/trusty/debian/neutron-plugin-nec-agent.logrotate similarity index 100% rename from debian/neutron-plugin-nec-agent.logrotate rename to trusty/debian/neutron-plugin-nec-agent.logrotate diff --git a/debian/neutron-plugin-nec-agent.manpages b/trusty/debian/neutron-plugin-nec-agent.manpages similarity index 100% rename from debian/neutron-plugin-nec-agent.manpages rename to trusty/debian/neutron-plugin-nec-agent.manpages diff --git a/debian/neutron-plugin-nec-agent.upstart b/trusty/debian/neutron-plugin-nec-agent.upstart similarity index 100% rename from debian/neutron-plugin-nec-agent.upstart rename to trusty/debian/neutron-plugin-nec-agent.upstart diff --git a/debian/neutron-plugin-nec.install b/trusty/debian/neutron-plugin-nec.install similarity index 100% rename from debian/neutron-plugin-nec.install rename to trusty/debian/neutron-plugin-nec.install diff --git a/trusty/debian/neutron-plugin-nuage.install b/trusty/debian/neutron-plugin-nuage.install new file mode 100644 index 000000000..4c855c94d --- /dev/null +++ b/trusty/debian/neutron-plugin-nuage.install @@ -0,0 +1 @@ +etc/neutron/plugins/nuage/* etc/neutron/plugins/nuage diff --git a/debian/neutron-plugin-oneconvergence-agent.install b/trusty/debian/neutron-plugin-oneconvergence-agent.install similarity index 100% rename from debian/neutron-plugin-oneconvergence-agent.install rename to trusty/debian/neutron-plugin-oneconvergence-agent.install diff --git a/debian/neutron-plugin-oneconvergence-agent.logrotate b/trusty/debian/neutron-plugin-oneconvergence-agent.logrotate similarity index 100% rename from debian/neutron-plugin-oneconvergence-agent.logrotate rename to trusty/debian/neutron-plugin-oneconvergence-agent.logrotate diff --git a/debian/neutron-plugin-oneconvergence-agent.upstart b/trusty/debian/neutron-plugin-oneconvergence-agent.upstart similarity index 100% rename from debian/neutron-plugin-oneconvergence-agent.upstart rename to trusty/debian/neutron-plugin-oneconvergence-agent.upstart diff --git a/debian/neutron-plugin-oneconvergence.install b/trusty/debian/neutron-plugin-oneconvergence.install similarity index 100% rename from debian/neutron-plugin-oneconvergence.install rename to trusty/debian/neutron-plugin-oneconvergence.install diff --git a/trusty/debian/neutron-plugin-opencontrail.install b/trusty/debian/neutron-plugin-opencontrail.install new file mode 100644 index 000000000..f25eae59a --- /dev/null +++ b/trusty/debian/neutron-plugin-opencontrail.install @@ -0,0 +1 @@ +etc/neutron/plugins/opencontrail/* etc/neutron/plugins/opencontrail diff --git a/debian/neutron-plugin-openvswitch-agent.install b/trusty/debian/neutron-plugin-openvswitch-agent.install similarity index 75% rename from debian/neutron-plugin-openvswitch-agent.install rename to trusty/debian/neutron-plugin-openvswitch-agent.install index 9f499b80f..8832cb002 100644 --- a/debian/neutron-plugin-openvswitch-agent.install +++ b/trusty/debian/neutron-plugin-openvswitch-agent.install @@ -1,2 +1,3 @@ etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d usr/bin/neutron-openvswitch-agent usr/bin +usr/bin/neutron-ovsvapp-agent usr/bin diff --git a/debian/neutron-plugin-openvswitch-agent.logrotate b/trusty/debian/neutron-plugin-openvswitch-agent.logrotate similarity index 100% rename from debian/neutron-plugin-openvswitch-agent.logrotate rename to trusty/debian/neutron-plugin-openvswitch-agent.logrotate diff --git a/debian/neutron-plugin-openvswitch-agent.manpages b/trusty/debian/neutron-plugin-openvswitch-agent.manpages similarity index 100% rename from debian/neutron-plugin-openvswitch-agent.manpages rename to trusty/debian/neutron-plugin-openvswitch-agent.manpages diff --git a/debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart b/trusty/debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart similarity index 100% rename from debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart rename to trusty/debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/trusty/debian/neutron-plugin-openvswitch-agent.upstart similarity index 100% rename from debian/neutron-plugin-openvswitch-agent.upstart rename to trusty/debian/neutron-plugin-openvswitch-agent.upstart diff --git a/debian/neutron-plugin-openvswitch.install b/trusty/debian/neutron-plugin-openvswitch.install similarity index 100% rename from debian/neutron-plugin-openvswitch.install rename to trusty/debian/neutron-plugin-openvswitch.install diff --git a/debian/neutron-plugin-plumgrid.install b/trusty/debian/neutron-plugin-plumgrid.install similarity index 100% rename from debian/neutron-plugin-plumgrid.install rename to trusty/debian/neutron-plugin-plumgrid.install diff --git a/trusty/debian/neutron-plugin-sriov-agent.install b/trusty/debian/neutron-plugin-sriov-agent.install new file mode 100644 index 000000000..f922573c7 --- /dev/null +++ b/trusty/debian/neutron-plugin-sriov-agent.install @@ -0,0 +1 @@ +usr/bin/neutron-sriov-nic-agent usr/bin diff --git a/trusty/debian/neutron-plugin-vmware.install b/trusty/debian/neutron-plugin-vmware.install new file mode 100644 index 000000000..9af4bac6f --- /dev/null +++ b/trusty/debian/neutron-plugin-vmware.install @@ -0,0 +1 @@ +etc/neutron/plugins/vmware/* etc/neutron/plugins/vmware diff --git a/debian/neutron-server.default b/trusty/debian/neutron-server.default similarity index 100% rename from debian/neutron-server.default rename to trusty/debian/neutron-server.default diff --git a/debian/neutron-server.install b/trusty/debian/neutron-server.install similarity index 100% rename from debian/neutron-server.install rename to trusty/debian/neutron-server.install diff --git a/debian/neutron-server.logrotate b/trusty/debian/neutron-server.logrotate similarity index 100% rename from debian/neutron-server.logrotate rename to trusty/debian/neutron-server.logrotate diff --git a/debian/neutron-server.manpages b/trusty/debian/neutron-server.manpages similarity index 100% rename from debian/neutron-server.manpages rename to trusty/debian/neutron-server.manpages diff --git a/debian/neutron-server.upstart b/trusty/debian/neutron-server.upstart similarity index 100% rename from debian/neutron-server.upstart rename to trusty/debian/neutron-server.upstart diff --git a/debian/neutron_sudoers b/trusty/debian/neutron_sudoers similarity index 100% rename from debian/neutron_sudoers rename to trusty/debian/neutron_sudoers diff --git a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch new file mode 100644 index 000000000..25348652d --- /dev/null +++ b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch @@ -0,0 +1,27 @@ +From 660d40f27d8cb3f0e43975ee652a917d8180c6ad Mon Sep 17 00:00:00 2001 +From: Sergey Kolekonov +Date: Sat, 25 Apr 2015 21:35:49 +0300 +Subject: [PATCH] requirements.txt: adjust for Ubuntu 14.04 + +* Routes!=2.0 restriction is necessary only for running tests with python 3.x, + routes 2.0 work just fine with python 2.7 +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index 388120f..c264bbc 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -5,7 +5,7 @@ pbr>=0.6,!=0.7,<1.0 + + Paste + PasteDeploy>=1.5.0 +-Routes>=1.12.3,!=2.0 ++Routes>=1.12.3 + eventlet>=0.16.1,!=0.17.0 + greenlet>=0.3.2 + httplib2>=0.7.5 +-- +1.9.1 + diff --git a/debian/patches/fix-neutron-configuration.patch b/trusty/debian/patches/fix-neutron-configuration.patch similarity index 60% rename from debian/patches/fix-neutron-configuration.patch rename to trusty/debian/patches/fix-neutron-configuration.patch index c306a4039..0b1ec727a 100644 --- a/debian/patches/fix-neutron-configuration.patch +++ b/trusty/debian/patches/fix-neutron-configuration.patch @@ -1,5 +1,3 @@ -diff --git a/etc/neutron.conf b/etc/neutron.conf -index 0e61cf7..c5aca0f 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -60,7 +60,7 @@ lock_path = $state_path/lock @@ -11,21 +9,21 @@ index 0e61cf7..c5aca0f 100644 # Example: core_plugin = ml2 # (ListOpt) List of service plugin entrypoints to be loaded from the -@@ -548,7 +548,7 @@ lock_path = $state_path/lock +@@ -613,7 +613,7 @@ lock_path = $state_path/lock # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real # root filter facility. - # Change to "sudo" to skip the filtering and just run the comand directly + # Change to "sudo" to skip the filtering and just run the command directly -# root_helper = sudo +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf # Set to true to add comments to generated iptables rules that describe # each rule's purpose. (System must support the iptables comments module.) -@@ -575,7 +575,7 @@ admin_password = %SERVICE_PASSWORD% - # connection = mysql://root:pass@127.0.0.1:3306/neutron +@@ -650,7 +650,7 @@ admin_password = %SERVICE_PASSWORD% + [database] + # This line MUST be changed to actually run the plugin. + # Example: +-# connection = mysql://root:pass@127.0.0.1:3306/neutron ++connection = sqlite:////var/lib/neutron/neutron.sqlite # Replace 127.0.0.1 above with the IP address of the database used by the # main neutron server. (Leave it as is if the database runs on this host.) --# connection = sqlite:// -+connection = sqlite:////var/lib/neutron/neutron.sqlite - # NOTE: In deployment the [database] section and its connection attribute may - # be set in the corresponding core plugin '.ini' file. However, it is suggested - # to put the [database] section and its connection attribute in this + # connection = sqlite:// diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series new file mode 100644 index 000000000..f3134ef90 --- /dev/null +++ b/trusty/debian/patches/series @@ -0,0 +1,3 @@ +0001-requirements.txt-adjust-for-Ubuntu-14.04.patch +fix-neutron-configuration.patch +skip-iptest.patch diff --git a/trusty/debian/patches/skip-iptest.patch b/trusty/debian/patches/skip-iptest.patch new file mode 100644 index 000000000..6645e7e03 --- /dev/null +++ b/trusty/debian/patches/skip-iptest.patch @@ -0,0 +1,11 @@ +diff -Nuarp neutron-2015.1.0rc1.orig/neutron/tests/unit/agent/linux/test_ipset_manager.py neutron-2015.1.0rc1/neutron/tests/unit/agent/linux/test_ipset_manager.py +--- neutron-2015.1.0rc1.orig/neutron/tests/unit/agent/linux/test_ipset_manager.py 2015-04-09 14:53:03.000000000 -0400 ++++ neutron-2015.1.0rc1/neutron/tests/unit/agent/linux/test_ipset_manager.py 2015-04-11 15:51:19.917333947 -0400 +@@ -129,6 +129,7 @@ class IpsetManagerTestCase(BaseIpsetMana + self.verify_mock_calls() + + def test_set_members_adding_more_than_5(self): ++ self.skipTest('Skipped in Ubuntu buildds') + self.add_first_ip() + self.expect_set(FAKE_IPS) + self.ipset.set_members(TEST_SET_ID, ETHERTYPE, FAKE_IPS) diff --git a/trusty/debian/pydist-overrides b/trusty/debian/pydist-overrides new file mode 100644 index 000000000..eca0d3b6b --- /dev/null +++ b/trusty/debian/pydist-overrides @@ -0,0 +1,16 @@ +quantum_server quantum-server +quantum_common quantum-common +setuptools-git +oslo.context python-oslo-context +oslo.concurrency python-oslo-concurrency +oslo.config python-oslo-config +oslo.messaging python-oslo-messaging +oslo.vmware python-oslo-vmware +oslo.utils python-oslo-utils +oslo.serialization python-oslo-serialization +oslo.db python-oslo-db +oslo.i18n python-oslo-i18n +oslo.utils python-oslo-utils +oslo.rootwrap python-oslo-rootwrap +oslo.log python-oslo-log +oslo.middleware python-oslo-middleware diff --git a/debian/python-neutron.install b/trusty/debian/python-neutron.install similarity index 100% rename from debian/python-neutron.install rename to trusty/debian/python-neutron.install diff --git a/debian/rules b/trusty/debian/rules similarity index 92% rename from debian/rules rename to trusty/debian/rules index bfe201255..1bb4557a8 100755 --- a/debian/rules +++ b/trusty/debian/rules @@ -7,7 +7,7 @@ dh $@ --with python2 override_dh_install: - dh_install --fail-missing -X/usr/etc + dh_install --fail-missing -X/usr/etc -X/usr/bin/neutron-hyperv-agent override_dh_installinit: dh_installinit diff --git a/debian/source/format b/trusty/debian/source/format similarity index 100% rename from debian/source/format rename to trusty/debian/source/format diff --git a/trusty/debian/tests/bigswitch-plugin b/trusty/debian/tests/bigswitch-plugin new file mode 100644 index 000000000..8e16fcfcc --- /dev/null +++ b/trusty/debian/tests/bigswitch-plugin @@ -0,0 +1,7 @@ +#!/bin/bash +#------------------------- +# Testing bigswitch-plugin +#------------------------- +set -e + +$(dirname $0)/test-plugin neutron-plugin-bigswitch /etc/neutron/plugins/bigswitch/restproxy.ini bigswitch diff --git a/trusty/debian/tests/brocade-plugin b/trusty/debian/tests/brocade-plugin new file mode 100644 index 000000000..84e4809c6 --- /dev/null +++ b/trusty/debian/tests/brocade-plugin @@ -0,0 +1,7 @@ +#!/bin/bash +#----------------------- +# Testing brocade-plugin +#----------------------- +set -e + +$(dirname $0)/test-plugin neutron-plugin-brocade /etc/neutron/plugins/brocade/brocade.ini brocade diff --git a/trusty/debian/tests/cisco-plugin b/trusty/debian/tests/cisco-plugin new file mode 100644 index 000000000..a0b0bbf92 --- /dev/null +++ b/trusty/debian/tests/cisco-plugin @@ -0,0 +1,7 @@ +#!/bin/bash +#--------------------- +# Testing cisco-plugin +#--------------------- +set -e + +$(dirname $0)/test-plugin neutron-plugin-cisco /etc/neutron/plugins/cisco/cisco_plugins.ini cisco diff --git a/trusty/debian/tests/control b/trusty/debian/tests/control new file mode 100644 index 000000000..3f5460d77 --- /dev/null +++ b/trusty/debian/tests/control @@ -0,0 +1,4 @@ +Tests: neutron-server python-neutron cisco-plugin + ml2-plugin neutron-agents +Depends: neutron-server, rabbitmq-server, mysql-server, python-mysqldb +Restrictions: needs-root allow-stderr diff --git a/debian/tests/linuxbridge-plugin b/trusty/debian/tests/linuxbridge-plugin similarity index 100% rename from debian/tests/linuxbridge-plugin rename to trusty/debian/tests/linuxbridge-plugin diff --git a/trusty/debian/tests/midonet-plugin b/trusty/debian/tests/midonet-plugin new file mode 100644 index 000000000..33c3e14b0 --- /dev/null +++ b/trusty/debian/tests/midonet-plugin @@ -0,0 +1,7 @@ +#!/bin/bash +#----------------------- +# Testing midonet-plugin +#----------------------- +set -e + +$(dirname $0)/test-plugin neutron-plugin-midonet /etc/neutron/plugins/midonet/midonet.ini midonet diff --git a/trusty/debian/tests/ml2-plugin b/trusty/debian/tests/ml2-plugin new file mode 100644 index 000000000..e9badfedd --- /dev/null +++ b/trusty/debian/tests/ml2-plugin @@ -0,0 +1,7 @@ +#!/bin/bash +#--------------------------- +# Testing ml2-plugin +#--------------------------- +set -e + +$(dirname $0)/test-plugin neutron-plugin-ml2 /etc/neutron/plugins/ml2/ml2_conf.ini ml2 diff --git a/trusty/debian/tests/nec-plugin b/trusty/debian/tests/nec-plugin new file mode 100644 index 000000000..fd22cacc7 --- /dev/null +++ b/trusty/debian/tests/nec-plugin @@ -0,0 +1,7 @@ +#!/bin/bash +#------------------- +# Testing nec-plugin +#------------------- +set -e + +$(dirname $0)/test-plugin neutron-plugin-nec /etc/neutron/plugins/nec/nec.ini nec diff --git a/trusty/debian/tests/neutron-agents b/trusty/debian/tests/neutron-agents new file mode 100644 index 000000000..c8a449139 --- /dev/null +++ b/trusty/debian/tests/neutron-agents @@ -0,0 +1,36 @@ +#!/bin/bash +#----------------------- +# Testing neutron agents +#----------------------- +set -e + +PACKAGES="python-neutron-fwaas neutron-l3-agent neutron-dhcp-agent neutron-metadata-agent neutron-plugin-ml2" +apt-get -y install $PACKAGES + +# update plugin path +sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/ml2\/ml2_conf\.ini\"/g' /etc/default/neutron-server +sed -i 's/core_plugin = .*/core_plugin \= ml2/g' /etc/neutron/neutron.conf +# update interface drives +sed -i 's/# interface_driver =$/interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver/g' /etc/neutron/l3_agent.ini +sed -i 's/# interface_driver =$/interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver/g' /etc/neutron/dhcp_agent.ini + +service neutron-l3-agent restart +service neutron-dhcp-agent restart +service neutron-metadata-agent restart +service neutron-server restart + +sleep 5 + +DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent') +for daemon in "${DAEMONS[@]}"; do + if service $daemon status > /dev/null; then + echo "OK" + else + echo "ERROR: ${daemon} IS NOT RUNNING" + tail -100 /var/log/neutron/*.log + apt-get -y remove --purge $PACKAGES + exit 1 + fi +done + +apt-get -y remove --purge $PACKAGES diff --git a/trusty/debian/tests/neutron-server b/trusty/debian/tests/neutron-server new file mode 100644 index 000000000..c1c234294 --- /dev/null +++ b/trusty/debian/tests/neutron-server @@ -0,0 +1,28 @@ +#!/bin/bash +#----------------------- +# Testing neutron-server +#----------------------- +set -e + +mysql -u root << EOF +CREATE DATABASE neutron; +GRANT ALL PRIVILEGES ON neutron.* TO 'neutron'@'localhost' \ + IDENTIFIED BY 'changeme'; +GRANT ALL PRIVILEGES ON neutron.* TO 'neutron'@'%' \ + IDENTIFIED BY 'changeme'; +EOF + +sed -i -e 's!connection = sqlite.*!connection = mysql://neutron:changeme@localhost/neutron!g' /etc/neutron/neutron.conf +neutron-db-manage upgrade head +service neutron-server restart +sleep 5 + +DAEMONS=('neutron-server') +for daemon in "${DAEMONS[@]}"; do + if service $daemon status> /dev/null; then + echo "OK" + else + echo "ERROR: ${daemon} IS NOT RUNNING" + exit 1 + fi +done diff --git a/trusty/debian/tests/plumgrid-plugin b/trusty/debian/tests/plumgrid-plugin new file mode 100644 index 000000000..5028c671a --- /dev/null +++ b/trusty/debian/tests/plumgrid-plugin @@ -0,0 +1,9 @@ +#!/bin/bash +#------------------------ +# Testing plumgrid-plugin +#------------------------ +set -e + +# NOTE(jamespage): Disable due to missing (undocumented) dependencies + +$(dirname $0)/test-plugin neutron-plugin-plumgrid /etc/neutron/plugins/plumgrid/plumgrid.ini plumgrid diff --git a/debian/tests/python-neutron b/trusty/debian/tests/python-neutron similarity index 100% rename from debian/tests/python-neutron rename to trusty/debian/tests/python-neutron diff --git a/trusty/debian/tests/test-plugin b/trusty/debian/tests/test-plugin new file mode 100755 index 000000000..1dac269ca --- /dev/null +++ b/trusty/debian/tests/test-plugin @@ -0,0 +1,29 @@ +#!/bin/bash +#-------------- +# Test a plugin +#-------------- +set -e + +pkg=$1 +conf=$2 +plugin=$3 + +apt-get -y install $pkg + +# update plugin path and config +sed -i "s|NEUTRON_PLUGIN_CONFIG.*|NEUTRON_PLUGIN_CONFIG=\"$conf\"|g" /etc/default/neutron-server +sed -i "s/core_plugin = .*/core_plugin = $plugin/g" /etc/neutron/neutron.conf + +service neutron-server restart > /dev/null 2>&1 + +sleep 5 + +if service neutron-server status > /dev/null; then + apt-get -y remove --purge $pkg + echo "OK" +else + echo "ERROR: $pkg IS NOT RUNNING" + tail -50 /var/log/neutron/neutron-server.log + apt-get -y remove --purge $pkg + exit 1 +fi diff --git a/debian/tests/test_import_neutron.py b/trusty/debian/tests/test_import_neutron.py similarity index 100% rename from debian/tests/test_import_neutron.py rename to trusty/debian/tests/test_import_neutron.py diff --git a/trusty/debian/tests/vmware-plugin b/trusty/debian/tests/vmware-plugin new file mode 100644 index 000000000..c9618b2a6 --- /dev/null +++ b/trusty/debian/tests/vmware-plugin @@ -0,0 +1,7 @@ +#!/bin/bash +#---------------------- +# Testing vmware-plugin +#---------------------- +set -e + +$(dirname $0)/test-plugin neutron-plugin-vmware /etc/neutron/plugins/vmware/nsx.ini vmware -- 2.32.3