Merge lp:~zulcss/neutron/rename into lp:~ubuntu-server-dev/neutron/havana

[Chuck Short]

Quantum -> Neutron rename

[James Page (james-page)]

Adding feedback as I find it:

I could not build without the following change to debian/control:

@@ -17,7 +17,7 @@
  python-fixtures (>= 0.3.12),
  python-httplib2,
  python-iso8601,
- python-keystone,
+ python-keystoneclient (>= 1:0.2.0),
  python-kombu,
  python-lxml,
  python-mock (>= 1.0b1),
@@ -31,7 +31,7 @@
  python-paste,
  python-pastedeploy,
  python-pyudev,
- python-quantumclient (>= 1:2.2.0),
+ python-neutronclient (>= 1:2.2.3),
  python-routes,
  python-setuptools,
  python-setuptools-git,
@@ -49,326 +49,340 @@

review: Needs Fixing

[James Page (james-page)]

neutron-plugin-ryu, neutron-plugin-ryu-agent, neutron-plugin-midonet all appear oddly in the diff; can you take a look and see if that can be fixed up.

Typo in :

+Breaks: quantum-plugin-ryut ( << 1:2013.2~b1-0ubuntu2~ )

For neutron-plugin-ryu (ryut -> ryu).

review: Needs Fixing

[James Page (james-page)]

neutron-common.install:

usr/bin/qauntum-rootwrap usr/bin

review: Needs Fixing

[James Page (james-page)]

debian/cron.d:

All contents need review/update as still calling quantum commands - filenames have been change though.

review: Needs Fixing

[James Page (james-page)]

Hmm - no usr/bin contents in any of the packages; looks like everything is moving to entry points.

Please review and fixup.

review: Needs Fixing

[James Page (james-page)]

a NEWS.Debian is a good idea for this rename; please add on and discuss migration of existing configuration over to neutron;

review: Needs Fixing

[James Page (james-page)]

debian/watch: needs updating
debian/tests: please fixup for new naming

review: Needs Fixing

[James Page (james-page)]

debian/rules; - use of -X/usr/bin with dh_install is causing the binaries to be missing; looks like some may have been dropped as well.

review: Needs Fixing

[James Page (james-page)]

bah - so -X/usr/bin/quantum is a good switch - couple of new binaries:

dh_install: usr/bin/neutron-mlnx-agent exists in debian/tmp but is not installed to anywhere
dh_install: usr/bin/neutron-hyperv-agent exists in debian/tmp but is not installed to anywhere
dh_install: missing files, aborting

review: Needs Fixing

[lp:~zulcss/neutron/rename]

169. By Chuck Short on 2013-07-16

* debian/patches/ignore-quantum-binaries.patch: Dont install quantum binaries.
* Add mlnx agent.

170. By Chuck Short on 2013-07-16

Rename mlnx package

171. By Chuck Short on 2013-07-17

Fix watch file

172. By Chuck Short on 2013-07-17

Renamed mlnx plugin

173. By Chuck Short on 2013-07-17

Update breaks/replaces

[James Page (james-page)]

Please check and correct the mlnx/mlxn typos on the description of the neutron-plugin-mlnx-agent package.

review: Needs Fixing

[James Page (james-page)]

README.Debian -> NEWS

review: Needs Fixing

[lp:~zulcss/neutron/rename]

174. By Chuck Short on 2013-07-17

More fixes

=== added file 'debian/NEWS'
--- debian/NEWS	1970-01-01 00:00:00 +0000
+++ debian/NEWS	2013-07-17 16:24:24 +0000
@@ -0,0 +1,3 @@
+Quantum has been renamed to Neutron during the havana2 cycle.
+
+Migration details go here when they are available.
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-07-09 12:58:13 +0000
+++ debian/changelog	2013-07-17 16:24:24 +0000
@@ -1,7 +1,18 @@
-quantum (1:2013.2~b1-0ubuntu3) UNRELEASED; urgency=low
+neutron (1:2013.2.a951.ga79faea-0ubuntu1) UNRELEASED; urgency=low
 
   [ Chuck Short ]
   * debian/patches/fix-quantum-configuration.patch: Refreshed 
+  * Previously known as Quantum:
+    - Renamed quantum -> neutron.
+    - debian/neutron-common.install: Adjust path to install binaries
+      from.
+    - debian/control: 
+      + Add transtional packages.
+      + Add breaks/conflicts with previous version of quantum.
+  * New upstream version.
+  * debian/patches/fix-ubuntu-tests.patch: Refreshed
+  * debian/patches/ignore-quantum-binaries.patch: Dont install quantum binaries.
+  * Add mlnx agent.
 
   [ James Page ]
   * d/control: Update VCS fields for new branch locations.
 
=== modified file 'debian/control'
--- debian/control	2013-07-09 12:58:13 +0000
+++ debian/control	2013-07-17 16:24:24 +0000
@@ -1,4 +1,4 @@
-Source: quantum
+Source: neutron
 Section: net
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -17,7 +17,7 @@
  python-fixtures (>= 0.3.12),
  python-httplib2,
  python-iso8601,
- python-keystone,
+ python-keystoneclient (>= 1:0.2.0),
  python-kombu,
  python-lxml,
  python-mock (>= 1.0b1),
@@ -31,7 +31,7 @@
  python-paste,
  python-pastedeploy,
  python-pyudev,
- python-quantumclient (>= 1:2.2.0),
+ python-neutronclient (>= 1:2.2.3),
  python-routes,
  python-setuptools,
  python-setuptools-git,
@@ -49,326 +49,340 @@
 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:
  openvswitch-switch,
