Merge lp:~yolanda.robla/neutron/grizzly into lp:~openstack-ubuntu-testing/neutron/grizzly

[Yolanda Robla]

Refreshed patches

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-07 02:38:29 +0000
+++ debian/changelog	2013-02-12 19:26:19 +0000
@@ -1,12 +1,16 @@
 quantum (2013.1~g3ppa-0ubuntu3) UNRELEASED; urgency=low
 
+  [ Adam Gandelman ]
   * debian/patches/fix-quantunm-configuration.patch: Refreshed and update to
     reflect new global root_wrap configuration defined only in
     /etc/quantum/quantum.conf.
   * debian/patches/fix-ubuntu-tests.patch: Refreshed, added skipTests for
     linuxbridge tests that attempt to setup udev monitors.
 
- -- Adam Gandelman <[e-mail]>  Wed, 06 Feb 2013 15:35:34 -0800
+  [ Yolanda Robla ]
+  * debian/patches: refreshed patches
+
+ -- Yolanda Robla <[e-mail]>  Tue, 12 Feb 2013 18:31:34 +0100
 
 quantum (2013.1~g2-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/patches/fix-quantum-configuration.patch'
--- debian/patches/fix-quantum-configuration.patch	2013-02-06 23:38:47 +0000
+++ debian/patches/fix-quantum-configuration.patch	2013-02-12 19:26:19 +0000
@@ -1,7 +1,7 @@
-Index: quantum/etc/dhcp_agent.ini
+Index: git_quantum/etc/dhcp_agent.ini
 ===================================================================
---- quantum.orig/etc/dhcp_agent.ini	2013-02-06 15:25:44.158208751 -0800
-+++ quantum/etc/dhcp_agent.ini	2013-02-06 15:29:57.286199452 -0800
+--- git_quantum.orig/etc/dhcp_agent.ini	2013-02-12 17:28:13.000000000 +0000
++++ git_quantum/etc/dhcp_agent.ini	2013-02-12 17:28:26.410834889 +0000
 @@ -4,7 +4,7 @@
  
  # Where to store dnsmasq state files.  This directory must be writable by the
@@ -11,10 +11,10 @@
  
  # The DHCP agent will resync its state with Quantum to recover from any
  # transient notification or rpc errors. The interval is number of
-Index: quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
+Index: git_quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
 ===================================================================
---- quantum.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2013-02-06 15:25:44.158208751 -0800
-+++ quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2013-02-06 15:29:57.286199452 -0800
+--- git_quantum.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2013-02-12 17:28:13.000000000 +0000
++++ git_quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2013-02-12 17:28:26.410834889 +0000
 @@ -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
@@ -24,10 +24,10 @@
  # Database reconnection retry times - in event connectivity is lost
  # set to -1 implies an infinite retry count
  # sql_max_retries = 10
-Index: quantum/etc/quantum.conf
+Index: git_quantum/etc/quantum.conf
 ===================================================================
---- quantum.orig/etc/quantum.conf	2013-02-06 15:25:44.158208751 -0800
-+++ quantum/etc/quantum.conf	2013-02-06 15:31:23.514196284 -0800
+--- git_quantum.orig/etc/quantum.conf	2013-02-12 17:28:13.000000000 +0000
++++ git_quantum/etc/quantum.conf	2013-02-12 17:28:26.414834907 +0000
 @@ -39,12 +39,13 @@
  
  # Quantum plugin provider module
@@ -43,16 +43,10 @@
  
  # The strategy to be used for auth.
  # Supported values are 'keystone'(default), 'noauth'.
-@@ -206,4 +207,4 @@
- # 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
-Index: quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
+Index: git_quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
 ===================================================================
---- quantum.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-02-06 15:25:44.158208751 -0800
-+++ quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-02-06 15:29:57.290199453 -0800
+--- git_quantum.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-02-12 17:28:13.000000000 +0000
++++ git_quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-02-12 17:28:26.414834907 +0000
 @@ -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
@@ -62,10 +56,10 @@
  # Database reconnection retry times - in event connectivity is lost
  # set to -1 implies an infinite retry count
  # sql_max_retries = 10
-Index: quantum/etc/quantum/plugins/nec/nec.ini
+Index: git_quantum/etc/quantum/plugins/nec/nec.ini
 ===================================================================
---- quantum.orig/etc/quantum/plugins/nec/nec.ini	2013-02-06 15:25:44.158208751 -0800
-+++ quantum/etc/quantum/plugins/nec/nec.ini	2013-02-06 15:29:57.290199453 -0800
+--- git_quantum.orig/etc/quantum/plugins/nec/nec.ini	2013-02-12 17:28:13.000000000 +0000
++++ git_quantum/etc/quantum/plugins/nec/nec.ini	2013-02-12 17:28:26.414834907 +0000
 @@ -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
@@ -84,11 +78,11 @@
  
  [OFC]
  # Specify OpenFlow Controller Host, Port and Driver to connect.
-Index: quantum/etc/quantum/plugins/nicira/nvp.ini
+Index: git_quantum/etc/quantum/plugins/nicira/nvp.ini
 ===================================================================
---- quantum.orig/etc/quantum/plugins/nicira/nvp.ini	2013-02-06 15:25:44.158208751 -0800
-+++ quantum/etc/quantum/plugins/nicira/nvp.ini	2013-02-06 15:29:57.290199453 -0800
-@@ -6,7 +6,7 @@
+--- git_quantum.orig/etc/quantum/plugins/nicira/nvp.ini	2013-02-12 17:28:13.000000000 +0000
++++ git_quantum/etc/quantum/plugins/nicira/nvp.ini	2013-02-12 17:28:26.414834907 +0000
+@@ -11,7 +11,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.)
@@ -97,10 +91,10 @@
  # Database reconnection retry times - in event connectivity is lost
  # set to -1 implies an infinite retry count
  # sql_max_retries = 10
