Merge lp:~james-page/neutron/grizzly-fix-ppa into lp:~openstack-ubuntu-testing/neutron/grizzly

[James Page]

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-03 22:59:19 +0000
+++ debian/changelog	2013-03-04 09:10:52 +0000
@@ -16,6 +16,10 @@
   * d/control,quantum-lbaas-*: Added Load Balancing as-a Service agent
     package. 
   * d/control: Bumped Standards-Version, no changes.
+  * d/p/fix-quantum-configuration.patch: Added midonet sqlite path to
+    patch, fixed up linuxbridge path. 
+  * d/p/fix-ubuntu-tests.patch: Re-added skipTest for linuxbridge tests
+    that attempt to setup udev monitors.
 
  -- Chuck Short <[e-mail]>  Tue, 26 Feb 2013 08:27:14 -0600
 

=== modified file 'debian/patches/fix-quantum-configuration.patch'
--- debian/patches/fix-quantum-configuration.patch	2013-02-26 14:32:08 +0000
+++ debian/patches/fix-quantum-configuration.patch	2013-03-04 09:10:52 +0000
@@ -1,6 +1,5 @@
-diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/bigswitch/restproxy.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/bigswitch/restproxy.ini
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/bigswitch/restproxy.ini	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/bigswitch/restproxy.ini	2013-02-26 08:29:05.948260373 -0600
+--- a/etc/quantum/plugins/bigswitch/restproxy.ini
++++ b/etc/quantum/plugins/bigswitch/restproxy.ini
 @@ -6,7 +6,7 @@
  # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
  # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -10,9 +9,8 @@
  # 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.1.a38.g511ac76.orig/etc/quantum/plugins/brocade/brocade.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/brocade/brocade.ini
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/brocade/brocade.ini	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/brocade/brocade.ini	2013-02-26 08:29:05.952260373 -0600
+--- a/etc/quantum/plugins/brocade/brocade.ini
++++ b/etc/quantum/plugins/brocade/brocade.ini
 @@ -11,7 +11,7 @@
  # ostype   = NOS
  
@@ -22,21 +20,19 @@
  # 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.1.a38.g511ac76.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2013-02-26 08:29:05.948260373 -0600
+--- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
++++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
 @@ -26,7 +26,7 @@
  # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
  # Replace 127.0.0.1 above with the IP address of the database used by the
  # main quantum server. (Leave it as is if the database runs on this host.)
 -sql_connection = sqlite://
-+sql_connection = sqlite:///var/lib/quantum/linuxbridge.sqlite
++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.1.a38.g511ac76.orig/etc/quantum/plugins/nec/nec.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nec/nec.ini
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nec/nec.ini	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nec/nec.ini	2013-02-26 08:29:05.948260373 -0600
+--- a/etc/quantum/plugins/nec/nec.ini
++++ b/etc/quantum/plugins/nec/nec.ini
 @@ -6,7 +6,7 @@
  # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
  # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -55,9 +51,8 @@
  
  [SECURITYGROUP]
  # Firewall driver for realizing quantum security group function
-diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nicira/nvp.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nicira/nvp.ini
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nicira/nvp.ini	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nicira/nvp.ini	2013-02-26 08:29:05.948260373 -0600
+--- a/etc/quantum/plugins/nicira/nvp.ini
++++ b/etc/quantum/plugins/nicira/nvp.ini
 @@ -4,7 +4,7 @@
  # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum
  # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -67,9 +62,8 @@
  # 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.1.a38.g511ac76.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-02-26 08:29:05.948260373 -0600
+--- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
++++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
 @@ -4,7 +4,7 @@
  # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
  # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -79,9 +73,8 @@
  # 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.1.a38.g511ac76.orig/etc/quantum/plugins/plumgrid/plumgrid.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/plumgrid/plumgrid.ini
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/plumgrid/plumgrid.ini	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/plumgrid/plumgrid.ini	2013-02-26 08:29:05.948260373 -0600
+--- a/etc/quantum/plugins/plumgrid/plumgrid.ini
++++ b/etc/quantum/plugins/plumgrid/plumgrid.ini
 @@ -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
@@ -91,9 +84,8 @@
  # 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.1.a38.g511ac76.orig/etc/quantum/plugins/ryu/ryu.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/ryu/ryu.ini
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/ryu/ryu.ini	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/ryu/ryu.ini	2013-02-26 08:29:05.948260373 -0600
+--- a/etc/quantum/plugins/ryu/ryu.ini
++++ b/etc/quantum/plugins/ryu/ryu.ini
 @@ -2,7 +2,7 @@
  # This line MUST be changed to actually run the plugin.
  # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum
@@ -103,9 +95,8 @@
  # 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.1.a38.g511ac76.orig/etc/quantum.conf quantum-2013.1.a38.g511ac76/etc/quantum.conf