- quantum-common (= ${source:Version}),
- quantum-plugin-nec,
+ neutron-common (= ${source:Version}),
+ neutron-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}),
+ neutron-common (= ${source:Version}),
+ neutron-metadata-agent (= ${source:Version}),
  iputils-arping,
  ${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:
@@ -386,7 +400,7 @@
  python-paste,
  python-pastedeploy,
  python-pyudev,
- python-quantumclient (>= 1:0.1.0.1-0ubuntu1),
+ python-neutronclient (>= 1:0.1.0.1-0ubuntu1),
  python-routes,
  python-simplejson,
  python-stevedore (>= 0.8),
@@ -396,166 +410,353 @@
  ${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:
  openvswitch-switch,
- quantum-common (= ${source:Version}),
- quantum-plugin-openvswitch,
+ neutron-common (= ${source:Version}),
+ neutron-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: neutron-plugin-ryu
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+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, 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 RYU plugin.
+
+Package: neutron-plugin-ryu-agent
+Architecture: all
+Depends:
+ neutron-common (= ${source:Version}),
+ neutron-plugin-ryu,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+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, 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 RYU plugin agent.
+
+Package: neutron-plugin-midonet
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+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, 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 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 - mlxn 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 mlxn plugin agent.
+
+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
-Provides: quantum-plugin
-Depends:
- quantum-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
- Netstack. Just like OpenStack Nova provides an API to dynamically
- request and configure virtual servers, Quantum 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
- advanced network capabilities (e.g., QoS, ACLs, network monitoring,
- etc.)
- .
- This package provides the RYU plugin.
+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
-Depends:
- quantum-common (= ${source:Version}),
- quantum-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
- Netstack. Just like OpenStack Nova provides an API to dynamically
- request and configure virtual servers, Quantum 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
- advanced network capabilities (e.g., QoS, ACLs, network monitoring,
- etc.)
- .
- This package provides the RYU plugin agent.
+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
-Provides: quantum-plugin
-Depends:
- quantum-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
- Netstack. Just like OpenStack Nova provides an API to dynamically
- request and configure virtual servers, Quantum 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
- advanced network capabilities (e.g., QoS, ACLs, network monitoring,
- etc.)
- .
- This package provides the Midonet plugin.
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
=== modified file 'debian/copyright'
--- debian/copyright	2012-09-06 18:04:01 +0000
+++ debian/copyright	2013-07-17 16:24:24 +0000
@@ -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.
 
=== added file 'debian/cron.d/neutron-dhcp-agent-netns-cleanup'
--- debian/cron.d/neutron-dhcp-agent-netns-cleanup	1970-01-01 00:00:00 +0000
+++ debian/cron.d/neutron-dhcp-agent-netns-cleanup	2013-07-17 16:24:24 +0000
@@ -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
 
=== added file 'debian/cron.d/neutron-l3-agent-netns-cleanup'
--- debian/cron.d/neutron-l3-agent-netns-cleanup	1970-01-01 00:00:00 +0000
+++ debian/cron.d/neutron-l3-agent-netns-cleanup	2013-07-17 16:24:24 +0000
@@ -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
 
=== added file 'debian/cron.d/neutron-lbaas-agent-netns-cleanup'
--- debian/cron.d/neutron-lbaas-agent-netns-cleanup	1970-01-01 00:00:00 +0000
+++ debian/cron.d/neutron-lbaas-agent-netns-cleanup	2013-07-17 16:24:24 +0000
@@ -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
 
=== removed file 'debian/cron.d/quantum-dhcp-agent-netns-cleanup'
--- debian/cron.d/quantum-dhcp-agent-netns-cleanup	2013-04-22 14:58:32 +0000
+++ debian/cron.d/quantum-dhcp-agent-netns-cleanup	1970-01-01 00:00:00 +0000
@@ -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
 
=== removed file 'debian/cron.d/quantum-l3-agent-netns-cleanup'
--- debian/cron.d/quantum-l3-agent-netns-cleanup	2013-04-22 14:58:32 +0000
+++ debian/cron.d/quantum-l3-agent-netns-cleanup	1970-01-01 00:00:00 +0000
@@ -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
 
=== removed file 'debian/cron.d/quantum-lbaas-agent-netns-cleanup'
--- debian/cron.d/quantum-lbaas-agent-netns-cleanup	2013-04-22 14:58:32 +0000
+++ debian/cron.d/quantum-lbaas-agent-netns-cleanup	1970-01-01 00:00:00 +0000
@@ -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
 
=== added file 'debian/mans/neutron-linuxbridge-agent.8'
--- debian/mans/neutron-linuxbridge-agent.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-linuxbridge-agent.8	2013-07-17 16:24:24 +0000
@@ -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.
 
=== added file 'debian/mans/neutron-nec-agent.8'
--- debian/mans/neutron-nec-agent.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-nec-agent.8	2013-07-17 16:24:24 +0000
@@ -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.
 
=== added file 'debian/mans/neutron-openvswitch-agent.8'
--- debian/mans/neutron-openvswitch-agent.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-openvswitch-agent.8	2013-07-17 16:24:24 +0000
@@ -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.
 
=== added file 'debian/mans/neutron-rootwrap.8'
--- debian/mans/neutron-rootwrap.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-rootwrap.8	2013-07-17 16:24:24 +0000
@@ -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.
 
=== added file 'debian/mans/neutron-ryu-agent.8'
--- debian/mans/neutron-ryu-agent.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-ryu-agent.8	2013-07-17 16:24:24 +0000
@@ -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.
 
=== added file 'debian/mans/neutron-server.8'
--- debian/mans/neutron-server.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-server.8	2013-07-17 16:24:24 +0000
@@ -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.
 
=== removed file 'debian/mans/quantum-linuxbridge-agent.8'
--- debian/mans/quantum-linuxbridge-agent.8	2012-08-22 01:08:20 +0000
+++ debian/mans/quantum-linuxbridge-agent.8	1970-01-01 00:00:00 +0000
@@ -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.
 
=== removed file 'debian/mans/quantum-nec-agent.8'
--- debian/mans/quantum-nec-agent.8	2013-02-16 23:43:06 +0000
+++ debian/mans/quantum-nec-agent.8	1970-01-01 00:00:00 +0000
@@ -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.
 
=== removed file 'debian/mans/quantum-openvswitch-agent.8'
--- debian/mans/quantum-openvswitch-agent.8	2012-08-22 01:08:20 +0000
+++ debian/mans/quantum-openvswitch-agent.8	1970-01-01 00:00:00 +0000
@@ -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.
 
=== removed file 'debian/mans/quantum-rootwrap.8'
--- debian/mans/quantum-rootwrap.8	2012-08-22 01:08:20 +0000
+++ debian/mans/quantum-rootwrap.8	1970-01-01 00:00:00 +0000
@@ -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.
 
=== removed file 'debian/mans/quantum-ryu-agent.8'
--- debian/mans/quantum-ryu-agent.8	2012-08-22 01:08:20 +0000
+++ debian/mans/quantum-ryu-agent.8	1970-01-01 00:00:00 +0000
@@ -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.
 
=== removed file 'debian/mans/quantum-server.8'
--- debian/mans/quantum-server.8	2012-08-22 01:08:20 +0000
+++ debian/mans/quantum-server.8	1970-01-01 00:00:00 +0000
@@ -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.
 
=== added file 'debian/neutron-common.dirs'
--- debian/neutron-common.dirs	1970-01-01 00:00:00 +0000
+++ debian/neutron-common.dirs	2013-07-17 16:24:24 +0000
@@ -0,0 +1,5 @@
+var/log/neutron
+var/lib/neutron
+etc/neutron
+etc/neutron/rootwrap.d
+etc/neutron/plugins
 
=== added file 'debian/neutron-common.install'
--- debian/neutron-common.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-common.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,12 @@
+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
+debian/neutron_sudoers etc/sudoers.d
+etc/api-paste.ini etc/neutron
+etc/policy.json 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/rootwrap.conf etc/neutron
 
=== added file 'debian/neutron-common.postinst'
--- debian/neutron-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/neutron-common.postinst	2013-07-17 16:24:24 +0000
@@ -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#
 
=== added file 'debian/neutron-dhcp-agent.install'
--- debian/neutron-dhcp-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-dhcp-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,5 @@
+usr/bin/neutron-dhcp-agent usr/bin
+usr/bin/neutron-dhcp-agent-dnsmasq-lease-update usr/bin
+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
 
=== added file 'debian/neutron-dhcp-agent.logrotate'
--- debian/neutron-dhcp-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-dhcp-agent.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/dhcp-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-dhcp-agent.upstart'
--- debian/neutron-dhcp-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-dhcp-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,14 @@
+description "Neutron l3 agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+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
 
=== added file 'debian/neutron-l3-agent.install'
--- debian/neutron-l3-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-l3-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,4 @@
+usr/bin/neutron-l3-agent usr/bin
+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
 
=== added file 'debian/neutron-l3-agent.logrotate'
--- debian/neutron-l3-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-l3-agent.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/l3-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-l3-agent.upstart'
--- debian/neutron-l3-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-l3-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,14 @@
+description "Neutron l3 plugin agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+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
 
=== added file 'debian/neutron-lbaas-agent.install'
--- debian/neutron-lbaas-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-lbaas-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,4 @@
+usr/bin/neutron-lbaas-agent usr/bin
+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
 
=== added file 'debian/neutron-lbaas-agent.logrotate'
--- debian/neutron-lbaas-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-lbaas-agent.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/lbaas-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-lbaas-agent.upstart'
--- debian/neutron-lbaas-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-lbaas-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,14 @@
+description "Neutron LBaaS agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+        mkdir -p /var/run/neutron
+        chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-lbaas-agent -- --config-file=/etc/neutron/lbaas_agent.ini --config-file=/etc/neutron/neutron.conf --log-file=/var/log/neutron/lbaas-agent.log
 
=== added file 'debian/neutron-metadata-agent.install'
--- debian/neutron-metadata-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-metadata-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,3 @@
+usr/bin/neutron-metadata-agent usr/bin
+usr/bin/neutron-ns-metadata-proxy usr/bin
+etc/metadata_agent.ini etc/neutron
 
=== added file 'debian/neutron-metadata-agent.logrotate'
--- debian/neutron-metadata-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-metadata-agent.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/metadata-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-metadata-agent.upstart'
--- debian/neutron-metadata-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-metadata-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,16 @@
+description "Neutron metadata plugin agent"
+author "Yolanda Robla <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/neutron
+	chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metadata-agent -- \
+            --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metadata_agent.ini \
+            --log-file=/var/log/neutron/metadata-agent.log
 
=== added file 'debian/neutron-plugin-bigswitch.install'
--- debian/neutron-plugin-bigswitch.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-bigswitch.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/bigswitch/* etc/neutron/plugins/bigswitch
 
=== added file 'debian/neutron-plugin-brocade.install'
--- debian/neutron-plugin-brocade.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-brocade.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/brocade/* etc/neutron/plugins/brocade
 
=== added file 'debian/neutron-plugin-cisco.install'
--- debian/neutron-plugin-cisco.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-cisco.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/cisco/* etc/neutron/plugins/cisco
 
=== added file 'debian/neutron-plugin-hyperv.install'
--- debian/neutron-plugin-hyperv.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-hyperv.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,2 @@
+usr/bin/neutron-hyperv-agent usr/bin
+etc/neutron/plugins/hyperv/* etc/neutron/plugins/hyperv
 
=== added file 'debian/neutron-plugin-linuxbridge-agent.install'
--- debian/neutron-plugin-linuxbridge-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,2 @@
+usr/bin/neutron-linuxbridge-agent usr/bin
+etc/neutron/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d
 
=== added file 'debian/neutron-plugin-linuxbridge-agent.logrotate'
--- debian/neutron-plugin-linuxbridge-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge-agent.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/linuxbridge-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-plugin-linuxbridge-agent.manpages'
--- debian/neutron-plugin-linuxbridge-agent.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge-agent.manpages	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+debian/mans/neutron-linuxbridge-agent.8
 
=== added file 'debian/neutron-plugin-linuxbridge-agent.upstart'
--- debian/neutron-plugin-linuxbridge-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,14 @@
+description "Neutron server"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+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
 
=== added file 'debian/neutron-plugin-linuxbridge.install'
--- debian/neutron-plugin-linuxbridge.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/linuxbridge/* etc/neutron/plugins/linuxbridge
 
=== added file 'debian/neutron-plugin-metaplugin.install'
--- debian/neutron-plugin-metaplugin.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-metaplugin.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/metaplugin/* etc/neutron/plugins/metaplugin
 
=== added file 'debian/neutron-plugin-midonet.install'
--- debian/neutron-plugin-midonet.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-midonet.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/midonet/* etc/neutron/plugins/midonet
 
=== added file 'debian/neutron-plugin-mlnx-agent.install'
--- debian/neutron-plugin-mlnx-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-mlnx-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,2 @@
+usr/bin/neutron-mlnx-agent usr/bin
+etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx
 
=== added file 'debian/neutron-plugin-mlnx-agent.upstart'
--- debian/neutron-plugin-mlnx-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-mlnx-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,16 @@
+description "Neutron mlnx plugin agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+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
 
=== added file 'debian/neutron-plugin-nec-agent.install'
--- debian/neutron-plugin-nec-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,2 @@
+usr/bin/neutron-nec-agent usr/bin
+etc/neutron/rootwrap.d/nec-plugin.filters etc/neutron/rootwrap.d
 
=== added file 'debian/neutron-plugin-nec-agent.logrotate'
--- debian/neutron-plugin-nec-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec-agent.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/nec-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-plugin-nec-agent.manpages'
--- debian/neutron-plugin-nec-agent.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec-agent.manpages	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+debian/mans/neutron-nec-agent.8
 
=== added file 'debian/neutron-plugin-nec-agent.upstart'
--- debian/neutron-plugin-nec-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,14 @@
+description "Neutron plugin NEC agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/neutron
+	chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-nec-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/nec/nec.ini --log-file=/var/log/neutron/nec-agent.log
 
=== added file 'debian/neutron-plugin-nec.install'
--- debian/neutron-plugin-nec.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/nec/* etc/neutron/plugins/nec
 
=== added file 'debian/neutron-plugin-nicira.install'
--- debian/neutron-plugin-nicira.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nicira.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,2 @@
+etc/neutron/plugins/nicira/* etc/neutron/plugins/nicira
+usr/bin/neutron-check-nvp-config usr/bin
 
=== added file 'debian/neutron-plugin-openvswitch-agent.install'
--- debian/neutron-plugin-openvswitch-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,2 @@
+usr/bin/neutron-openvswitch-agent usr/bin
+etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d
 
=== added file 'debian/neutron-plugin-openvswitch-agent.logrotate'
--- debian/neutron-plugin-openvswitch-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/openvswitch-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-plugin-openvswitch-agent.manpages'
--- debian/neutron-plugin-openvswitch-agent.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.manpages	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+debian/mans/neutron-openvswitch-agent.8
 
=== added file 'debian/neutron-plugin-openvswitch-agent.upstart'
--- debian/neutron-plugin-openvswitch-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,14 @@
+description "Neutron openvswitch plugin agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+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
 
=== added file 'debian/neutron-plugin-openvswitch.install'
--- debian/neutron-plugin-openvswitch.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/openvswitch/* etc/neutron/plugins/openvswitch
 
=== added file 'debian/neutron-plugin-plumgrid.install'
--- debian/neutron-plugin-plumgrid.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-plumgrid.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/plumgrid/* etc/neutron/plugins/plumgrid
 
=== added file 'debian/neutron-plugin-ryu-agent.install'
--- debian/neutron-plugin-ryu-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu-agent.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,2 @@
+usr/bin/neutron-ryu-agent usr/bin
+etc/neutron/rootwrap.d/ryu-plugin.filters etc/neutron/rootwrap.d
 
=== added file 'debian/neutron-plugin-ryu-agent.logrotate'
--- debian/neutron-plugin-ryu-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu-agent.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/ryu-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-plugin-ryu-agent.manpages'
--- debian/neutron-plugin-ryu-agent.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu-agent.manpages	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+debian/mans/neutron-ryu-agent.8
 
=== added file 'debian/neutron-plugin-ryu-agent.upstart'
--- debian/neutron-plugin-ryu-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu-agent.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,14 @@
+description "Neutron plugin ryu agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+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
 
=== added file 'debian/neutron-plugin-ryu.install'
--- debian/neutron-plugin-ryu.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/ryu/* etc/neutron/plugins/ryu
 
=== added file 'debian/neutron-server.default'
--- debian/neutron-server.default	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.default	2013-07-17 16:24:24 +0000
@@ -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"
 
=== added file 'debian/neutron-server.install'
--- debian/neutron-server.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.install	2013-07-17 16:24:24 +0000
@@ -0,0 +1,1 @@
+usr/bin/neutron-server usr/bin
 
=== added file 'debian/neutron-server.logrotate'
--- debian/neutron-server.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.logrotate	2013-07-17 16:24:24 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/server.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-server.manpages'
--- debian/neutron-server.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.manpages	2013-07-17 16:24:24 +0000
@@ -0,0 +1,2 @@
+debian/mans/neutron-server.8
+debian/mans/neutron-rootwrap.8
 
=== added file 'debian/neutron-server.upstart'
--- debian/neutron-server.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.upstart	2013-07-17 16:24:24 +0000
@@ -0,0 +1,20 @@
+description "Neutron server"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+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 "$QUANTUM_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $QUANTUM_PLUGIN_CONFIG"
+        exec start-stop-daemon --start --chuid neutron --exec /usr/bin/qauntum-server -- \
+            --config-file /etc/neutron/neutron.conf \
+            --log-file /var/log/neutron/server.log $CONF_ARG
+end script
 
=== added file 'debian/neutron_sudoers'
--- debian/neutron_sudoers	1970-01-01 00:00:00 +0000
+++ debian/neutron_sudoers	2013-07-17 16:24:24 +0000
@@ -0,0 +1,3 @@
+Defaults:neutron !requiretty
+
+^neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap
 
=== modified file 'debian/patches/fix-quantum-configuration.patch'
--- debian/patches/fix-quantum-configuration.patch	2013-06-20 13:53:29 +0000
+++ debian/patches/fix-quantum-configuration.patch	2013-07-17 16:24:24 +0000
@@ -1,155 +1,12 @@
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/bigswitch/restproxy.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/bigswitch/restproxy.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/bigswitch/restproxy.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/bigswitch/restproxy.ini	2013-06-20 08:39:27.267763537 -0500
-@@ -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
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/brocade/brocade.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/brocade/brocade.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/brocade/brocade.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/brocade/brocade.ini	2013-06-20 08:41:01.359763583 -0500
-@@ -11,7 +11,7 @@
- # ostype   = NOS
- 
- [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
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini	2013-06-20 08:39:27.267763537 -0500
-@@ -4,7 +4,7 @@
- # sql_connection = mysql://quantum:password@127.0.0.1:3306/hyperv_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/hyperv.sqlite
- # Database reconnection retry times - in event connectivity is lost
- # set to -1 implies an infinite retry count
- # sql_max_retries = 10
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2013-06-20 08:39:27.267763537 -0500
-@@ -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
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/midonet/midonet.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/midonet/midonet.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/midonet/midonet.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/midonet/midonet.ini	2013-06-20 08:39:27.267763537 -0500
-@@ -4,7 +4,7 @@
- # sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_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/midonet.sqlite
- # Database reconnection retry times - in event connectivity is lost
- # set to -1 implies an infinite retry count
- # sql_max_retries = 10
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/nec/nec.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/nec/nec.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/nec/nec.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/nec/nec.ini	2013-06-20 08:39:27.267763537 -0500
-@@ -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
-@@ -43,7 +43,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
- 
- [securitygroup]
- # Firewall driver for realizing quantum security group function
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/nicira/nvp.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/nicira/nvp.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/nicira/nvp.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/nicira/nvp.ini	2013-06-20 08:39:27.267763537 -0500
-@@ -68,7 +68,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
- 
- # Number of reconnection attempts to the DB; Set to -1 to try indefinitely
- # sql_max_retries = 10
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-06-20 08:39:27.267763537 -0500
-@@ -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
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/plumgrid/plumgrid.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/plumgrid/plumgrid.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/plumgrid/plumgrid.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/plumgrid/plumgrid.ini	2013-06-20 08:39:27.271763537 -0500
-@@ -6,7 +6,7 @@
- # sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum
- # Replace <host> 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
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/ryu/ryu.ini quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/ryu/ryu.ini
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/ryu/ryu.ini	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/ryu/ryu.ini	2013-06-20 08:39:27.271763537 -0500
-@@ -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://<user>:<pass>@<IP>:<port>/<dbname>
--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
-diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum.conf quantum-2013.2.a814.g9a884ce/etc/quantum.conf
---- quantum-2013.2.a814.g9a884ce.orig/etc/quantum.conf	2013-06-20 08:30:58.000000000 -0500
-+++ quantum-2013.2.a814.g9a884ce/etc/quantum.conf	2013-06-20 08:39:27.271763537 -0500
-@@ -46,12 +46,13 @@ bind_port = 9696
- 
- # Quantum plugin provider module
- # core_plugin =
-+core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2
- 
- # 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'.
-@@ -301,6 +302,7 @@ notification_topics = notifications
- # 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
- 
- # =========== items for agent management extension =============
- # seconds between nodes reporting state to server, should be less than
+diff -Naurp neutron-2013.2.a951.ga79faea.orig/etc/neutron.conf neutron-2013.2.a951.ga79faea/etc/neutron.conf
+--- neutron-2013.2.a951.ga79faea.orig/etc/neutron.conf	2013-07-15 10:38:36.000000000 -0400
++++ neutron-2013.2.a951.ga79faea/etc/neutron.conf	2013-07-15 10:53:13.120144414 -0400
+@@ -330,7 +330,7 @@ signing_dir = /var/lib/quantum/keystone-
+ # connection = mysql://root:pass@127.0.0.1:3306/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.)
+-# connection = sqlite://
++connection = sqlite:////var/lib/neutron/neutron.sqlite
+ 
+ # The SQLAlchemy connection string used to connect to the slave database
+ # slave_connection =
 
=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2013-06-24 19:01:56 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-07-17 16:24:24 +0000
@@ -1,36 +1,26 @@
-Index: quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
-===================================================================
---- quantum.orig/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py	2013-06-24 12:00:24.443676249 -0700
-+++ quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py	2013-06-24 12:00:24.435676250 -0700
-@@ -32,6 +32,7 @@
+diff -Naurp neutron-2013.2.a951.ga79faea.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py neutron-2013.2.a951.ga79faea/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+--- neutron-2013.2.a951.ga79faea.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py	2013-07-15 10:38:36.000000000 -0400
++++ neutron-2013.2.a951.ga79faea/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py	2013-07-15 11:17:48.180145129 -0400
+@@ -32,6 +32,7 @@ from neutron.tests import base
  class TestLinuxBridge(base.BaseTestCase):
  
      def setUp(self):
-+        self.skipTest("Skipped by Ubuntu packaging")
++        self.skipTest("Skipped by Ubuntu Packaging")
          super(TestLinuxBridge, self).setUp()
          self.addCleanup(cfg.CONF.reset)
          interface_mappings = {'physnet1': 'eth1'}
-@@ -139,6 +140,7 @@
+@@ -139,6 +140,7 @@ class TestLinuxBridgeAgent(base.BaseTest
  
  class TestLinuxBridgeManager(base.BaseTestCase):
      def setUp(self):
-+        self.skipTest("Skipped by Ubuntu packaging")
++        self.skipTest("Skipped by Ubuntu packaging") 
          super(TestLinuxBridgeManager, self).setUp()
          self.interface_mappings = {'physnet1': 'eth1'}
          self.root_helper = cfg.CONF.AGENT.root_helper
-@@ -473,6 +475,7 @@
- 
- class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
-     def setUp(self):
-+        self.skipTest("Skipped by Ubuntu packaging")
-         super(TestLinuxBridgeRpcCallbacks, self).setUp()
- 
-         class FakeLBAgent(object):
-Index: quantum/quantum/tests/unit/ml2/test_agent_scheduler.py
-===================================================================
---- quantum.orig/quantum/tests/unit/ml2/test_agent_scheduler.py	2013-06-24 12:00:24.443676249 -0700
-+++ quantum/quantum/tests/unit/ml2/test_agent_scheduler.py	2013-06-24 12:00:24.435676250 -0700
-@@ -19,14 +19,14 @@
+diff -Naurp neutron-2013.2.a951.ga79faea.orig/neutron/tests/unit/ml2/test_agent_scheduler.py neutron-2013.2.a951.ga79faea/neutron/tests/unit/ml2/test_agent_scheduler.py
+--- neutron-2013.2.a951.ga79faea.orig/neutron/tests/unit/ml2/test_agent_scheduler.py	2013-07-15 10:38:36.000000000 -0400
++++ neutron-2013.2.a951.ga79faea/neutron/tests/unit/ml2/test_agent_scheduler.py	2013-07-15 11:43:52.560145888 -0400
+@@ -19,14 +19,14 @@ from neutron.tests.unit.openvswitch impo
  
  class Ml2AgentSchedulerTestCase(
      test_agent_scheduler.OvsAgentSchedulerTestCase):
@@ -48,19 +38,18 @@
      test_agent_scheduler.OvsDhcpAgentNotifierTestCase):
 -    plugin_str = test_ml2_plugin.PLUGIN_NAME
 +    pass
-Index: quantum/quantum/tests/unit/ml2/test_ml2_plugin.py
-===================================================================
---- quantum.orig/quantum/tests/unit/ml2/test_ml2_plugin.py	2013-06-24 12:00:24.443676249 -0700
-+++ quantum/quantum/tests/unit/ml2/test_ml2_plugin.py	2013-06-24 12:00:24.435676250 -0700
-@@ -25,6 +25,7 @@
+diff -Naurp neutron-2013.2.a951.ga79faea.orig/neutron/tests/unit/ml2/test_ml2_plugin.py neutron-2013.2.a951.ga79faea/neutron/tests/unit/ml2/test_ml2_plugin.py
+--- neutron-2013.2.a951.ga79faea.orig/neutron/tests/unit/ml2/test_ml2_plugin.py	2013-07-15 10:38:36.000000000 -0400
++++ neutron-2013.2.a951.ga79faea/neutron/tests/unit/ml2/test_ml2_plugin.py	2013-07-15 11:44:57.300145919 -0400
+@@ -26,6 +26,7 @@ class Ml2PluginV2TestCase(test_plugin.Ne
      _plugin_name = PLUGIN_NAME
  
      def setUp(self):
-+        self.skipTest('Skipped by ubuntu packaging')
-         super(Ml2PluginV2TestCase, self).setUp(PLUGIN_NAME)
-         self.port_create_status = 'DOWN'
- 
-@@ -47,6 +48,7 @@
++        self.skipTest('Skipped by Ubuntu Packaging')
+         # Enable the test mechanism driver to ensure that
+         # we can successfully call through to all mechanism
+         # driver apis.
+@@ -55,6 +56,7 @@ class TestMl2NetworksV2(test_plugin.Test
  class TestMl2PortsV2(test_plugin.TestPortsV2, Ml2PluginV2TestCase):
  
      def test_update_port_status_build(self):
@@ -68,119 +57,14 @@
          with self.port() as port:
              self.assertEqual(port['port']['status'], 'DOWN')
              self.assertEqual(self.port_create_status, 'DOWN')
-Index: quantum/quantum/tests/unit/ml2/test_rpcapi.py
-===================================================================
---- quantum.orig/quantum/tests/unit/ml2/test_rpcapi.py	2013-06-24 12:00:24.443676249 -0700
-+++ quantum/quantum/tests/unit/ml2/test_rpcapi.py	2013-06-24 12:00:24.439676249 -0700
-@@ -30,6 +30,7 @@
- class RpcApiTestCase(base.BaseTestCase):
- 
-     def _test_rpc_api(self, rpcapi, topic, method, rpc_method, **kwargs):
-+        self.skipTest('Skipped by Ubuntu packiging')
-         ctxt = context.RequestContext('fake_user', 'fake_project')
-         expected_retval = 'foo' if method == 'call' else None
-         expected_msg = rpcapi.make_msg(method, **kwargs)
-@@ -51,6 +52,7 @@
-             self.assertEqual(arg, expected_arg)
- 
-     def test_delete_network(self):
-+        self.skipTest('Skipped by Ubuntu packiging')
-         rpcapi = plugin_rpc.AgentNotifierApi(topics.AGENT)
-         self._test_rpc_api(rpcapi,
-                            topics.get_topic_name(topics.AGENT,
-@@ -60,6 +62,7 @@
-                            network_id='fake_request_spec')
- 
-     def test_port_update(self):
-+        self.skipTest('Skipped by Ubuntu packiging')
-         rpcapi = plugin_rpc.AgentNotifierApi(topics.AGENT)
-         self._test_rpc_api(rpcapi,
-                            topics.get_topic_name(topics.AGENT,
-@@ -81,6 +84,7 @@
-     #                        tunnel_ip='fake_ip', tunnel_id='fake_id')
- 
-     def test_device_details(self):
-+        self.skipTest('Skipped by Ubuntu packiging')
-         rpcapi = agent_rpc.PluginApi(topics.PLUGIN)
-         self._test_rpc_api(rpcapi, topics.PLUGIN,
-                            'get_device_details', rpc_method='call',
-@@ -88,6 +92,7 @@
-                            agent_id='fake_agent_id')
- 
-     def test_update_device_down(self):
-+        self.skipTest('Skipped by Ubuntu packiging')
-         rpcapi = agent_rpc.PluginApi(topics.PLUGIN)
-         self._test_rpc_api(rpcapi, topics.PLUGIN,
-                            'update_device_down', rpc_method='call',
-@@ -101,6 +106,7 @@
-     #                        tunnel_ip='fake_tunnel_ip')
- 
-     def test_update_device_up(self):
-+        self.skipTest('Skipped by Ubuntu packiging')
-         rpcapi = agent_rpc.PluginApi(topics.PLUGIN)
-         self._test_rpc_api(rpcapi, topics.PLUGIN,
-                            'update_device_up', rpc_method='call',
-Index: quantum/quantum/tests/unit/ml2/test_security_group.py
-===================================================================
---- quantum.orig/quantum/tests/unit/ml2/test_security_group.py	2013-06-24 12:00:24.443676249 -0700
-+++ quantum/quantum/tests/unit/ml2/test_security_group.py	2013-06-24 12:00:24.439676249 -0700
-@@ -30,6 +30,7 @@
+diff -Naurp neutron-2013.2.a951.ga79faea.orig/neutron/tests/unit/ml2/test_security_group.py neutron-2013.2.a951.ga79faea/neutron/tests/unit/ml2/test_security_group.py
+--- neutron-2013.2.a951.ga79faea.orig/neutron/tests/unit/ml2/test_security_group.py	2013-07-15 10:38:36.000000000 -0400
++++ neutron-2013.2.a951.ga79faea/neutron/tests/unit/ml2/test_security_group.py	2013-07-15 11:20:21.840145204 -0400
+@@ -30,6 +30,7 @@ class Ml2SecurityGroupsTestCase(test_sg.
      _plugin_name = PLUGIN_NAME
  
      def setUp(self, plugin=None):
-+        self.skipTest('Skipped by Ubuntu packiging')
++        self.skipTest("Skipped by Ubuntu packaging")
          test_sg_rpc.set_firewall_driver(test_sg_rpc.FIREWALL_HYBRID_DRIVER)
          self.addCleanup(mock.patch.stopall)
          notifier_p = mock.patch(NOTIFIER)
-@@ -52,6 +53,7 @@
-                             test_sg.TestSecurityGroups,
-                             test_sg_rpc.SGNotificationTestMixin):
-     def test_security_group_get_port_from_device(self):
-+        self.skipTest('Skipped by Ubuntu packiging')
-         with self.network() as n:
-             with self.subnet(n):
-                 with self.security_group() as sg:
-@@ -80,6 +82,7 @@
-                     self._delete('ports', port_id)
- 
-     def test_security_group_get_port_from_device_with_no_port(self):
-+        self.skipTest('Skipped by Ubuntu packiging')
-         plugin = manager.QuantumManager.get_plugin()
-         port_dict = plugin.callbacks.get_port_from_device('bad_device_id')
-         self.assertEqual(None, port_dict)
-Index: quantum/quantum/tests/unit/test_db_plugin.py
-===================================================================
---- quantum.orig/quantum/tests/unit/test_db_plugin.py	2013-06-24 12:00:24.443676249 -0700
-+++ quantum/quantum/tests/unit/test_db_plugin.py	2013-06-24 12:00:24.439676249 -0700
-@@ -1381,6 +1381,7 @@
-                 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 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)
-@@ -3339,6 +3341,7 @@
-                                  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',
-@@ -3443,6 +3446,7 @@
-             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']
 
=== added file 'debian/patches/ignore-quantum-binaries.patch'
--- debian/patches/ignore-quantum-binaries.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ignore-quantum-binaries.patch	2013-07-17 16:24:24 +0000
@@ -0,0 +1,39 @@
+Description: Dont install quantum binaries
+Author: Chuck Short <[e-mail]>
+Forwarded: No
+diff -Naurp neutron-2013.2.a951.ga79faea.orig/setup.cfg neutron-2013.2.a951.ga79faea/setup.cfg
+--- neutron-2013.2.a951.ga79faea.orig/setup.cfg	2013-07-15 10:40:09.000000000 -0400
++++ neutron-2013.2.a951.ga79faea/setup.cfg	2013-07-16 15:35:26.246307484 -0400
+@@ -57,7 +57,6 @@ data_files =
+ 	etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
+ 	etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini
+ scripts = 
+-	bin/quantum-rootwrap
+ 	bin/neutron-rootwrap
+ 
+ [global]
+@@ -85,24 +84,6 @@ console_scripts =
+ 	neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
+ 	neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
+ 	neutron-server = neutron.server:main
+-	quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
+-	quantum-db-manage = neutron.db.migration.cli:main
+-	quantum-debug = neutron.debug.shell:main
+-	quantum-dhcp-agent = neutron.agent.dhcp_agent:main
+-	quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
+-	quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
+-	quantum-l3-agent = neutron.agent.l3_agent:main
+-	quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
+-	quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
+-	quantum-metadata-agent = neutron.agent.metadata.agent:main
+-	quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
+-	quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
+-	quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main
+-	quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
+-	quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
+-	quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
+-	quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
+-	quantum-server = neutron.server:main
+ neutron.ml2.type_drivers = 
+ 	flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver
+ 	local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-03 22:59:19 +0000
+++ debian/patches/series	2013-07-17 16:24:24 +0000
@@ -1,2 +1,3 @@
 fix-quantum-configuration.patch
 fix-ubuntu-tests.patch
+ignore-quantum-binaries.patch
 
=== renamed file 'debian/python-quantum.install' => 'debian/python-neutron.install'
=== removed file 'debian/quantum-common.dirs'
--- debian/quantum-common.dirs	2012-09-10 20:16:42 +0000
+++ debian/quantum-common.dirs	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-var/log/quantum
-var/lib/quantum
-etc/quantum
-etc/quantum/rootwrap.d
-etc/quantum/plugins
 
=== removed file 'debian/quantum-common.install'
--- debian/quantum-common.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-common.install	1970-01-01 00:00:00 +0000
@@ -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
 
=== removed file 'debian/quantum-common.postinst'
--- debian/quantum-common.postinst	2012-12-06 15:36:42 +0000
+++ debian/quantum-common.postinst	1970-01-01 00:00:00 +0000
@@ -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#
 
=== removed file 'debian/quantum-dhcp-agent.install'
--- debian/quantum-dhcp-agent.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-dhcp-agent.install	1970-01-01 00:00:00 +0000
@@ -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
 
=== removed file 'debian/quantum-dhcp-agent.logrotate'
--- debian/quantum-dhcp-agent.logrotate	2012-09-11 20:31:26 +0000
+++ debian/quantum-dhcp-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/dhcp-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-dhcp-agent.upstart'
--- debian/quantum-dhcp-agent.upstart	2012-09-11 21:45:04 +0000
+++ debian/quantum-dhcp-agent.upstart	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-description "Quantum l3 agent"
-author "Chuck Short <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum-l3-agent.install'
--- debian/quantum-l3-agent.install	2013-03-08 10:42:58 +0000
+++ debian/quantum-l3-agent.install	1970-01-01 00:00:00 +0000
@@ -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
 
=== removed file 'debian/quantum-l3-agent.logrotate'
--- debian/quantum-l3-agent.logrotate	2012-09-11 20:31:26 +0000
+++ debian/quantum-l3-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/l3-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-l3-agent.upstart'
--- debian/quantum-l3-agent.upstart	2013-03-08 10:42:58 +0000
+++ debian/quantum-l3-agent.upstart	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-description "Quantum l3 plugin agent"
-author "Chuck Short <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum-lbaas-agent.install'
--- debian/quantum-lbaas-agent.install	2013-03-08 10:42:58 +0000
+++ debian/quantum-lbaas-agent.install	1970-01-01 00:00:00 +0000
@@ -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
 
=== removed file 'debian/quantum-lbaas-agent.logrotate'
--- debian/quantum-lbaas-agent.logrotate	2013-03-03 22:59:19 +0000
+++ debian/quantum-lbaas-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/lbaas-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-lbaas-agent.upstart'
--- debian/quantum-lbaas-agent.upstart	2013-03-03 22:59:19 +0000
+++ debian/quantum-lbaas-agent.upstart	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-description "Quantum LBaaS agent"
-author "Chuck Short <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum-metadata-agent.install'
--- debian/quantum-metadata-agent.install	2013-03-08 10:42:58 +0000
+++ debian/quantum-metadata-agent.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-bin/quantum-metadata-agent usr/bin
-bin/quantum-ns-metadata-proxy usr/bin
-etc/metadata_agent.ini etc/quantum
 
=== removed file 'debian/quantum-metadata-agent.logrotate'
--- debian/quantum-metadata-agent.logrotate	2013-03-08 10:42:58 +0000
+++ debian/quantum-metadata-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/metadata-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-metadata-agent.upstart'
--- debian/quantum-metadata-agent.upstart	2013-03-08 10:42:58 +0000
+++ debian/quantum-metadata-agent.upstart	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-description "Quantum metadata plugin agent"
-author "Yolanda Robla <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum-plugin-bigswitch.install'
--- debian/quantum-plugin-bigswitch.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-plugin-bigswitch.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/bigswitch/* etc/quantum/plugins/bigswitch
 
=== removed file 'debian/quantum-plugin-brocade.install'
--- debian/quantum-plugin-brocade.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-plugin-brocade.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/brocade/* etc/quantum/plugins/brocade
 
=== removed file 'debian/quantum-plugin-cisco.install'
--- debian/quantum-plugin-cisco.install	2012-06-22 16:51:14 +0000
+++ debian/quantum-plugin-cisco.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/cisco/* etc/quantum/plugins/cisco
 
=== removed file 'debian/quantum-plugin-hyperv.install'
--- debian/quantum-plugin-hyperv.install	2013-02-19 15:28:20 +0000
+++ debian/quantum-plugin-hyperv.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/hyperv/* etc/quantum/plugins/hyperv
 
=== removed file 'debian/quantum-plugin-linuxbridge-agent.install'
--- debian/quantum-plugin-linuxbridge-agent.install	2012-12-06 12:19:05 +0000
+++ debian/quantum-plugin-linuxbridge-agent.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bin/quantum-linuxbridge-agent usr/bin
-etc/quantum/rootwrap.d/linuxbridge-plugin.filters etc/quantum/rootwrap.d
 
=== removed file 'debian/quantum-plugin-linuxbridge-agent.logrotate'
--- debian/quantum-plugin-linuxbridge-agent.logrotate	2012-09-11 20:31:26 +0000
+++ debian/quantum-plugin-linuxbridge-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/linuxbridge-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-plugin-linuxbridge-agent.manpages'
--- debian/quantum-plugin-linuxbridge-agent.manpages	2012-08-22 01:08:20 +0000
+++ debian/quantum-plugin-linuxbridge-agent.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/mans/quantum-linuxbridge-agent.8
 
=== removed file 'debian/quantum-plugin-linuxbridge-agent.upstart'
--- debian/quantum-plugin-linuxbridge-agent.upstart	2012-12-06 15:36:42 +0000
+++ debian/quantum-plugin-linuxbridge-agent.upstart	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-description "Quantum server"
-author "Chuck Short <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum-plugin-linuxbridge.install'
--- debian/quantum-plugin-linuxbridge.install	2012-08-22 00:58:49 +0000
+++ debian/quantum-plugin-linuxbridge.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/linuxbridge/* etc/quantum/plugins/linuxbridge
 
=== removed file 'debian/quantum-plugin-metaplugin.install'
--- debian/quantum-plugin-metaplugin.install	2012-09-04 14:58:22 +0000
+++ debian/quantum-plugin-metaplugin.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/metaplugin/* etc/quantum/plugins/metaplugin
 
=== removed file 'debian/quantum-plugin-midonet.install'
--- debian/quantum-plugin-midonet.install	2013-03-03 22:59:19 +0000
+++ debian/quantum-plugin-midonet.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/midonet/* etc/quantum/plugins/midonet
 
=== removed file 'debian/quantum-plugin-nec-agent.install'
--- debian/quantum-plugin-nec-agent.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-plugin-nec-agent.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bin/quantum-nec-agent usr/bin
-etc/quantum/rootwrap.d/nec-plugin.filters etc/quantum/rootwrap.d
 
=== removed file 'debian/quantum-plugin-nec-agent.logrotate'
--- debian/quantum-plugin-nec-agent.logrotate	2013-02-16 23:43:06 +0000
+++ debian/quantum-plugin-nec-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/nec-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-plugin-nec-agent.manpages'
--- debian/quantum-plugin-nec-agent.manpages	2013-02-16 23:43:06 +0000
+++ debian/quantum-plugin-nec-agent.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/mans/quantum-nec-agent.8
 
=== removed file 'debian/quantum-plugin-nec-agent.upstart'
--- debian/quantum-plugin-nec-agent.upstart	2013-02-16 23:43:06 +0000
+++ debian/quantum-plugin-nec-agent.upstart	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-description "Quantum plugin NEC agent"
-author "Chuck Short <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum-plugin-nec.install'
--- debian/quantum-plugin-nec.install	2013-02-19 22:33:53 +0000
+++ debian/quantum-plugin-nec.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/nec/* etc/quantum/plugins/nec
 
=== removed file 'debian/quantum-plugin-nicira.install'
--- debian/quantum-plugin-nicira.install	2013-03-08 10:42:58 +0000
+++ debian/quantum-plugin-nicira.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-etc/quantum/plugins/nicira/* etc/quantum/plugins/nicira
-bin/quantum-check-nvp-config usr/bin
 
=== removed file 'debian/quantum-plugin-openvswitch-agent.install'
--- debian/quantum-plugin-openvswitch-agent.install	2012-12-06 12:19:05 +0000
+++ debian/quantum-plugin-openvswitch-agent.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bin/quantum-openvswitch-agent usr/bin
-etc/quantum/rootwrap.d/openvswitch-plugin.filters etc/quantum/rootwrap.d
 
=== removed file 'debian/quantum-plugin-openvswitch-agent.logrotate'
--- debian/quantum-plugin-openvswitch-agent.logrotate	2012-09-11 20:31:26 +0000
+++ debian/quantum-plugin-openvswitch-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/openvswitch-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-plugin-openvswitch-agent.manpages'
--- debian/quantum-plugin-openvswitch-agent.manpages	2012-08-22 01:08:20 +0000
+++ debian/quantum-plugin-openvswitch-agent.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/mans/quantum-openvswitch-agent.8
 
=== removed file 'debian/quantum-plugin-openvswitch-agent.upstart'
--- debian/quantum-plugin-openvswitch-agent.upstart	2012-12-06 15:36:42 +0000
+++ debian/quantum-plugin-openvswitch-agent.upstart	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-description "Quantum openvswitch plugin agent"
-author "Chuck Short <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum-plugin-openvswitch.install'
--- debian/quantum-plugin-openvswitch.install	2012-09-11 18:09:05 +0000
+++ debian/quantum-plugin-openvswitch.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/openvswitch/* etc/quantum/plugins/openvswitch
 
=== removed file 'debian/quantum-plugin-plumgrid.install'
--- debian/quantum-plugin-plumgrid.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-plugin-plumgrid.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/plumgrid/* etc/quantum/plugins/plumgrid
 
=== removed file 'debian/quantum-plugin-ryu-agent.install'
--- debian/quantum-plugin-ryu-agent.install	2012-12-06 12:19:05 +0000
+++ debian/quantum-plugin-ryu-agent.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bin/quantum-ryu-agent usr/bin
-etc/quantum/rootwrap.d/ryu-plugin.filters etc/quantum/rootwrap.d
 
=== removed file 'debian/quantum-plugin-ryu-agent.logrotate'
--- debian/quantum-plugin-ryu-agent.logrotate	2012-09-11 20:31:26 +0000
+++ debian/quantum-plugin-ryu-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/ryu-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-plugin-ryu-agent.manpages'
--- debian/quantum-plugin-ryu-agent.manpages	2012-08-22 01:08:20 +0000
+++ debian/quantum-plugin-ryu-agent.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/mans/quantum-ryu-agent.8
 
=== removed file 'debian/quantum-plugin-ryu-agent.upstart'
--- debian/quantum-plugin-ryu-agent.upstart	2012-12-06 15:36:42 +0000
+++ debian/quantum-plugin-ryu-agent.upstart	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-description "Quantum plugin ryu agent"
-author "Chuck Short <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum-plugin-ryu.install'
--- debian/quantum-plugin-ryu.install	2012-06-22 16:51:14 +0000
+++ debian/quantum-plugin-ryu.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/quantum/plugins/ryu/* etc/quantum/plugins/ryu
 
=== removed file 'debian/quantum-server.default'
--- debian/quantum-server.default	2012-09-13 19:12:14 +0000
+++ debian/quantum-server.default	1970-01-01 00:00:00 +0000
@@ -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"
 
=== removed file 'debian/quantum-server.install'
--- debian/quantum-server.install	2013-02-19 22:33:53 +0000
+++ debian/quantum-server.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-bin/quantum-server usr/bin
 
=== removed file 'debian/quantum-server.logrotate'
--- debian/quantum-server.logrotate	2012-09-11 20:31:26 +0000
+++ debian/quantum-server.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/quantum/server.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/quantum-server.manpages'
--- debian/quantum-server.manpages	2012-08-22 01:08:20 +0000
+++ debian/quantum-server.manpages	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-debian/mans/quantum-server.8
-debian/mans/quantum-rootwrap.8
 
=== removed file 'debian/quantum-server.upstart'
--- debian/quantum-server.upstart	2012-12-06 15:36:42 +0000
+++ debian/quantum-server.upstart	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-description "Quantum server"
-author "Chuck Short <[e-mail]>"
-
-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
 
=== removed file 'debian/quantum_sudoers'
--- debian/quantum_sudoers	2012-06-22 16:49:25 +0000
+++ debian/quantum_sudoers	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-Defaults:quantum !requiretty
-
-quantum ALL = (root) NOPASSWD: /usr/bin/quantum-rootwrap
 
=== modified file 'debian/rules'
--- debian/rules	2013-03-08 10:42:58 +0000
+++ debian/rules	2013-07-17 16:24:24 +0000
@@ -7,14 +7,14 @@
 	dh $@  --with python2
 
 override_dh_install:
-	dh_install --fail-missing -X/usr/etc -X/usr/bin
+	dh_install --fail-missing -X/usr/etc
+
+override_dh_auto_clean:
+	dh_clean
 
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area
 
-override_dh_auto_clean:
-	dh_clean
-
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
 	./run_tests.sh -N -P
 
=== modified file 'debian/tests/control'
--- debian/tests/control	2013-06-04 10:17:18 +0000
+++ debian/tests/control	2013-07-17 16:24:24 +0000
@@ -1,4 +1,4 @@
-Tests: quantum-daemons python-quantum
-Depends: quantum-server, quantum-l3-agent, quantum-dhcp-agent, quantum-metadata-agent,
- quantum-lbaas-agent, python-quantum
+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
 
=== renamed file 'debian/tests/quantum-daemons' => 'debian/tests/neutron-daemons'
--- debian/tests/quantum-daemons	2013-06-04 10:17:18 +0000
+++ debian/tests/neutron-daemons	2013-07-17 16:24:24 +0000
@@ -1,9 +1,9 @@
 #!/bin/bash
 #-----------------------
-# Testing quantum-daemon
+# Testing neutron-daemon
 #-----------------------
 set -e
-DAEMONS=('quantum-server' 'quantum-l3-agent' 'quantum-dhcp-agent' 'quantum-metadata-agent' 'quantum-lbaas-agent')
+DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent' 'neutron-lbaas-agent')
 for daemon in "${DAEMONS[@]}"; do
     if pidof -x $daemon > /dev/null; then
         echo "OK"
 
=== renamed file 'debian/tests/python-quantum' => 'debian/tests/python-neutron'
--- debian/tests/python-quantum	2013-06-04 10:17:18 +0000
+++ debian/tests/python-neutron	2013-07-17 16:24:24 +0000
@@ -4,9 +4,9 @@
 #-------------------------
 set -e
 
-result=$(python `dirname $0`/test_import_quantum.py 2>&1)
+result=$(python `dirname $0`/test_import_neutron.py 2>&1)
 if [ "$result" ]; then
-    echo "ERROR: PYTHON-QUANTUM MODULE CANNOT BE IMPORTED"
+    echo "ERROR: PYTHON-NEUTRON MODULE CANNOT BE IMPORTED"
     exit 1
 else
     echo "OK"
 
=== renamed file 'debian/tests/test_import_quantum.py' => 'debian/tests/test_import_neutron.py'
--- debian/tests/test_import_quantum.py	2013-06-04 10:17:18 +0000
+++ debian/tests/test_import_neutron.py	2013-07-17 16:24:24 +0000
@@ -1,4 +1,4 @@
 try:
-    import quantum
+    import neutron
 except ImportError, e:
     print "ERROR IMPORTING MODULE"
 
=== modified file 'debian/watch'
--- debian/watch	2013-03-01 14:15:07 +0000
+++ debian/watch	2013-07-17 16:24:24 +0000
@@ -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