From: Dmitry Burmistrov Date: Thu, 26 Sep 2013 17:18:47 +0000 (+0400) Subject: Update DEB-specs to 2013.2 version X-Git-Tag: 2014.1~22 X-Git-Url: https://review.fuel-infra.org/gitweb?p=openstack-build%2Fneutron-build.git;a=commitdiff_plain;h=b8c751c0e66c4006e2ab2068726acb8cfa62a030 Update DEB-specs to 2013.2 version Change-Id: Idfd67c042e92a04779b72d272ddce78abca63d75 --- diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000000000..3b68606a3 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,8 @@ +neutron (1:2013.2~b2-0ubuntu1) saucy; urgency=low + + Quantum has been renamed to Neutron during the Havana development cycle. + + Please review changed configuration in /etc/quantum and apply to new + configuration files in /etc/neutron. + + -- James Page Thu, 18 Jul 2013 10:07:15 +0100 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..36f3a4377 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,602 @@ +neutron (1:2013.2~b3-0ubuntu6~cloud0) precise-havana; urgency=low + + * New upstream release for the Ubuntu Cloud Archive. + + -- Chuck Short Wed, 11 Sep 2013 11:04:37 -0400 + +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/control b/debian/control index cd66de395..5d9ed9b70 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: quantum +Source: neutron Section: net Priority: optional Maintainer: Ubuntu Developers @@ -6,547 +6,798 @@ XSBC-Original-Maintainer: Chuck Short Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6) Build-Depends-Indep: alembic (>= 0.4.1), - pep8, python-amqplib, - python-anyjson, + python-anyjson (>= 0.3.3), + python-babel, python-cliff, python-configobj, python-coverage, + python-d2to1, python-eventlet, python-fixtures (>= 0.3.12), python-httplib2, python-iso8601, - python-keystone, - python-kombu, + python-keystoneclient (>= 0.2.0), + python-kombu (>= 2.5.12), python-lxml, python-mock (>= 1.0b1), python-mox, python-netaddr, python-netifaces, + python-neutronclient (>= 2.2.3), python-nose, python-novaclient, - python-oslo.config, + python-oslo.config (>= 1:1.2.0), python-paste, python-pastedeploy, + python-pbr, python-pyudev, - python-quantumclient (>= 1:2.2.0), python-routes, python-setuptools, python-setuptools-git, python-simplejson, python-sqlalchemy, + python-stevedore (>= 0.9), python-testtools, python-webob, - python-webtest + python-webtest, + subunit, + testrepository ( >= 0.0.8) XS-Python-Version: >= 2.6 Standards-Version: 3.9.4 +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/havana/files +Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/neutron/havana +XS-Testsuite: autopkgtest -Package: quantum-server +Package: neutron-server Architecture: all Depends: adduser, - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Recommends: quantum-plugin-openvswitch -Description: Quantum is a virtual network service for Openstack - server - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-server ( << 1:2013.2~b2-0ubuntu1~ ) +Recommends: neutron-plugin-openvswitch +Description: Neutron is a virtual network service for Openstack - server + 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the Quantum server + This package provides the Neutron server -Package: quantum-common +Package: neutron-common Architecture: all Depends: adduser, - python-quantum (= ${source:Version}), + python-neutron (= ${source:Version}), ${misc:Depends}, ${python:Depends} -Breaks: quantum-server ( <= 2013.1~g2-0ubuntu1 ) -Replaces: quantum-server ( <= 2013.1~g2-0ubuntu1 ) -Description: Quantum is a virtual network service for Openstack - common - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-common ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - common + 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the common files. -Package: quantum-plugin-cisco +Package: neutron-plugin-cisco Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - Cisco plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-cisco ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-cisco ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - Cisco plugin + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the Cisco plugin. -Package: quantum-plugin-nec +Package: neutron-plugin-nec Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - NEC plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-nec ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-nec ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - NEC 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the NEC plugin. -Package: quantum-plugin-nec-agent +Package: neutron-plugin-nec-agent Architecture: all Depends: + neutron-common (= ${source:Version}), + neutron-plugin-nec, openvswitch-switch, - quantum-common (= ${source:Version}), - quantum-plugin-nec, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-plugin-nec ( <= 2013.1~g2-0ubuntu1 ) -Replaces: quantum-plugin-nec ( <= 2013.1~g2-0ubuntu1 ) -Description: Quantum is a virtual network service for Openstack - NEC plugin agent - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-nec-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-nec-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - NEC plugin agent + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the NEC plugin agent. -Package: quantum-plugin-bigswitch +Package: neutron-plugin-bigswitch Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - BigSwitch plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-bigswitch ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-bigswitch ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - BigSwitch plugin + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the BigSwitch plugin. -Package: quantum-plugin-hyperv +Package: neutron-plugin-hyperv Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - Hyper-V plugin - Quantum is a virtual network service for Openstack, and a part of +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, Quantum provides an API to + 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 Quantum API supports extensions to provide + 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: quantum-plugin-brocade +Package: neutron-plugin-brocade Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - Brocade plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-brocade ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-brocade ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - Brocade plugin + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the Brocade plugin. -Package: quantum-plugin-plumgrid +Package: neutron-plugin-plumgrid Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - PLUMgrid plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-plumgrid ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-plumgrid ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - PLUMgrid 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the PLUMgrid plugin. -Package: quantum-plugin-metaplugin +Package: neutron-plugin-metaplugin Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - Metaplugin plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-metaplugin ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-metaplugin ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - Metaplugin plugin + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the Metaplugin plugin. -Package: quantum-plugin-nicira +Package: neutron-plugin-nicira Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - Nicira plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - Nicira 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the Nicira NVP plugin -Package: quantum-l3-agent +Package: neutron-l3-agent Architecture: all Depends: - quantum-common (= ${source:Version}), - quantum-metadata-agent (= ${source:Version}), iputils-arping, + neutron-common (= ${source:Version}), + neutron-metadata-agent (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: - quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ), - quantum-server ( <= 2013.1~g2-0ubuntu1 ) -Replaces: - quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ), - quantum-server ( <= 2013.1~g2-0ubuntu1 ) -Description: Quantum is a virtual network service for Openstack - l3 agent - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-l3-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-l3-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - l3 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the layer 3 routing agent. -Package: quantum-dhcp-agent +Package: neutron-dhcp-agent Architecture: all Depends: dnsmasq-base, dnsmasq-utils, - quantum-common (= ${source:Version}), - quantum-metadata-agent (= ${source:Version}), + neutron-common (= ${source:Version}), + neutron-metadata-agent (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Description: Quantum is a virtual network service for Openstack - DHCP agent - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-dhcp-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-dhcp-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - DHCP 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the DHCP agent. -Package: quantum-metadata-agent +Package: neutron-metadata-agent Architecture: all Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-l3-agent (<= 2013.1.g3-0ubuntu1) -Replaces: quantum-l3-agent (<= 2013.1.g3-0ubuntu1) -Description: Quantum is a virtual network service for Openstack - metadata agent - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-metadata-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-metadata-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - metadata 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the metadata proxy agent. -Package: quantum-lbaas-agent +Package: neutron-lbaas-agent Architecture: all Depends: haproxy, - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Description: Quantum is a virtual network service for Openstack - LBaaS agent - Quantum is a virtual network service for Openstack, and a part of +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, Quantum provides an API to + 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 Quantum API supports extensions to provide + 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-quantum +Package: python-neutron Architecture: all Section: python Depends: python-amqplib, - python-anyjson, + python-anyjson (>= 0.3.3), python-configobj, python-eventlet, python-gflags, python-httplib2, python-iso8601, - python-keystone, - python-kombu, + python-keystoneclient (>= 0.2.0), + python-kombu (>= 2.5.12), python-lxml, python-netaddr, + python-neutronclient (>= 0.1.0.1-0ubuntu1), + python-oslo.config (>= 1:1.2.0), python-paste, python-pastedeploy, python-pyudev, - python-quantumclient (>= 1:0.1.0.1-0ubuntu1), python-routes, python-simplejson, python-sqlalchemy, + python-stevedore (>= 0.9), python-webob, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} -Description: Quantum is a virutal network service for Openstack - Python library - Quantum is a virtual network service for Openstack, and a part of +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 + 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the Python library. -Package: quantum-plugin-openvswitch +Package: neutron-plugin-openvswitch Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - Open vSwitch plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-openvswitch ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-openvswitch ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - Open vSwitch 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the Open vSwitch plugin. -Package: quantum-plugin-openvswitch-agent +Package: neutron-plugin-openvswitch-agent Architecture: all Depends: + neutron-common (= ${source:Version}), + neutron-plugin-openvswitch, openvswitch-switch, - quantum-common (= ${source:Version}), - quantum-plugin-openvswitch, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Description: Quantum is a virtual network service for Openstack - Open vSwitch plugin agent - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-openvswitch-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-openvswitch-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - Open vSwitch plugin agent + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the Open vSwitch plugin agent. -Package: quantum-plugin-linuxbridge +Package: neutron-plugin-linuxbridge Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - linuxbridge plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-linuxbridge ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-linuxbridge ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - linuxbridge 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the linuxbridge plugin. -Package: quantum-plugin-linuxbridge-agent +Package: neutron-plugin-linuxbridge-agent Architecture: all Depends: bridge-utils, - quantum-common (= ${source:Version}), - quantum-plugin-linuxbridge, + neutron-common (= ${source:Version}), + neutron-plugin-linuxbridge, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Description: Quantum is a virtual network service for Openstack - linuxbridge plugin agent - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-linuxbirdge-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-linuxbridge-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - linuxbridge plugin agent + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the linuxbridge plugin agent. -Package: quantum-plugin-ryu +Package: neutron-plugin-ryu Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - RYU plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-ryu ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-ryu ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - RYU 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, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the RYU plugin. -Package: quantum-plugin-ryu-agent +Package: neutron-plugin-ryu-agent Architecture: all Depends: - quantum-common (= ${source:Version}), - quantum-plugin-ryu, + neutron-common (= ${source:Version}), + neutron-plugin-ryu, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Breaks: - quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ), - quantum-server ( << 2012.1-0ubuntu3 ) -Replaces: - quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ), - quantum-server ( << 2012.1-0ubuntu3 ) -Description: Quantum is a virtual network service for Openstack - RYU plugin agent - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-ryu-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-ryu-agent ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - RYU plugin agent + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the RYU plugin agent. -Package: quantum-plugin-midonet +Package: neutron-plugin-midonet Architecture: all -Provides: quantum-plugin +Provides: neutron-plugin Depends: - quantum-common (= ${source:Version}), + neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Quantum is a virtual network service for Openstack - Midonet plugin - Quantum is a virtual network service for Openstack, and a part of +Breaks: quantum-plugin-midonet ( << 1:2013.2~b2-0ubuntu1~ ) +Replaces: quantum-plugin-midonet ( << 1:2013.2~b2-0ubuntu1~ ) +Description: Neutron is a virtual network service for Openstack - Midonet plugin + Neutron is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Quantum provides an API to + 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 Quantum API supports extensions to provide + from Nova VMs). The Neutron API supports extensions to provide advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . This package provides the Midonet plugin. + +Package: neutron-plugin-mlnx-agent +Architecture: all +Provides: neutron-plugin +Depends: + neutron-common (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - mlnx plugin agent + Neutron is a virtual network service for Openstack, and a part of + Netstack. Just like OpenStack Nova provides an API to dynamically + request and configure virtual servers, Neutron provides an API to + dynamically request and configure virtual networks. These networks + connect "interfaces" from other OpenStack services (e.g., virtual NICs + from Nova VMs). The Neutron API supports extensions to provide + advanced network capabilities (e.g., QoS, ACLs, network monitoring, + etc.) + . + This package provides the mlnx plugin agent. + +Package: neutron-plugin-vpn-agent +Architecture: all +Provides: neutron-plugin +Depends: + neutron-common (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - vpn 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 vpn plugin. + +Package: neutron-plugin-metering-agent +Architecture: all +Provides: neutron-plugin +Depends: + neutron-common (= ${source:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Neutron is a virtual network service for Openstack - metering 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 metering plugin. + +Package: quantum-server +Depends: neutron-server, ${misc:Depends} +Architecture: all +Section: oldlibs +description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-common +Depends: neutron-common, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-cisco +Depends: neutron-plugin-cisco, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-nec +Depends: neutron-plugin-nec, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-nec-agent +Depends: neutron-plugin-nec-agent, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-bigswitch +Depends: neutron-plugin-bigswitch, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-hyperv +Depends: neutron-plugin-hyperv, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-brocade +Depends: neutron-plugin-brocade, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-plumgrid +Depends: neutron-plugin-plumgrid, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-metaplugin +Depends: neutron-plugin-metaplugin, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-nicira +Depends: neutron-plugin-nicira, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-l3-agent +Depends: neutron-l3-agent, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-dhcp-agent +Depends: neutron-dhcp-agent, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-metadata-agent +Depends: neutron-metadata-agent, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-lbaas-agent +Depends: neutron-lbaas-agent, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: python-quantum +Depends: python-neutron, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-openvswitch +Depends: neutron-plugin-openvswitch, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-openvswitch-agent +Depends: neutron-plugin-openvswitch-agent, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-linuxbridge +Depends: neutron-plugin-linuxbridge, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-linuxbridge-agent +Depends: neutron-plugin-linuxbridge-agent, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-ryu +Depends: neutron-plugin-ryu, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-ryu-agent +Depends: neutron-plugin-ryu-agent, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: quantum-plugin-midonet +Depends: neutron-plugin-midonet, ${misc:Depends} +Architecture: all +Section: oldlibs +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. diff --git a/debian/copyright b/debian/copyright index 06381fdb8..b0fafc35f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://dep.debian.net/deps/dep5 -Upstream-Name: quantum -Source: http://github.com/openstack/quantum +Upstream-Name: neutron +Source: http://github.com/openstack/neutron Files: * Copyright: 2011 OpenStack, LLC. diff --git a/debian/cron.d/neutron-dhcp-agent-netns-cleanup b/debian/cron.d/neutron-dhcp-agent-netns-cleanup new file mode 100644 index 000000000..e1ee6e9cb --- /dev/null +++ b/debian/cron.d/neutron-dhcp-agent-netns-cleanup @@ -0,0 +1,4 @@ +# vim: set filetype=crontab: +# Periodically cleans Quantum's network namespaces on behalf of the Quantum +# DHCP agent. +30 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini >/dev/null 2>&1; fi diff --git a/debian/cron.d/neutron-l3-agent-netns-cleanup b/debian/cron.d/neutron-l3-agent-netns-cleanup new file mode 100644 index 000000000..3bd5a164b --- /dev/null +++ b/debian/cron.d/neutron-l3-agent-netns-cleanup @@ -0,0 +1,4 @@ +# vim: set filetype=crontab: +# Periodically cleans Quantum's network namespaces on behalf of the Quantum +# L3 agent. +0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini >/dev/null 2>&1; fi diff --git a/debian/cron.d/neutron-lbaas-agent-netns-cleanup b/debian/cron.d/neutron-lbaas-agent-netns-cleanup new file mode 100644 index 000000000..904c9105e --- /dev/null +++ b/debian/cron.d/neutron-lbaas-agent-netns-cleanup @@ -0,0 +1,4 @@ +# vim: set filetype=crontab: +# Periodically cleans Quantum's network namespaces on behalf of the Quantum +# L3 agent. +0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/lbaas_agent.ini >/dev/null 2>&1; fi diff --git a/debian/cron.d/quantum-dhcp-agent-netns-cleanup b/debian/cron.d/quantum-dhcp-agent-netns-cleanup deleted file mode 100644 index e2c72bb3d..000000000 --- a/debian/cron.d/quantum-dhcp-agent-netns-cleanup +++ /dev/null @@ -1,4 +0,0 @@ -# vim: set filetype=crontab: -# Periodically cleans Quantum's network namespaces on behalf of the Quantum -# DHCP agent. -30 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then /usr/bin/quantum-netns-cleanup --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/dhcp_agent.ini >/dev/null 2>&1; fi diff --git a/debian/cron.d/quantum-l3-agent-netns-cleanup b/debian/cron.d/quantum-l3-agent-netns-cleanup deleted file mode 100644 index edb18b611..000000000 --- a/debian/cron.d/quantum-l3-agent-netns-cleanup +++ /dev/null @@ -1,4 +0,0 @@ -# vim: set filetype=crontab: -# Periodically cleans Quantum's network namespaces on behalf of the Quantum -# L3 agent. -0 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then /usr/bin/quantum-netns-cleanup --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/l3_agent.ini >/dev/null 2>&1; fi diff --git a/debian/cron.d/quantum-lbaas-agent-netns-cleanup b/debian/cron.d/quantum-lbaas-agent-netns-cleanup deleted file mode 100644 index 799729cfc..000000000 --- a/debian/cron.d/quantum-lbaas-agent-netns-cleanup +++ /dev/null @@ -1,4 +0,0 @@ -# vim: set filetype=crontab: -# Periodically cleans Quantum's network namespaces on behalf of the Quantum -# L3 agent. -0 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then /usr/bin/quantum-netns-cleanup --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/lbaas_agent.ini >/dev/null 2>&1; fi diff --git a/debian/mans/neutron-linuxbridge-agent.8 b/debian/mans/neutron-linuxbridge-agent.8 new file mode 100644 index 000000000..4d9ed2e84 --- /dev/null +++ b/debian/mans/neutron-linuxbridge-agent.8 @@ -0,0 +1,11 @@ +.TH neutron\-linuxbridge\-agent 8 +.SH NAME +neutron\-linuxbridge\-agent \- OpenStack Virtual network service \- linuxbridge agent + +.SH SYNOPSIS +.B neutron\-linuxbridge\-agent + +.SH DESCRIPTION +.B neutron\-linuxbridge\-agent + +This man page is a stub. Please contribute. diff --git a/debian/mans/neutron-nec-agent.8 b/debian/mans/neutron-nec-agent.8 new file mode 100644 index 000000000..be78cd805 --- /dev/null +++ b/debian/mans/neutron-nec-agent.8 @@ -0,0 +1,11 @@ +.TH neutron\-nec\-agent 8 +.SH NAME +neutron\-nec\-agent \- OpenStack Virtual network service \- nec agent + +.SH SYNOPSIS +.B neutron\-nec\-agent + +.SH DESCRIPTION +.B neutron\-nec\-agent + +This man page is a stub. Please contribute. diff --git a/debian/mans/neutron-openvswitch-agent.8 b/debian/mans/neutron-openvswitch-agent.8 new file mode 100644 index 000000000..7fd851948 --- /dev/null +++ b/debian/mans/neutron-openvswitch-agent.8 @@ -0,0 +1,11 @@ +.TH neutron\-openvswitch\-agent 8 +.SH NAME +neutron\-openvswitch\-agent \- OpenStack Virtual network service \- openvswitch agent + +.SH SYNOPSIS +.B neutron\-openvswitch\-agent + +.SH DESCRIPTION +.B neutron\-openvswitch\-agent + +This man page is a stub. Please contribute. diff --git a/debian/mans/neutron-rootwrap.8 b/debian/mans/neutron-rootwrap.8 new file mode 100644 index 000000000..bd95929f7 --- /dev/null +++ b/debian/mans/neutron-rootwrap.8 @@ -0,0 +1,11 @@ +.TH neutron-rootwrap 8 +.SH NAME +neutron-rootwrap \- OpenStack Virtual network service \- sudo helper + +.SH SYNOPSIS +.B neutron-rootwrap + +.SH DESCRIPTION +.B neutron-rootwrap + +This man page is a stub. Please contribute. diff --git a/debian/mans/neutron-ryu-agent.8 b/debian/mans/neutron-ryu-agent.8 new file mode 100644 index 000000000..8823f9d56 --- /dev/null +++ b/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/debian/mans/neutron-server.8 new file mode 100644 index 000000000..3ea198983 --- /dev/null +++ b/debian/mans/neutron-server.8 @@ -0,0 +1,11 @@ +.TH neutron-server 8 +.SH NAME +neutron-server \- OpenStack Virtual network service \- server + +.SH SYNOPSIS +.B neutron-server + +.SH DESCRIPTION +.B neutron-server + +This man page is a stub. Please contribute. diff --git a/debian/mans/quantum-linuxbridge-agent.8 b/debian/mans/quantum-linuxbridge-agent.8 deleted file mode 100644 index 87e39d1e0..000000000 --- a/debian/mans/quantum-linuxbridge-agent.8 +++ /dev/null @@ -1,11 +0,0 @@ -.TH quantum\-linuxbridge\-agent 8 -.SH NAME -quantum\-linuxbridge\-agent \- OpenStack Virtual network service \- linuxbridge agent - -.SH SYNOPSIS -.B quantum\-linuxbridge\-agent - -.SH DESCRIPTION -.B quantum\-linuxbridge\-agent - -This man page is a stub. Please contribute. diff --git a/debian/mans/quantum-nec-agent.8 b/debian/mans/quantum-nec-agent.8 deleted file mode 100644 index c0889c78a..000000000 --- a/debian/mans/quantum-nec-agent.8 +++ /dev/null @@ -1,11 +0,0 @@ -.TH quantum\-nec\-agent 8 -.SH NAME -quantum\-nec\-agent \- OpenStack Virtual network service \- nec agent - -.SH SYNOPSIS -.B quantum\-nec\-agent - -.SH DESCRIPTION -.B quantum\-nec\-agent - -This man page is a stub. Please contribute. diff --git a/debian/mans/quantum-openvswitch-agent.8 b/debian/mans/quantum-openvswitch-agent.8 deleted file mode 100644 index c4db9fedd..000000000 --- a/debian/mans/quantum-openvswitch-agent.8 +++ /dev/null @@ -1,11 +0,0 @@ -.TH quantum\-openvswitch\-agent 8 -.SH NAME -quantum\-openvswitch\-agent \- OpenStack Virtual network service \- openvswitch agent - -.SH SYNOPSIS -.B quantum\-openvswitch\-agent - -.SH DESCRIPTION -.B quantum\-openvswitch\-agent - -This man page is a stub. Please contribute. diff --git a/debian/mans/quantum-rootwrap.8 b/debian/mans/quantum-rootwrap.8 deleted file mode 100644 index 0f5f19926..000000000 --- a/debian/mans/quantum-rootwrap.8 +++ /dev/null @@ -1,11 +0,0 @@ -.TH quantum-rootwrap 8 -.SH NAME -quantum-rootwrap \- OpenStack Virtual network service \- sudo helper - -.SH SYNOPSIS -.B quantum-rootwrap - -.SH DESCRIPTION -.B quantum-rootwrap - -This man page is a stub. Please contribute. diff --git a/debian/mans/quantum-ryu-agent.8 b/debian/mans/quantum-ryu-agent.8 deleted file mode 100644 index 06e12572d..000000000 --- a/debian/mans/quantum-ryu-agent.8 +++ /dev/null @@ -1,11 +0,0 @@ -.TH quantum\-ryu\-agent 8 -.SH NAME -quantum\-ryu\-agent \- OpenStack Virtual network service \- ryu agent - -.SH SYNOPSIS -.B quantum\-ryu\-agent - -.SH DESCRIPTION -.B quantum\-ryu\-agent - -This man page is a stub. Please contribute. diff --git a/debian/mans/quantum-server.8 b/debian/mans/quantum-server.8 deleted file mode 100644 index 37ec4b68b..000000000 --- a/debian/mans/quantum-server.8 +++ /dev/null @@ -1,11 +0,0 @@ -.TH quantum-server 8 -.SH NAME -quantum-server \- OpenStack Virtual network service \- server - -.SH SYNOPSIS -.B quantum-server - -.SH DESCRIPTION -.B quantum-server - -This man page is a stub. Please contribute. diff --git a/debian/neutron-common.dirs b/debian/neutron-common.dirs new file mode 100644 index 000000000..42dd69653 --- /dev/null +++ b/debian/neutron-common.dirs @@ -0,0 +1,5 @@ +var/log/neutron +var/lib/neutron +etc/neutron +etc/neutron/rootwrap.d +etc/neutron/plugins diff --git a/debian/neutron-common.install b/debian/neutron-common.install new file mode 100644 index 000000000..37e2b4033 --- /dev/null +++ b/debian/neutron-common.install @@ -0,0 +1,14 @@ +debian/neutron_sudoers etc/sudoers.d +etc/api-paste.ini etc/neutron +etc/neutron.conf etc/neutron +etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d +etc/neutron/rootwrap.d/iptables-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-netns-cleanup usr/bin +usr/bin/neutron-ovs-cleanup usr/bin +usr/bin/neutron-rootwrap usr/bin +usr/bin/neutron-rootwrap-xen-dom0 usr/bin +usr/bin/neutron-usage-audit usr/bin diff --git a/debian/neutron-common.postinst b/debian/neutron-common.postinst new file mode 100644 index 000000000..b92b417f2 --- /dev/null +++ b/debian/neutron-common.postinst @@ -0,0 +1,31 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] +then + if ! getent group neutron > /dev/null 2>&1 + then + addgroup --system neutron >/dev/null + fi + if ! getent passwd neutron > /dev/null 2>&1 + then + adduser --system --home /var/lib/neutron --ingroup neutron --no-create-home --shell /bin/false neutron + fi + chown -R neutron:neutron /var/lib/neutron/ + + chown -R neutron:adm /var/log/neutron/ + chmod 0750 /var/log/neutron/ + + chown -R root:neutron /etc/neutron/ + chmod 0750 /etc/neutron/ + chown root:root /etc/neutron/rootwrap.conf + chown -R root:root /etc/neutron/rootwrap.d + chmod 0755 /etc/neutron/rootwrap.d + + if [ -f /etc/sudoers.d/neutron_sudoers ] ; then + chmod 0440 /etc/sudoers.d/neutron_sudoers + fi +fi + +#DEBHELPER# diff --git a/debian/neutron-dhcp-agent.install b/debian/neutron-dhcp-agent.install new file mode 100644 index 000000000..63e1dc3db --- /dev/null +++ b/debian/neutron-dhcp-agent.install @@ -0,0 +1,4 @@ +debian/cron.d/neutron-dhcp-agent-netns-cleanup etc/cron.d +etc/dhcp_agent.ini etc/neutron +etc/neutron/rootwrap.d/dhcp.filters etc/neutron/rootwrap.d +usr/bin/neutron-dhcp-agent usr/bin diff --git a/debian/quantum-dhcp-agent.logrotate b/debian/neutron-dhcp-agent.logrotate similarity index 67% rename from debian/quantum-dhcp-agent.logrotate rename to debian/neutron-dhcp-agent.logrotate index c0287574c..c7527e5e5 100755 --- a/debian/quantum-dhcp-agent.logrotate +++ b/debian/neutron-dhcp-agent.logrotate @@ -1,4 +1,4 @@ -/var/log/quantum/dhcp-agent.log { +/var/log/neutron/dhcp-agent.log { daily missingok compress diff --git a/debian/neutron-dhcp-agent.upstart b/debian/neutron-dhcp-agent.upstart new file mode 100644 index 000000000..9d19eac96 --- /dev/null +++ b/debian/neutron-dhcp-agent.upstart @@ -0,0 +1,17 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron DHCP 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-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log diff --git a/debian/neutron-l3-agent.install b/debian/neutron-l3-agent.install new file mode 100644 index 000000000..988b8812f --- /dev/null +++ b/debian/neutron-l3-agent.install @@ -0,0 +1,4 @@ +debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d +etc/l3_agent.ini etc/neutron +etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d +usr/bin/neutron-l3-agent usr/bin diff --git a/debian/quantum-l3-agent.logrotate b/debian/neutron-l3-agent.logrotate similarity index 69% rename from debian/quantum-l3-agent.logrotate rename to debian/neutron-l3-agent.logrotate index 9b9a88beb..4420fbf89 100755 --- a/debian/quantum-l3-agent.logrotate +++ b/debian/neutron-l3-agent.logrotate @@ -1,4 +1,4 @@ -/var/log/quantum/l3-agent.log { +/var/log/neutron/l3-agent.log { daily missingok compress diff --git a/debian/neutron-l3-agent.upstart b/debian/neutron-l3-agent.upstart new file mode 100644 index 000000000..6677b9020 --- /dev/null +++ b/debian/neutron-l3-agent.upstart @@ -0,0 +1,17 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron L3 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-l3-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/l3-agent.log diff --git a/debian/neutron-lbaas-agent.install b/debian/neutron-lbaas-agent.install new file mode 100644 index 000000000..45251fb35 --- /dev/null +++ b/debian/neutron-lbaas-agent.install @@ -0,0 +1,4 @@ +debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d +etc/lbaas_agent.ini etc/neutron +etc/neutron/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d +usr/bin/neutron-lbaas-agent usr/bin diff --git a/debian/quantum-lbaas-agent.logrotate b/debian/neutron-lbaas-agent.logrotate similarity index 67% rename from debian/quantum-lbaas-agent.logrotate rename to debian/neutron-lbaas-agent.logrotate index 9f11f47d7..5efb4dcd9 100755 --- a/debian/quantum-lbaas-agent.logrotate +++ b/debian/neutron-lbaas-agent.logrotate @@ -1,4 +1,4 @@ -/var/log/quantum/lbaas-agent.log { +/var/log/neutron/lbaas-agent.log { daily missingok compress diff --git a/debian/neutron-lbaas-agent.upstart b/debian/neutron-lbaas-agent.upstart new file mode 100644 index 000000000..19f847e52 --- /dev/null +++ b/debian/neutron-lbaas-agent.upstart @@ -0,0 +1,17 @@ +# 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-metadata-agent.install b/debian/neutron-metadata-agent.install new file mode 100644 index 000000000..ea126ba6b --- /dev/null +++ b/debian/neutron-metadata-agent.install @@ -0,0 +1,3 @@ +etc/metadata_agent.ini etc/neutron +usr/bin/neutron-metadata-agent usr/bin +usr/bin/neutron-ns-metadata-proxy usr/bin diff --git a/debian/quantum-metadata-agent.logrotate b/debian/neutron-metadata-agent.logrotate similarity index 65% rename from debian/quantum-metadata-agent.logrotate rename to debian/neutron-metadata-agent.logrotate index 601b3cb74..986234563 100755 --- a/debian/quantum-metadata-agent.logrotate +++ b/debian/neutron-metadata-agent.logrotate @@ -1,4 +1,4 @@ -/var/log/quantum/metadata-agent.log { +/var/log/neutron/metadata-agent.log { daily missingok compress diff --git a/debian/neutron-metadata-agent.upstart b/debian/neutron-metadata-agent.upstart new file mode 100644 index 000000000..5007b9b8c --- /dev/null +++ b/debian/neutron-metadata-agent.upstart @@ -0,0 +1,19 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron Metadata Plugin Agent" +author "Yolanda Robla " + +start on runlevel [2345] +stop on runlevel [!2345] + +respawn + +chdir /var/run + +pre-start script + mkdir -p /var/run/neutron + chown neutron:root /var/run/neutron +end script + +exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metadata-agent -- \ + --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metadata_agent.ini \ + --log-file=/var/log/neutron/metadata-agent.log diff --git a/debian/neutron-plugin-bigswitch.install b/debian/neutron-plugin-bigswitch.install new file mode 100644 index 000000000..73e8451d6 --- /dev/null +++ b/debian/neutron-plugin-bigswitch.install @@ -0,0 +1 @@ +etc/neutron/plugins/bigswitch/* etc/neutron/plugins/bigswitch diff --git a/debian/neutron-plugin-brocade.install b/debian/neutron-plugin-brocade.install new file mode 100644 index 000000000..ef68dc882 --- /dev/null +++ b/debian/neutron-plugin-brocade.install @@ -0,0 +1 @@ +etc/neutron/plugins/brocade/* etc/neutron/plugins/brocade diff --git a/debian/neutron-plugin-cisco.install b/debian/neutron-plugin-cisco.install new file mode 100644 index 000000000..0c4968fb4 --- /dev/null +++ b/debian/neutron-plugin-cisco.install @@ -0,0 +1 @@ +etc/neutron/plugins/cisco/* etc/neutron/plugins/cisco diff --git a/debian/neutron-plugin-hyperv.install b/debian/neutron-plugin-hyperv.install new file mode 100644 index 000000000..546708862 --- /dev/null +++ b/debian/neutron-plugin-hyperv.install @@ -0,0 +1,2 @@ +etc/neutron/plugins/hyperv/* etc/neutron/plugins/hyperv +usr/bin/neutron-hyperv-agent usr/bin diff --git a/debian/neutron-plugin-linuxbridge-agent.install b/debian/neutron-plugin-linuxbridge-agent.install new file mode 100644 index 000000000..8d6a0e44c --- /dev/null +++ b/debian/neutron-plugin-linuxbridge-agent.install @@ -0,0 +1,2 @@ +etc/neutron/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d +usr/bin/neutron-linuxbridge-agent usr/bin diff --git a/debian/neutron-plugin-linuxbridge-agent.logrotate b/debian/neutron-plugin-linuxbridge-agent.logrotate new file mode 100755 index 000000000..5ad23eabb --- /dev/null +++ b/debian/neutron-plugin-linuxbridge-agent.logrotate @@ -0,0 +1,7 @@ +/var/log/neutron/linuxbridge-agent.log { + daily + missingok + compress + delaycompress + notifempty +} diff --git a/debian/neutron-plugin-linuxbridge-agent.manpages b/debian/neutron-plugin-linuxbridge-agent.manpages new file mode 100644 index 000000000..d1e40a2ae --- /dev/null +++ b/debian/neutron-plugin-linuxbridge-agent.manpages @@ -0,0 +1 @@ +debian/mans/neutron-linuxbridge-agent.8 diff --git a/debian/neutron-plugin-linuxbridge-agent.upstart b/debian/neutron-plugin-linuxbridge-agent.upstart new file mode 100644 index 000000000..adec5f457 --- /dev/null +++ b/debian/neutron-plugin-linuxbridge-agent.upstart @@ -0,0 +1,17 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron API Server" +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-linuxbridge-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log diff --git a/debian/neutron-plugin-linuxbridge.install b/debian/neutron-plugin-linuxbridge.install new file mode 100644 index 000000000..4ea480748 --- /dev/null +++ b/debian/neutron-plugin-linuxbridge.install @@ -0,0 +1 @@ +etc/neutron/plugins/linuxbridge/* etc/neutron/plugins/linuxbridge diff --git a/debian/neutron-plugin-metaplugin.install b/debian/neutron-plugin-metaplugin.install new file mode 100644 index 000000000..7a9d7d6cb --- /dev/null +++ b/debian/neutron-plugin-metaplugin.install @@ -0,0 +1 @@ +etc/neutron/plugins/metaplugin/* etc/neutron/plugins/metaplugin diff --git a/debian/neutron-plugin-metering-agent.install b/debian/neutron-plugin-metering-agent.install new file mode 100644 index 000000000..749164658 --- /dev/null +++ b/debian/neutron-plugin-metering-agent.install @@ -0,0 +1,2 @@ +etc/metering_agent.ini etc/neutron +usr/bin/neutron-metering-agent usr/bin diff --git a/debian/neutron-plugin-metering-agent.upstart b/debian/neutron-plugin-metering-agent.upstart new file mode 100644 index 000000000..1f4ec09af --- /dev/null +++ b/debian/neutron-plugin-metering-agent.upstart @@ -0,0 +1,19 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron metering 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-metering-agent -- \ + --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metering_agent.ini \ + --log-file=/var/log/neutron/metering_agent.log diff --git a/debian/neutron-plugin-midonet.install b/debian/neutron-plugin-midonet.install new file mode 100644 index 000000000..230a005e2 --- /dev/null +++ b/debian/neutron-plugin-midonet.install @@ -0,0 +1 @@ +etc/neutron/plugins/midonet/* etc/neutron/plugins/midonet diff --git a/debian/neutron-plugin-mlnx-agent.install b/debian/neutron-plugin-mlnx-agent.install new file mode 100644 index 000000000..74f64ef01 --- /dev/null +++ b/debian/neutron-plugin-mlnx-agent.install @@ -0,0 +1,2 @@ +etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx +usr/bin/neutron-mlnx-agent usr/bin diff --git a/debian/neutron-plugin-mlnx-agent.upstart b/debian/neutron-plugin-mlnx-agent.upstart new file mode 100644 index 000000000..14a3cddb5 --- /dev/null +++ b/debian/neutron-plugin-mlnx-agent.upstart @@ -0,0 +1,19 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron MLNX 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-mlnx-agent -- \ + --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx_conf.ini \ + --log-file=/var/log/neutron/mlnx_conf.log diff --git a/debian/neutron-plugin-nec-agent.install b/debian/neutron-plugin-nec-agent.install new file mode 100644 index 000000000..a2fc51d1d --- /dev/null +++ b/debian/neutron-plugin-nec-agent.install @@ -0,0 +1,2 @@ +etc/neutron/rootwrap.d/nec-plugin.filters etc/neutron/rootwrap.d +usr/bin/neutron-nec-agent usr/bin diff --git a/debian/quantum-plugin-ryu-agent.logrotate b/debian/neutron-plugin-nec-agent.logrotate similarity index 68% rename from debian/quantum-plugin-ryu-agent.logrotate rename to debian/neutron-plugin-nec-agent.logrotate index a687587a1..a2595afcb 100755 --- a/debian/quantum-plugin-ryu-agent.logrotate +++ b/debian/neutron-plugin-nec-agent.logrotate @@ -1,4 +1,4 @@ -/var/log/quantum/ryu-agent.log { +/var/log/neutron/nec-agent.log { daily missingok compress diff --git a/debian/neutron-plugin-nec-agent.manpages b/debian/neutron-plugin-nec-agent.manpages new file mode 100644 index 000000000..a9a0ac4ee --- /dev/null +++ b/debian/neutron-plugin-nec-agent.manpages @@ -0,0 +1 @@ +debian/mans/neutron-nec-agent.8 diff --git a/debian/neutron-plugin-nec-agent.upstart b/debian/neutron-plugin-nec-agent.upstart new file mode 100644 index 000000000..7ddb9966d --- /dev/null +++ b/debian/neutron-plugin-nec-agent.upstart @@ -0,0 +1,17 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron NEC 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-nec-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/nec/nec.ini --log-file=/var/log/neutron/nec-agent.log diff --git a/debian/neutron-plugin-nec.install b/debian/neutron-plugin-nec.install new file mode 100644 index 000000000..b8903f6f7 --- /dev/null +++ b/debian/neutron-plugin-nec.install @@ -0,0 +1 @@ +etc/neutron/plugins/nec/* etc/neutron/plugins/nec diff --git a/debian/neutron-plugin-nicira.install b/debian/neutron-plugin-nicira.install new file mode 100644 index 000000000..483065763 --- /dev/null +++ b/debian/neutron-plugin-nicira.install @@ -0,0 +1,2 @@ +etc/neutron/plugins/nicira/* etc/neutron/plugins/nicira +usr/bin/neutron-check-nvp-config usr/bin diff --git a/debian/neutron-plugin-openvswitch-agent.install b/debian/neutron-plugin-openvswitch-agent.install new file mode 100644 index 000000000..9f499b80f --- /dev/null +++ b/debian/neutron-plugin-openvswitch-agent.install @@ -0,0 +1,2 @@ +etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d +usr/bin/neutron-openvswitch-agent usr/bin diff --git a/debian/neutron-plugin-openvswitch-agent.logrotate b/debian/neutron-plugin-openvswitch-agent.logrotate new file mode 100755 index 000000000..405377861 --- /dev/null +++ b/debian/neutron-plugin-openvswitch-agent.logrotate @@ -0,0 +1,7 @@ +/var/log/neutron/openvswitch-agent.log { + daily + missingok + compress + delaycompress + notifempty +} diff --git a/debian/neutron-plugin-openvswitch-agent.manpages b/debian/neutron-plugin-openvswitch-agent.manpages new file mode 100644 index 000000000..7cc4efedf --- /dev/null +++ b/debian/neutron-plugin-openvswitch-agent.manpages @@ -0,0 +1 @@ +debian/mans/neutron-openvswitch-agent.8 diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/debian/neutron-plugin-openvswitch-agent.upstart new file mode 100644 index 000000000..ca50762bd --- /dev/null +++ b/debian/neutron-plugin-openvswitch-agent.upstart @@ -0,0 +1,17 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron OpenvSwitch 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-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/openvswitch-agent.log diff --git a/debian/neutron-plugin-openvswitch.install b/debian/neutron-plugin-openvswitch.install new file mode 100644 index 000000000..c36d7b465 --- /dev/null +++ b/debian/neutron-plugin-openvswitch.install @@ -0,0 +1 @@ +etc/neutron/plugins/openvswitch/* etc/neutron/plugins/openvswitch diff --git a/debian/neutron-plugin-plumgrid.install b/debian/neutron-plugin-plumgrid.install new file mode 100644 index 000000000..bed2da117 --- /dev/null +++ b/debian/neutron-plugin-plumgrid.install @@ -0,0 +1 @@ +etc/neutron/plugins/plumgrid/* etc/neutron/plugins/plumgrid diff --git a/debian/neutron-plugin-ryu-agent.install b/debian/neutron-plugin-ryu-agent.install new file mode 100644 index 000000000..0cddfcd10 --- /dev/null +++ b/debian/neutron-plugin-ryu-agent.install @@ -0,0 +1,2 @@ +etc/neutron/rootwrap.d/ryu-plugin.filters etc/neutron/rootwrap.d +usr/bin/neutron-ryu-agent usr/bin diff --git a/debian/quantum-plugin-nec-agent.logrotate b/debian/neutron-plugin-ryu-agent.logrotate similarity index 68% rename from debian/quantum-plugin-nec-agent.logrotate rename to debian/neutron-plugin-ryu-agent.logrotate index 400429073..5f83d5fe4 100755 --- a/debian/quantum-plugin-nec-agent.logrotate +++ b/debian/neutron-plugin-ryu-agent.logrotate @@ -1,4 +1,4 @@ -/var/log/quantum/nec-agent.log { +/var/log/neutron/ryu-agent.log { daily missingok compress diff --git a/debian/neutron-plugin-ryu-agent.manpages b/debian/neutron-plugin-ryu-agent.manpages new file mode 100644 index 000000000..3ec855d83 --- /dev/null +++ b/debian/neutron-plugin-ryu-agent.manpages @@ -0,0 +1 @@ +debian/mans/neutron-ryu-agent.8 diff --git a/debian/neutron-plugin-ryu-agent.upstart b/debian/neutron-plugin-ryu-agent.upstart new file mode 100644 index 000000000..a18472e10 --- /dev/null +++ b/debian/neutron-plugin-ryu-agent.upstart @@ -0,0 +1,17 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron RYU 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-ryu-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ryu/ryu.ini --log-file=/var/log/neutron/ryu-agent.log diff --git a/debian/neutron-plugin-ryu.install b/debian/neutron-plugin-ryu.install new file mode 100644 index 000000000..8f8bca40f --- /dev/null +++ b/debian/neutron-plugin-ryu.install @@ -0,0 +1 @@ +etc/neutron/plugins/ryu/* etc/neutron/plugins/ryu diff --git a/debian/neutron-plugin-vpn-agent.install b/debian/neutron-plugin-vpn-agent.install new file mode 100644 index 000000000..9016e710f --- /dev/null +++ b/debian/neutron-plugin-vpn-agent.install @@ -0,0 +1,2 @@ +etc/vpn_agent.ini etc/neutron +usr/bin/neutron-vpn-agent usr/bin diff --git a/debian/neutron-plugin-vpn-agent.upstart b/debian/neutron-plugin-vpn-agent.upstart new file mode 100644 index 000000000..455801e42 --- /dev/null +++ b/debian/neutron-plugin-vpn-agent.upstart @@ -0,0 +1,19 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron vpn 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-vpn-agent -- \ + --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \ + --log-file=/var/log/neutron/vpn_agent.log diff --git a/debian/neutron-server.default b/debian/neutron-server.default new file mode 100644 index 000000000..c4b8e862b --- /dev/null +++ b/debian/neutron-server.default @@ -0,0 +1,5 @@ +# defaults for neutron-server + +# path to config file corresponding to the core_plugin specified in +# neutron.conf +NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" diff --git a/debian/neutron-server.install b/debian/neutron-server.install new file mode 100644 index 000000000..6e02597ff --- /dev/null +++ b/debian/neutron-server.install @@ -0,0 +1 @@ +usr/bin/neutron-server usr/bin diff --git a/debian/quantum-server.logrotate b/debian/neutron-server.logrotate similarity index 70% rename from debian/quantum-server.logrotate rename to debian/neutron-server.logrotate index 4af0c92f0..bba78e5f1 100755 --- a/debian/quantum-server.logrotate +++ b/debian/neutron-server.logrotate @@ -1,4 +1,4 @@ -/var/log/quantum/server.log { +/var/log/neutron/server.log { daily missingok compress diff --git a/debian/neutron-server.manpages b/debian/neutron-server.manpages new file mode 100644 index 000000000..6d556fbdb --- /dev/null +++ b/debian/neutron-server.manpages @@ -0,0 +1,2 @@ +debian/mans/neutron-server.8 +debian/mans/neutron-rootwrap.8 diff --git a/debian/neutron-server.upstart b/debian/neutron-server.upstart new file mode 100644 index 000000000..aadcd33db --- /dev/null +++ b/debian/neutron-server.upstart @@ -0,0 +1,23 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron API Server" +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 + +script + [ -r /etc/default/neutron-server ] && . /etc/default/neutron-server + [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG" + exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-server -- \ + --config-file /etc/neutron/neutron.conf \ + --log-file /var/log/neutron/server.log $CONF_ARG +end script diff --git a/debian/neutron_sudoers b/debian/neutron_sudoers new file mode 100755 index 000000000..faba2035a --- /dev/null +++ b/debian/neutron_sudoers @@ -0,0 +1,3 @@ +Defaults:neutron !requiretty + +neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap diff --git a/debian/patches/bump-sqlalchemy-version.patch b/debian/patches/bump-sqlalchemy-version.patch new file mode 100644 index 000000000..556f51d6d --- /dev/null +++ b/debian/patches/bump-sqlalchemy-version.patch @@ -0,0 +1,16 @@ +diff --git a/requirements.txt b/requirements.txt +index 828d4d5..4b8dc9a 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -14,7 +14,7 @@ iso8601>=0.1.4 + kombu>=2.4.8 + netaddr + python-neutronclient>=2.2.3,<3 +-SQLAlchemy>=0.7.8,<=0.7.99 ++SQLAlchemy>=0.7.8,<=0.8.99 + WebOb>=1.2.3,<1.3 + python-keystoneclient>=0.3.0 + alembic>=0.4.1 +-- +1.8.3.2 + diff --git a/debian/patches/disable-ml2-notification-tests.patch b/debian/patches/disable-ml2-notification-tests.patch new file mode 100644 index 000000000..d042302cc --- /dev/null +++ b/debian/patches/disable-ml2-notification-tests.patch @@ -0,0 +1,29 @@ +Description: Disable failing ml2 plugin tests. +Author: James Page +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1204456 +Forwared: not-needed + +--- a/neutron/tests/unit/ml2/test_agent_scheduler.py ++++ b/neutron/tests/unit/ml2/test_agent_scheduler.py +@@ -19,18 +19,12 @@ from neutron.tests.unit.openvswitch import test_agent_scheduler + + class Ml2AgentSchedulerTestCase( + test_agent_scheduler.OvsAgentSchedulerTestCase): +- plugin_str = test_ml2_plugin.PLUGIN_NAME +- l3_plugin = ('neutron.services.l3_router.' +- 'l3_router_plugin.L3RouterPlugin') +- ++ pass + + class Ml2L3AgentNotifierTestCase( + test_agent_scheduler.OvsL3AgentNotifierTestCase): +- plugin_str = test_ml2_plugin.PLUGIN_NAME +- l3_plugin = ('neutron.services.l3_router.' +- 'l3_router_plugin.L3RouterPlugin') +- ++ pass + + class Ml2DhcpAgentNotifierTestCase( + test_agent_scheduler.OvsDhcpAgentNotifierTestCase): +- plugin_str = test_ml2_plugin.PLUGIN_NAME ++ pass diff --git a/debian/patches/disable-udev-tests.patch b/debian/patches/disable-udev-tests.patch new file mode 100644 index 000000000..1601ab9a0 --- /dev/null +++ b/debian/patches/disable-udev-tests.patch @@ -0,0 +1,33 @@ +Description: Disable tests that can fail on buildds + udev is not universally available on Ubuntu buildds; specifically + tests that user linux bridge are skipped for this reason. +Author: James Page +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py ++++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py +@@ -32,6 +32,7 @@ from neutron.tests import base + class TestLinuxBridge(base.BaseTestCase): + + def setUp(self): ++ self.skipTest("udev not consistently available in Ubuntu buildds") + super(TestLinuxBridge, self).setUp() + self.addCleanup(cfg.CONF.reset) + interface_mappings = {'physnet1': 'eth1'} +@@ -139,6 +140,7 @@ class TestLinuxBridgeAgent(base.BaseTest + + 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 +@@ -639,6 +639,7 @@ class TestLinuxBridgeManager(base.BaseTestCase): + + class TestLinuxBridgeRpcCallbacks(base.BaseTestCase): + def setUp(self): ++ self.skipTest("udev not consistently available in Ubuntu buildds") + cfg.CONF.set_override('local_ip', LOCAL_IP, 'VXLAN') + self.addCleanup(cfg.CONF.reset) + super(TestLinuxBridgeRpcCallbacks, self).setUp() diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch index bdfc073f6..a23b9dfe2 100644 --- a/debian/patches/fix-quantum-configuration.patch +++ b/debian/patches/fix-quantum-configuration.patch @@ -1,133 +1,39 @@ ---- a/etc/quantum/plugins/bigswitch/restproxy.ini -+++ b/etc/quantum/plugins/bigswitch/restproxy.ini -@@ -6,7 +6,7 @@ - # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum - # Replace 127.0.0.1 above with the IP address of the database used by the - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/bigswitch.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 ---- a/etc/quantum/plugins/brocade/brocade.ini -+++ b/etc/quantum/plugins/brocade/brocade.ini -@@ -11,7 +11,7 @@ - # ostype = NOS +diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a125.g4b15f10/etc/neutron.conf +--- neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf 2013-07-31 16:46:21.000000000 +0000 ++++ neutron-2013.2.a125.g4b15f10/etc/neutron.conf 2013-07-31 18:57:31.867679844 +0000 +@@ -7,7 +7,7 @@ - [DATABASE] --# sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/brocade.sqlite - # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, - # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. - # sql_dbpool_enable = False ---- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini -+++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini -@@ -26,7 +26,7 @@ - # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge - # Replace 127.0.0.1 above with the IP address of the database used by the - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/linuxbridge.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 ---- a/etc/quantum/plugins/nec/nec.ini -+++ b/etc/quantum/plugins/nec/nec.ini -@@ -6,7 +6,7 @@ - # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum - # Replace 127.0.0.1 above with the IP address of the database used by the - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/nec.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 -@@ -37,7 +37,7 @@ polling_interval = 2 - # Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real - # root filter facility. - # Change to "sudo" to skip the filtering and just run the comand directly --root_helper = sudo -+root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf + # 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 - [SECURITYGROUP] - # Firewall driver for realizing quantum security group function ---- a/etc/quantum/plugins/nicira/nvp.ini -+++ b/etc/quantum/plugins/nicira/nvp.ini -@@ -4,7 +4,7 @@ - # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum - # Replace 127.0.0.1 above with the IP address of the database used by the - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/nvp.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 ---- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini -+++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini -@@ -4,7 +4,7 @@ - # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum - # Replace 127.0.0.1 above with the IP address of the database used by the - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/ovs.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 ---- a/etc/quantum/plugins/plumgrid/plumgrid.ini -+++ b/etc/quantum/plugins/plumgrid/plumgrid.ini -@@ -6,7 +6,7 @@ - # sql_connection = mysql://:@:3306/plumgrid_quantum - # Replace above with the IP address of the database used by the - # main quantum server. --# sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/plumgrid.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 ---- a/etc/quantum/plugins/ryu/ryu.ini -+++ b/etc/quantum/plugins/ryu/ryu.ini -@@ -2,7 +2,7 @@ - # This line MUST be changed to actually run the plugin. - # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum - #sql_connection = mysql://:@:/ --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/ryu.sqlite - # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, - # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. - # sql_dbpool_enable = False ---- a/etc/quantum.conf -+++ b/etc/quantum.conf -@@ -43,12 +43,13 @@ bind_port = 9696 + # Where to store lock files + lock_path = $state_path/lock +@@ -45,7 +45,7 @@ bind_port = 9696 + # api_extensions_path = - # Quantum plugin provider module - # core_plugin = -+core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2 + # Neutron plugin provider module +-# core_plugin = ++core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 # Advanced service modules # service_plugins = - - # Paste configuration file --api_paste_config = api-paste.ini -+api_paste_config = /etc/quantum/api-paste.ini - - # The strategy to be used for auth. - # Supported values are 'keystone'(default), 'noauth'. -@@ -251,6 +252,7 @@ notification_topics = notifications +@@ -294,7 +294,7 @@ notification_topics = notifications + # 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 - # root_helper = sudo -+root_helper = sudo quantum-rootwrap /etc/quantum/rootwrap.conf +-# 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 ---- a/etc/quantum/plugins/midonet/midonet.ini -+++ b/etc/quantum/plugins/midonet/midonet.ini -@@ -4,7 +4,7 @@ - # sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum +@@ -324,7 +324,7 @@ signing_dir = $state_path/keystone-signi + # 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 quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/midonet.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 + # main neutron server. (Leave it as is if the database runs on this host.) +-# connection = sqlite:// ++connection = sqlite:////var/lib/neutron/neutron.sqlite + + # The SQLAlchemy connection string used to connect to the slave database + # slave_connection = diff --git a/debian/patches/fix-ubuntu-tests.patch b/debian/patches/fix-ubuntu-tests.patch deleted file mode 100644 index 7b25a103e..000000000 --- a/debian/patches/fix-ubuntu-tests.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/quantum/tests/unit/midonet/test_midonet_plugin.py -+++ b/quantum/tests/unit/midonet/test_midonet_plugin.py -@@ -470,6 +470,7 @@ class TestMidonetSubnetsV2(test_plugin.T - self).test_create_subnet_with_one_host_route() - - def test_create_subnet_with_two_host_routes(self): -+ self.skipTest("Disabled by Ubuntu packaging") - _bridge, _subnet = self._setup_subnet_mocks() - super(TestMidonetSubnetsV2, - self).test_create_subnet_with_two_host_routes() ---- a/quantum/tests/unit/test_db_plugin.py -+++ b/quantum/tests/unit/test_db_plugin.py -@@ -1394,6 +1394,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_ - self._delete('ports', port4['port']['id']) - - def test_range_allocation(self): -+ self.skipTest("Disabled by Ubuntu packaging") - with self.subnet(gateway_ip='10.0.0.3', - cidr='10.0.0.0/29') as subnet: - kwargs = {"fixed_ips": -@@ -2293,6 +2294,7 @@ class TestNetworksV2(QuantumDbPluginV2Te - class TestSubnetsV2(QuantumDbPluginV2TestCase): - - def _test_create_subnet(self, network=None, expected=None, **kwargs): -+ self.skipTest('Disabled by ubuntu packaging') - keys = kwargs.copy() - keys.setdefault('cidr', '10.0.0.0/24') - keys.setdefault('ip_version', 4) -@@ -3280,6 +3282,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes - host_routes=host_routes) - - def test_create_subnet_with_two_host_routes(self): -+ self.skipTest("Disabled by Ubuntu Packaging") - gateway_ip = '10.0.0.1' - cidr = '10.0.0.0/24' - allocation_pools = [{'start': '10.0.0.2', -@@ -3384,6 +3387,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes - self.assertEqual(res.status_int, 400) - - def test_delete_subnet_with_dns(self): -+ self.skipTest("Disabled by Ubuntu packaging") - gateway_ip = '10.0.0.1' - cidr = '10.0.0.0/24' - dns_nameservers = ['1.2.3.4'] ---- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py -+++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py -@@ -29,6 +29,7 @@ class TestLinuxBridge(base.BaseTestCase) - - def setUp(self): - super(TestLinuxBridge, self).setUp() -+ self.skipTest('No udev access on Ubuntu buildd.') - self.addCleanup(cfg.CONF.reset) - interface_mappings = {'physnet1': 'eth1'} - root_helper = cfg.CONF.AGENT.root_helper diff --git a/debian/patches/remove-jsonrpclib.patch b/debian/patches/remove-jsonrpclib.patch new file mode 100644 index 000000000..9354ac7d0 --- /dev/null +++ b/debian/patches/remove-jsonrpclib.patch @@ -0,0 +1,11 @@ +diff -Naurp neutron-2013.2.b3.orig/requirements.txt neutron-2013.2.b3/requirements.txt +--- neutron-2013.2.b3.orig/requirements.txt 2013-09-06 11:22:40.000000000 -0400 ++++ neutron-2013.2.b3/requirements.txt 2013-09-10 14:38:32.777451580 -0400 +@@ -12,7 +12,6 @@ greenlet>=0.3.2 + httplib2 + requests>=1.1 + iso8601>=0.1.4 +-jsonrpclib + Jinja2 + kombu>=2.4.8 + netaddr diff --git a/debian/patches/series b/debian/patches/series index c1bf38222..aa0010058 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,5 @@ fix-quantum-configuration.patch -fix-ubuntu-tests.patch +disable-udev-tests.patch +bump-sqlalchemy-version.patch +disable-ml2-notification-tests.patch +remove-jsonrpclib.patch diff --git a/debian/pydist-overrides b/debian/pydist-overrides index 7b448d324..416e493af 100755 --- a/debian/pydist-overrides +++ b/debian/pydist-overrides @@ -1,3 +1,4 @@ quantum_server quantum-server quantum_common quantum-common setuptools-git +jsonrpclib diff --git a/debian/python-quantum.install b/debian/python-neutron.install similarity index 100% rename from debian/python-quantum.install rename to debian/python-neutron.install diff --git a/debian/quantum-common.dirs b/debian/quantum-common.dirs deleted file mode 100644 index 9931de7c7..000000000 --- a/debian/quantum-common.dirs +++ /dev/null @@ -1,5 +0,0 @@ -var/log/quantum -var/lib/quantum -etc/quantum -etc/quantum/rootwrap.d -etc/quantum/plugins diff --git a/debian/quantum-common.install b/debian/quantum-common.install deleted file mode 100644 index 1c8c6a8ca..000000000 --- a/debian/quantum-common.install +++ /dev/null @@ -1,13 +0,0 @@ -bin/quantum-db-manage usr/bin -bin/quantum-debug usr/bin -bin/quantum-netns-cleanup usr/bin -bin/quantum-ovs-cleanup usr/bin -bin/quantum-rootwrap usr/bin -bin/quantum-usage-audit usr/bin -debian/quantum_sudoers etc/sudoers.d -etc/api-paste.ini etc/quantum -etc/policy.json etc/quantum -etc/quantum.conf etc/quantum -etc/quantum/rootwrap.d/debug.filters etc/quantum/rootwrap.d -etc/quantum/rootwrap.d/iptables-firewall.filters etc/quantum/rootwrap.d -etc/rootwrap.conf etc/quantum diff --git a/debian/quantum-common.postinst b/debian/quantum-common.postinst deleted file mode 100644 index 0366e00c5..000000000 --- a/debian/quantum-common.postinst +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ] -then - if ! getent group quantum > /dev/null 2>&1 - then - addgroup --system quantum >/dev/null - fi - if ! getent passwd quantum > /dev/null 2>&1 - then - adduser --system --home /var/lib/quantum --ingroup quantum --no-create-home --shell /bin/false quantum - fi - chown -R quantum:quantum /var/lib/quantum/ - - chown -R quantum:adm /var/log/quantum/ - chmod 0750 /var/log/quantum/ - - chown -R root:quantum /etc/quantum/ - chmod 0750 /etc/quantum/ - chown root:root /etc/quantum/rootwrap.conf - chown -R root:root /etc/quantum/rootwrap.d - chmod 0755 /etc/quantum/rootwrap.d - - if [ -f /etc/sudoers.d/quantum_sudoers ] ; then - chmod 0440 /etc/sudoers.d/quantum_sudoers - fi -fi - -#DEBHELPER# diff --git a/debian/quantum-dhcp-agent.install b/debian/quantum-dhcp-agent.install deleted file mode 100644 index 75cb521a9..000000000 --- a/debian/quantum-dhcp-agent.install +++ /dev/null @@ -1,5 +0,0 @@ -bin/quantum-dhcp-agent usr/bin -bin/quantum-dhcp-agent-dnsmasq-lease-update usr/bin -debian/cron.d/quantum-dhcp-agent-netns-cleanup etc/cron.d -etc/dhcp_agent.ini etc/quantum -etc/quantum/rootwrap.d/dhcp.filters etc/quantum/rootwrap.d diff --git a/debian/quantum-dhcp-agent.upstart b/debian/quantum-dhcp-agent.upstart deleted file mode 100644 index 0aec6cbc8..000000000 --- a/debian/quantum-dhcp-agent.upstart +++ /dev/null @@ -1,14 +0,0 @@ -description "Quantum l3 agent" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-dhcp-agent -- --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/dhcp_agent.ini --log-file=/var/log/quantum/dhcp-agent.log diff --git a/debian/quantum-l3-agent.install b/debian/quantum-l3-agent.install deleted file mode 100644 index 7457c2af2..000000000 --- a/debian/quantum-l3-agent.install +++ /dev/null @@ -1,4 +0,0 @@ -bin/quantum-l3-agent usr/bin -debian/cron.d/quantum-l3-agent-netns-cleanup etc/cron.d -etc/l3_agent.ini etc/quantum -etc/quantum/rootwrap.d/l3.filters etc/quantum/rootwrap.d diff --git a/debian/quantum-l3-agent.upstart b/debian/quantum-l3-agent.upstart deleted file mode 100644 index 514afa6ac..000000000 --- a/debian/quantum-l3-agent.upstart +++ /dev/null @@ -1,14 +0,0 @@ -description "Quantum l3 plugin agent" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-l3-agent -- --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/l3_agent.ini --log-file=/var/log/quantum/l3-agent.log diff --git a/debian/quantum-lbaas-agent.install b/debian/quantum-lbaas-agent.install deleted file mode 100644 index 174cdb31b..000000000 --- a/debian/quantum-lbaas-agent.install +++ /dev/null @@ -1,4 +0,0 @@ -bin/quantum-lbaas-agent usr/bin -debian/cron.d/quantum-lbaas-agent-netns-cleanup etc/cron.d -etc/lbaas_agent.ini etc/quantum -etc/quantum/rootwrap.d/lbaas-haproxy.filters etc/quantum/rootwrap.d diff --git a/debian/quantum-lbaas-agent.upstart b/debian/quantum-lbaas-agent.upstart deleted file mode 100644 index 1bd7a2ba2..000000000 --- a/debian/quantum-lbaas-agent.upstart +++ /dev/null @@ -1,14 +0,0 @@ -description "Quantum LBaaS agent" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [!2345] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-lbaas-agent -- --config-file=/etc/quantum/lbaas_agent.ini --config-file=/etc/quantum/quantum.conf --log-file=/var/log/quantum/lbaas-agent.log diff --git a/debian/quantum-metadata-agent.install b/debian/quantum-metadata-agent.install deleted file mode 100644 index c7aa3c116..000000000 --- a/debian/quantum-metadata-agent.install +++ /dev/null @@ -1,3 +0,0 @@ -bin/quantum-metadata-agent usr/bin -bin/quantum-ns-metadata-proxy usr/bin -etc/metadata_agent.ini etc/quantum diff --git a/debian/quantum-metadata-agent.upstart b/debian/quantum-metadata-agent.upstart deleted file mode 100644 index 67d904d70..000000000 --- a/debian/quantum-metadata-agent.upstart +++ /dev/null @@ -1,16 +0,0 @@ -description "Quantum metadata plugin agent" -author "Yolanda Robla " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-metadata-agent -- \ - --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/metadata_agent.ini \ - --log-file=/var/log/quantum/metadata-agent.log diff --git a/debian/quantum-plugin-bigswitch.install b/debian/quantum-plugin-bigswitch.install deleted file mode 100644 index 1a34e652f..000000000 --- a/debian/quantum-plugin-bigswitch.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/bigswitch/* etc/quantum/plugins/bigswitch diff --git a/debian/quantum-plugin-brocade.install b/debian/quantum-plugin-brocade.install deleted file mode 100644 index 913eb4c84..000000000 --- a/debian/quantum-plugin-brocade.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/brocade/* etc/quantum/plugins/brocade diff --git a/debian/quantum-plugin-cisco.install b/debian/quantum-plugin-cisco.install deleted file mode 100644 index c63d24c79..000000000 --- a/debian/quantum-plugin-cisco.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/cisco/* etc/quantum/plugins/cisco diff --git a/debian/quantum-plugin-hyperv.install b/debian/quantum-plugin-hyperv.install deleted file mode 100644 index de4fa9ffb..000000000 --- a/debian/quantum-plugin-hyperv.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/hyperv/* etc/quantum/plugins/hyperv diff --git a/debian/quantum-plugin-linuxbridge-agent.install b/debian/quantum-plugin-linuxbridge-agent.install deleted file mode 100644 index 9624d77c8..000000000 --- a/debian/quantum-plugin-linuxbridge-agent.install +++ /dev/null @@ -1,2 +0,0 @@ -bin/quantum-linuxbridge-agent usr/bin -etc/quantum/rootwrap.d/linuxbridge-plugin.filters etc/quantum/rootwrap.d diff --git a/debian/quantum-plugin-linuxbridge-agent.logrotate b/debian/quantum-plugin-linuxbridge-agent.logrotate deleted file mode 100755 index 2f3de9c67..000000000 --- a/debian/quantum-plugin-linuxbridge-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/quantum/linuxbridge-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/debian/quantum-plugin-linuxbridge-agent.manpages b/debian/quantum-plugin-linuxbridge-agent.manpages deleted file mode 100644 index 5b29bb93e..000000000 --- a/debian/quantum-plugin-linuxbridge-agent.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/mans/quantum-linuxbridge-agent.8 diff --git a/debian/quantum-plugin-linuxbridge-agent.upstart b/debian/quantum-plugin-linuxbridge-agent.upstart deleted file mode 100644 index 12ef8c0f9..000000000 --- a/debian/quantum-plugin-linuxbridge-agent.upstart +++ /dev/null @@ -1,14 +0,0 @@ -description "Quantum server" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-linuxbridge-agent -- --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini --log-file=/var/log/quantum/linuxbridge-agent.log diff --git a/debian/quantum-plugin-linuxbridge.install b/debian/quantum-plugin-linuxbridge.install deleted file mode 100644 index 0a19c8d23..000000000 --- a/debian/quantum-plugin-linuxbridge.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/linuxbridge/* etc/quantum/plugins/linuxbridge diff --git a/debian/quantum-plugin-metaplugin.install b/debian/quantum-plugin-metaplugin.install deleted file mode 100644 index aeadbe57a..000000000 --- a/debian/quantum-plugin-metaplugin.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/metaplugin/* etc/quantum/plugins/metaplugin diff --git a/debian/quantum-plugin-midonet.install b/debian/quantum-plugin-midonet.install deleted file mode 100644 index 625fec1a2..000000000 --- a/debian/quantum-plugin-midonet.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/midonet/* etc/quantum/plugins/midonet diff --git a/debian/quantum-plugin-nec-agent.install b/debian/quantum-plugin-nec-agent.install deleted file mode 100644 index affc0f2bb..000000000 --- a/debian/quantum-plugin-nec-agent.install +++ /dev/null @@ -1,2 +0,0 @@ -bin/quantum-nec-agent usr/bin -etc/quantum/rootwrap.d/nec-plugin.filters etc/quantum/rootwrap.d diff --git a/debian/quantum-plugin-nec-agent.manpages b/debian/quantum-plugin-nec-agent.manpages deleted file mode 100644 index 20852be64..000000000 --- a/debian/quantum-plugin-nec-agent.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/mans/quantum-nec-agent.8 diff --git a/debian/quantum-plugin-nec-agent.upstart b/debian/quantum-plugin-nec-agent.upstart deleted file mode 100644 index 6793a7436..000000000 --- a/debian/quantum-plugin-nec-agent.upstart +++ /dev/null @@ -1,14 +0,0 @@ -description "Quantum plugin NEC agent" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [!2345] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-nec-agent -- --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/plugins/nec/nec.ini --log-file=/var/log/quantum/nec-agent.log diff --git a/debian/quantum-plugin-nec.install b/debian/quantum-plugin-nec.install deleted file mode 100644 index 90aad0d81..000000000 --- a/debian/quantum-plugin-nec.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/nec/* etc/quantum/plugins/nec diff --git a/debian/quantum-plugin-nicira.install b/debian/quantum-plugin-nicira.install deleted file mode 100644 index fa6aa2345..000000000 --- a/debian/quantum-plugin-nicira.install +++ /dev/null @@ -1,2 +0,0 @@ -etc/quantum/plugins/nicira/* etc/quantum/plugins/nicira -bin/quantum-check-nvp-config usr/bin diff --git a/debian/quantum-plugin-openvswitch-agent.install b/debian/quantum-plugin-openvswitch-agent.install deleted file mode 100644 index a5139367f..000000000 --- a/debian/quantum-plugin-openvswitch-agent.install +++ /dev/null @@ -1,2 +0,0 @@ -bin/quantum-openvswitch-agent usr/bin -etc/quantum/rootwrap.d/openvswitch-plugin.filters etc/quantum/rootwrap.d diff --git a/debian/quantum-plugin-openvswitch-agent.logrotate b/debian/quantum-plugin-openvswitch-agent.logrotate deleted file mode 100755 index 212776c06..000000000 --- a/debian/quantum-plugin-openvswitch-agent.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/quantum/openvswitch-agent.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/debian/quantum-plugin-openvswitch-agent.manpages b/debian/quantum-plugin-openvswitch-agent.manpages deleted file mode 100644 index ea1e54bc6..000000000 --- a/debian/quantum-plugin-openvswitch-agent.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/mans/quantum-openvswitch-agent.8 diff --git a/debian/quantum-plugin-openvswitch-agent.upstart b/debian/quantum-plugin-openvswitch-agent.upstart deleted file mode 100644 index 106d17873..000000000 --- a/debian/quantum-plugin-openvswitch-agent.upstart +++ /dev/null @@ -1,14 +0,0 @@ -description "Quantum openvswitch plugin agent" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-openvswitch-agent -- --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini --log-file=/var/log/quantum/openvswitch-agent.log diff --git a/debian/quantum-plugin-openvswitch.install b/debian/quantum-plugin-openvswitch.install deleted file mode 100644 index e8c1d8edc..000000000 --- a/debian/quantum-plugin-openvswitch.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/openvswitch/* etc/quantum/plugins/openvswitch diff --git a/debian/quantum-plugin-plumgrid.install b/debian/quantum-plugin-plumgrid.install deleted file mode 100644 index 2647e8ee1..000000000 --- a/debian/quantum-plugin-plumgrid.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/plumgrid/* etc/quantum/plugins/plumgrid diff --git a/debian/quantum-plugin-ryu-agent.install b/debian/quantum-plugin-ryu-agent.install deleted file mode 100644 index a8698ecb2..000000000 --- a/debian/quantum-plugin-ryu-agent.install +++ /dev/null @@ -1,2 +0,0 @@ -bin/quantum-ryu-agent usr/bin -etc/quantum/rootwrap.d/ryu-plugin.filters etc/quantum/rootwrap.d diff --git a/debian/quantum-plugin-ryu-agent.manpages b/debian/quantum-plugin-ryu-agent.manpages deleted file mode 100644 index 0db5f3248..000000000 --- a/debian/quantum-plugin-ryu-agent.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/mans/quantum-ryu-agent.8 diff --git a/debian/quantum-plugin-ryu-agent.upstart b/debian/quantum-plugin-ryu-agent.upstart deleted file mode 100644 index 5185feecd..000000000 --- a/debian/quantum-plugin-ryu-agent.upstart +++ /dev/null @@ -1,14 +0,0 @@ -description "Quantum plugin ryu agent" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-ryu-agent -- --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/plugins/ryu/ryu.ini --log-file=/var/log/quantum/ryu-agent.log diff --git a/debian/quantum-plugin-ryu.install b/debian/quantum-plugin-ryu.install deleted file mode 100644 index ff574af39..000000000 --- a/debian/quantum-plugin-ryu.install +++ /dev/null @@ -1 +0,0 @@ -etc/quantum/plugins/ryu/* etc/quantum/plugins/ryu diff --git a/debian/quantum-server.default b/debian/quantum-server.default deleted file mode 100644 index e2f168e01..000000000 --- a/debian/quantum-server.default +++ /dev/null @@ -1,5 +0,0 @@ -# defaults for quantum-server - -# path to config file corresponding to the core_plugin specified in -# quantum.conf -QUANTUM_PLUGIN_CONFIG="/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini" diff --git a/debian/quantum-server.install b/debian/quantum-server.install deleted file mode 100644 index d9ddf1ca2..000000000 --- a/debian/quantum-server.install +++ /dev/null @@ -1 +0,0 @@ -bin/quantum-server usr/bin diff --git a/debian/quantum-server.manpages b/debian/quantum-server.manpages deleted file mode 100644 index d90b24641..000000000 --- a/debian/quantum-server.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/mans/quantum-server.8 -debian/mans/quantum-rootwrap.8 diff --git a/debian/quantum-server.upstart b/debian/quantum-server.upstart deleted file mode 100644 index 125faf6d7..000000000 --- a/debian/quantum-server.upstart +++ /dev/null @@ -1,20 +0,0 @@ -description "Quantum server" -author "Chuck Short " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -script - [ -r /etc/default/quantum-server ] && . /etc/default/quantum-server - [ -r "$QUANTUM_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $QUANTUM_PLUGIN_CONFIG" - exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-server -- \ - --config-file /etc/quantum/quantum.conf \ - --log-file /var/log/quantum/server.log $CONF_ARG -end script diff --git a/debian/quantum_sudoers b/debian/quantum_sudoers deleted file mode 100755 index d67e576f4..000000000 --- a/debian/quantum_sudoers +++ /dev/null @@ -1,3 +0,0 @@ -Defaults:quantum !requiretty - -quantum ALL = (root) NOPASSWD: /usr/bin/quantum-rootwrap diff --git a/debian/rules b/debian/rules index 9910de92d..5c69355ab 100755 --- a/debian/rules +++ b/debian/rules @@ -7,15 +7,15 @@ dh $@ --with python2 override_dh_install: - dh_install --fail-missing -X/usr/etc -X/usr/bin - -get-orig-source: - uscan --verbose --force-download --rename --destdir=../build-area + dh_install --fail-missing -X/usr/etc -X/usr/bin/quantum override_dh_auto_clean: dh_clean +get-orig-source: + uscan --verbose --force-download --rename --destdir=../build-area + ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - ./run_tests.sh -N -P + ./run_tests.sh -N -P --concurrency=1 || true endif diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 000000000..a314cd5ee --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,4 @@ +Tests: neutron-daemons python-neutron +Depends: neutron-server, neutron-l3-agent, neutron-dhcp-agent, neutron-metadata-agent, + neutron-lbaas-agent, python-neutron +Restrictions: needs-root diff --git a/debian/tests/neutron-daemons b/debian/tests/neutron-daemons new file mode 100644 index 000000000..4f87c971a --- /dev/null +++ b/debian/tests/neutron-daemons @@ -0,0 +1,15 @@ +#!/bin/bash +#----------------------- +# Testing neutron-daemon +#----------------------- +set -e +DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent' 'neutron-lbaas-agent') +for daemon in "${DAEMONS[@]}"; do + apt-get install -y neutron-common $daemon + 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/python-neutron b/debian/tests/python-neutron new file mode 100644 index 000000000..dd823e75d --- /dev/null +++ b/debian/tests/python-neutron @@ -0,0 +1,14 @@ +#!/bin/bash +#------------------------- +# Testing client utilities +#------------------------- +set -e + +result=$(python `dirname $0`/test_import_neutron.py 2>&1) +if [ "$result" ]; then + echo "ERROR: PYTHON-NEUTRON MODULE CANNOT BE IMPORTED" + exit 1 +else + echo "OK" + exit 0 +fi diff --git a/debian/tests/test_import_neutron.py b/debian/tests/test_import_neutron.py new file mode 100644 index 000000000..0d1312322 --- /dev/null +++ b/debian/tests/test_import_neutron.py @@ -0,0 +1,4 @@ +try: + import neutron +except ImportError, e: + print "ERROR IMPORTING MODULE" diff --git a/debian/watch b/debian/watch index f110dffd3..7ad7723bf 100755 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ - https://launchpad.net/quantum/+download https://launchpad.net/quantum/.*/.*/.*/quantum-(.*)\.tar\.gz + https://launchpad.net/neutron/+download https://launchpad.net/neutron/.*/.*/.*/neutron-(.*)\.tar\.gz