---- quantum-2013.1.a38.g511ac76.orig/etc/quantum.conf	2013-02-26 08:24:56.000000000 -0600
-+++ quantum-2013.1.a38.g511ac76/etc/quantum.conf	2013-02-26 08:29:05.948260373 -0600
+--- a/etc/quantum.conf
++++ b/etc/quantum.conf
 @@ -43,12 +43,13 @@ bind_port = 9696
  
  # Quantum plugin provider module
@@ -121,7 +112,7 @@
  
  # The strategy to be used for auth.
  # Supported values are 'keystone'(default), 'noauth'.
-@@ -226,6 +227,7 @@ notification_topics = notifications
+@@ -251,6 +252,7 @@ notification_topics = notifications
  # root filter facility.
  # Change to "sudo" to skip the filtering and just run the comand directly
  # root_helper = sudo
@@ -129,3 +120,14 @@
  
  # =========== items for agent management extension =============
  # seconds between nodes reporting state to server, should be less than
+--- a/etc/quantum/plugins/midonet/midonet.ini
++++ b/etc/quantum/plugins/midonet/midonet.ini
+@@ -4,7 +4,7 @@
+ # sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum
+ # 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

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2013-02-27 15:02:09 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-03-04 09:10:52 +0000
@@ -1,6 +1,5 @@
-diff -Naurp quantum-2013.1.a49.g598483f.orig/quantum/tests/unit/midonet/test_midonet_plugin.py quantum-2013.1.a49.g598483f/quantum/tests/unit/midonet/test_midonet_plugin.py
---- quantum-2013.1.a49.g598483f.orig/quantum/tests/unit/midonet/test_midonet_plugin.py	2013-02-27 07:42:40.000000000 -0600
-+++ quantum-2013.1.a49.g598483f/quantum/tests/unit/midonet/test_midonet_plugin.py	2013-02-27 08:59:59.752884924 -0600
+--- a/quantum/tests/unit/midonet/test_midonet_plugin.py
++++ b/quantum/tests/unit/midonet/test_midonet_plugin.py
 @@ -470,6 +470,7 @@ class TestMidonetSubnetsV2(test_plugin.T
                self).test_create_subnet_with_one_host_route()
  
@@ -9,10 +8,9 @@
          _bridge, _subnet = self._setup_subnet_mocks()
          super(TestMidonetSubnetsV2,
                self).test_create_subnet_with_two_host_routes()
-diff -Naurp quantum-2013.1.a49.g598483f.orig/quantum/tests/unit/test_db_plugin.py quantum-2013.1.a49.g598483f/quantum/tests/unit/test_db_plugin.py
---- quantum-2013.1.a49.g598483f.orig/quantum/tests/unit/test_db_plugin.py	2013-02-27 07:42:40.000000000 -0600
-+++ quantum-2013.1.a49.g598483f/quantum/tests/unit/test_db_plugin.py	2013-02-27 09:01:30.136884968 -0600
-@@ -1371,6 +1371,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_
+--- a/quantum/tests/unit/test_db_plugin.py
++++ b/quantum/tests/unit/test_db_plugin.py
+@@ -1392,6 +1392,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_
                  self._delete('ports', port4['port']['id'])
  
      def test_range_allocation(self):
@@ -20,7 +18,7 @@
          with self.subnet(gateway_ip='10.0.0.3',
                           cidr='10.0.0.0/29') as subnet:
                  kwargs = {"fixed_ips":
-@@ -2270,6 +2271,7 @@ class TestNetworksV2(QuantumDbPluginV2Te
+@@ -2291,6 +2292,7 @@ class TestNetworksV2(QuantumDbPluginV2Te
  class TestSubnetsV2(QuantumDbPluginV2TestCase):
  
      def _test_create_subnet(self, network=None, expected=None, **kwargs):
@@ -28,7 +26,7 @@
          keys = kwargs.copy()
          keys.setdefault('cidr', '10.0.0.0/24')
          keys.setdefault('ip_version', 4)
-@@ -3257,6 +3259,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes
+@@ -3278,6 +3280,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes
                                   host_routes=host_routes)
  
      def test_create_subnet_with_two_host_routes(self):
@@ -36,7 +34,7 @@
          gateway_ip = '10.0.0.1'
          cidr = '10.0.0.0/24'
          allocation_pools = [{'start': '10.0.0.2',
-@@ -3361,6 +3364,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes
+@@ -3382,6 +3385,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes
              self.assertEqual(res.status_int, 400)
  
      def test_delete_subnet_with_dns(self):
@@ -44,3 +42,13 @@
          gateway_ip = '10.0.0.1'
          cidr = '10.0.0.0/24'
          dns_nameservers = ['1.2.3.4']
+--- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
++++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
+@@ -26,6 +26,7 @@ class TestLinuxBridge(testtools.TestCase
+ 
+     def setUp(self):
+         super(TestLinuxBridge, self).setUp()
++        self.skipTest('No udev access on Ubuntu buildd.')
+         self.addCleanup(cfg.CONF.reset)
+         interface_mappings = {'physnet1': 'eth1'}
+         root_helper = cfg.CONF.AGENT.root_helper