neutron

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

  1. grizzly
  2. Merge into grizzly
Proposed by Yolanda Robla
Status: Merged
Approved by: Adam Gandelman
Approved revision: 124
Merged at revision: 124
Proposed branch: lp:~yolanda.robla/neutron/grizzly
Merge into: lp:~openstack-ubuntu-testing/neutron/grizzly
Diff against target: 170 lines (+36/-38)
3 files modified
debian/changelog (+5/-1)
debian/patches/fix-quantum-configuration.patch (+25/-31)
debian/patches/fix-ubuntu-tests.patch (+6/-6)
To merge this branch: bzr merge lp:~yolanda.robla/neutron/grizzly
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+148032@code.launchpad.net

Description of the change

Refreshed patches

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1quantum (2013.1~g3ppa-0ubuntu3) UNRELEASED; urgency=low1quantum (2013.1~g3ppa-0ubuntu3) UNRELEASED; urgency=low
22
3 [ Adam Gandelman ]
3 * debian/patches/fix-quantunm-configuration.patch: Refreshed and update to4 * debian/patches/fix-quantunm-configuration.patch: Refreshed and update to
4 reflect new global root_wrap configuration defined only in5 reflect new global root_wrap configuration defined only in
5 /etc/quantum/quantum.conf.6 /etc/quantum/quantum.conf.
6 * debian/patches/fix-ubuntu-tests.patch: Refreshed, added skipTests for7 * debian/patches/fix-ubuntu-tests.patch: Refreshed, added skipTests for
7 linuxbridge tests that attempt to setup udev monitors.8 linuxbridge tests that attempt to setup udev monitors.
89
9 -- Adam Gandelman <adamg@ubuntu.com> Wed, 06 Feb 2013 15:35:34 -080010 [ Yolanda Robla ]
11 * debian/patches: refreshed patches
12
13 -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 12 Feb 2013 18:31:34 +0100
1014
11quantum (2013.1~g2-0ubuntu1) raring; urgency=low15quantum (2013.1~g2-0ubuntu1) raring; urgency=low
1216
1317
=== 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 @@
1Index: quantum/etc/dhcp_agent.ini1Index: git_quantum/etc/dhcp_agent.ini
2===================================================================2===================================================================
3--- quantum.orig/etc/dhcp_agent.ini 2013-02-06 15:25:44.158208751 -08003--- git_quantum.orig/etc/dhcp_agent.ini 2013-02-12 17:28:13.000000000 +0000
4+++ quantum/etc/dhcp_agent.ini 2013-02-06 15:29:57.286199452 -08004+++ git_quantum/etc/dhcp_agent.ini 2013-02-12 17:28:26.410834889 +0000
5@@ -4,7 +4,7 @@5@@ -4,7 +4,7 @@
6 6
7 # Where to store dnsmasq state files. This directory must be writable by the7 # Where to store dnsmasq state files. This directory must be writable by the
@@ -11,10 +11,10 @@
11 11
12 # The DHCP agent will resync its state with Quantum to recover from any12 # The DHCP agent will resync its state with Quantum to recover from any
13 # transient notification or rpc errors. The interval is number of13 # transient notification or rpc errors. The interval is number of
14Index: quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini14Index: git_quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
15===================================================================15===================================================================
16--- quantum.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-02-06 15:25:44.158208751 -080016--- git_quantum.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-02-12 17:28:13.000000000 +0000
17+++ quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-02-06 15:29:57.286199452 -080017+++ git_quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-02-12 17:28:26.410834889 +0000
18@@ -26,7 +26,7 @@18@@ -26,7 +26,7 @@
19 # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge19 # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
20 # Replace 127.0.0.1 above with the IP address of the database used by the20 # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -24,10 +24,10 @@
24 # Database reconnection retry times - in event connectivity is lost24 # Database reconnection retry times - in event connectivity is lost
25 # set to -1 implies an infinite retry count25 # set to -1 implies an infinite retry count
26 # sql_max_retries = 1026 # sql_max_retries = 10
27Index: quantum/etc/quantum.conf27Index: git_quantum/etc/quantum.conf
28===================================================================28===================================================================
29--- quantum.orig/etc/quantum.conf 2013-02-06 15:25:44.158208751 -080029--- git_quantum.orig/etc/quantum.conf 2013-02-12 17:28:13.000000000 +0000
30+++ quantum/etc/quantum.conf 2013-02-06 15:31:23.514196284 -080030+++ git_quantum/etc/quantum.conf 2013-02-12 17:28:26.414834907 +0000
31@@ -39,12 +39,13 @@31@@ -39,12 +39,13 @@
32 32
33 # Quantum plugin provider module33 # Quantum plugin provider module
@@ -43,16 +43,10 @@
43 43
44 # The strategy to be used for auth.44 # The strategy to be used for auth.
45 # Supported values are 'keystone'(default), 'noauth'.45 # Supported values are 'keystone'(default), 'noauth'.
46@@ -206,4 +207,4 @@46Index: git_quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
47 # Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
48 # root filter facility.
49 # Change to "sudo" to skip the filtering and just run the comand directly
50-# root_helper = sudo
51+root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
52Index: quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
53===================================================================47===================================================================
54--- quantum.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-02-06 15:25:44.158208751 -080048--- git_quantum.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-02-12 17:28:13.000000000 +0000
55+++ quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-02-06 15:29:57.290199453 -080049+++ git_quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-02-12 17:28:26.414834907 +0000
56@@ -4,7 +4,7 @@50@@ -4,7 +4,7 @@
57 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum51 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
58 # Replace 127.0.0.1 above with the IP address of the database used by the52 # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -62,10 +56,10 @@
62 # Database reconnection retry times - in event connectivity is lost56 # Database reconnection retry times - in event connectivity is lost
63 # set to -1 implies an infinite retry count57 # set to -1 implies an infinite retry count
64 # sql_max_retries = 1058 # sql_max_retries = 10
65Index: quantum/etc/quantum/plugins/nec/nec.ini59Index: git_quantum/etc/quantum/plugins/nec/nec.ini
66===================================================================60===================================================================
67--- quantum.orig/etc/quantum/plugins/nec/nec.ini 2013-02-06 15:25:44.158208751 -080061--- git_quantum.orig/etc/quantum/plugins/nec/nec.ini 2013-02-12 17:28:13.000000000 +0000
68+++ quantum/etc/quantum/plugins/nec/nec.ini 2013-02-06 15:29:57.290199453 -080062+++ git_quantum/etc/quantum/plugins/nec/nec.ini 2013-02-12 17:28:26.414834907 +0000
69@@ -6,7 +6,7 @@63@@ -6,7 +6,7 @@
70 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum64 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
71 # Replace 127.0.0.1 above with the IP address of the database used by the65 # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -84,11 +78,11 @@
84 78
85 [OFC]79 [OFC]
86 # Specify OpenFlow Controller Host, Port and Driver to connect.80 # Specify OpenFlow Controller Host, Port and Driver to connect.
87Index: quantum/etc/quantum/plugins/nicira/nvp.ini81Index: git_quantum/etc/quantum/plugins/nicira/nvp.ini
88===================================================================82===================================================================
89--- quantum.orig/etc/quantum/plugins/nicira/nvp.ini 2013-02-06 15:25:44.158208751 -080083--- git_quantum.orig/etc/quantum/plugins/nicira/nvp.ini 2013-02-12 17:28:13.000000000 +0000
90+++ quantum/etc/quantum/plugins/nicira/nvp.ini 2013-02-06 15:29:57.290199453 -080084+++ git_quantum/etc/quantum/plugins/nicira/nvp.ini 2013-02-12 17:28:26.414834907 +0000
91@@ -6,7 +6,7 @@85@@ -11,7 +11,7 @@
92 # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum86 # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum
93 # Replace 127.0.0.1 above with the IP address of the database used by the87 # Replace 127.0.0.1 above with the IP address of the database used by the
94 # main quantum server. (Leave it as is if the database runs on this host.)88 # main quantum server. (Leave it as is if the database runs on this host.)
@@ -97,10 +91,10 @@
97 # Database reconnection retry times - in event connectivity is lost91 # Database reconnection retry times - in event connectivity is lost
98 # set to -1 implies an infinite retry count92 # set to -1 implies an infinite retry count
99 # sql_max_retries = 1093 # sql_max_retries = 10
100Index: quantum/etc/quantum/plugins/ryu/ryu.ini94Index: git_quantum/etc/quantum/plugins/ryu/ryu.ini
101===================================================================95===================================================================
102--- quantum.orig/etc/quantum/plugins/ryu/ryu.ini 2013-02-06 15:25:44.158208751 -080096--- git_quantum.orig/etc/quantum/plugins/ryu/ryu.ini 2013-02-12 17:28:13.000000000 +0000
103+++ quantum/etc/quantum/plugins/ryu/ryu.ini 2013-02-06 15:29:57.290199453 -080097+++ git_quantum/etc/quantum/plugins/ryu/ryu.ini 2013-02-12 17:28:26.414834907 +0000
104@@ -2,7 +2,7 @@98@@ -2,7 +2,7 @@
105 # This line MUST be changed to actually run the plugin.99 # This line MUST be changed to actually run the plugin.
106 # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum100 # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum
@@ -110,10 +104,10 @@
110 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,104 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
111 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.105 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
112 # sql_dbpool_enable = False106 # sql_dbpool_enable = False
113Index: quantum/etc/quantum/plugins/bigswitch/restproxy.ini107Index: git_quantum/etc/quantum/plugins/bigswitch/restproxy.ini
114===================================================================108===================================================================
115--- quantum.orig/etc/quantum/plugins/bigswitch/restproxy.ini 2013-02-06 15:25:44.158208751 -0800109--- git_quantum.orig/etc/quantum/plugins/bigswitch/restproxy.ini 2013-02-12 17:28:13.000000000 +0000
116+++ quantum/etc/quantum/plugins/bigswitch/restproxy.ini 2013-02-06 15:29:57.290199453 -0800110+++ git_quantum/etc/quantum/plugins/bigswitch/restproxy.ini 2013-02-12 17:28:26.414834907 +0000
117@@ -6,7 +6,7 @@111@@ -6,7 +6,7 @@
118 # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum112 # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
119 # Replace 127.0.0.1 above with the IP address of the database used by the113 # Replace 127.0.0.1 above with the IP address of the database used by the
120114
=== 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 @@
1Index: quantum/quantum/tests/unit/test_db_plugin.py1Index: git_quantum/quantum/tests/unit/test_db_plugin.py
2===================================================================2===================================================================
3--- quantum.orig/quantum/tests/unit/test_db_plugin.py 2013-02-06 18:05:48.329855928 -08003--- git_quantum.orig/quantum/tests/unit/test_db_plugin.py 2013-02-12 17:13:08.966834897 +0000
4+++ quantum/quantum/tests/unit/test_db_plugin.py 2013-02-06 18:06:47.701853747 -08004+++ git_quantum/quantum/tests/unit/test_db_plugin.py 2013-02-12 17:21:56.066834899 +0000
5@@ -44,7 +44,6 @@5@@ -44,7 +44,6 @@
6 from quantum.tests.unit import test_extensions6 from quantum.tests.unit import test_extensions
7 from quantum.tests.unit import testlib_api7 from quantum.tests.unit import testlib_api
@@ -26,10 +26,10 @@
26 gateway_ip = '10.0.0.1'26 gateway_ip = '10.0.0.1'
27 cidr = '10.0.0.0/24'27 cidr = '10.0.0.0/24'
28 allocation_pools = [{'start': '10.0.0.2',28 allocation_pools = [{'start': '10.0.0.2',
29Index: quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py29Index: git_quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
30===================================================================30===================================================================
31--- quantum.orig/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py 2013-02-06 18:05:48.325855929 -080031--- git_quantum.orig/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py 2013-02-12 17:13:08.962834898 +0000
32+++ quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py 2013-02-06 18:07:08.053853001 -080032+++ git_quantum/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py 2013-02-12 17:21:56.066834899 +0000
33@@ -25,6 +25,7 @@33@@ -25,6 +25,7 @@
34 class TestLinuxBridge(unittest.TestCase):34 class TestLinuxBridge(unittest.TestCase):
35 35

Subscribers

People subscribed via source and target branches