-Index: quantum/etc/quantum/plugins/ryu/ryu.ini
+Index: git_quantum/etc/quantum/plugins/ryu/ryu.ini
 ===================================================================
---- quantum.orig/etc/quantum/plugins/ryu/ryu.ini	2013-02-06 15:25:44.158208751 -0800
-+++ quantum/etc/quantum/plugins/ryu/ryu.ini	2013-02-06 15:29:57.290199453 -0800
+--- git_quantum.orig/etc/quantum/plugins/ryu/ryu.ini	2013-02-12 17:28:13.000000000 +0000
++++ git_quantum/etc/quantum/plugins/ryu/ryu.ini	2013-02-12 17:28:26.414834907 +0000
 @@ -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
@@ -110,10 +104,10 @@
  # 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
-Index: quantum/etc/quantum/plugins/bigswitch/restproxy.ini
+Index: git_quantum/etc/quantum/plugins/bigswitch/restproxy.ini
 ===================================================================
---- quantum.orig/etc/quantum/plugins/bigswitch/restproxy.ini	2013-02-06 15:25:44.158208751 -0800
-+++ quantum/etc/quantum/plugins/bigswitch/restproxy.ini	2013-02-06 15:29:57.290199453 -0800
+--- git_quantum.orig/etc/quantum/plugins/bigswitch/restproxy.ini	2013-02-12 17:28:13.000000000 +0000
++++ git_quantum/etc/quantum/plugins/bigswitch/restproxy.ini	2013-02-12 17:28:26.414834907 +0000
 @@ -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

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2013-02-07 02:38:29 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-02-12 19:26:19 +0000
@@ -1,7 +1,7 @@
-Index: quantum/quantum/tests/unit/test_db_plugin.py
+Index: git_quantum/quantum/tests/unit/test_db_plugin.py
 ===================================================================
---- quantum.orig/quantum/tests/unit/test_db_plugin.py	2013-02-06 18:05:48.329855928 -0800
-+++ quantum/quantum/tests/unit/test_db_plugin.py	2013-02-06 18:06:47.701853747 -0800
+--- git_quantum.orig/quantum/tests/unit/test_db_plugin.py	2013-02-12 17:13:08.966834897 +0000
++++ git_quantum/quantum/tests/unit/test_db_plugin.py	2013-02-12 17:21:56.066834899 +0000
 @@ -44,7 +44,6 @@
  from quantum.tests.unit import test_extensions
  from quantum.tests.unit import testlib_api
@@ -26,10 +26,10 @@
          gateway_ip = '10.0.0.1'
          cidr = '10.0.0.0/24'
          allocation_pools = [{'start': '10.0.0.2',
-Index: quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
+Index: git_quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
 ===================================================================
---- quantum.orig/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py	2013-02-06 18:05:48.325855929 -0800
-+++ quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py	2013-02-06 18:07:08.053853001 -0800
+--- git_quantum.orig/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py	2013-02-12 17:13:08.962834898 +0000
++++ git_quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py	2013-02-12 17:21:56.066834899 +0000
 @@ -25,6 +25,7 @@
  class TestLinuxBridge(unittest.TestCase):