neutron

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

  1. quantum-refresh
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Merged at revision: 164
Proposed branch: lp:~zulcss/neutron/quantum-refresh
Merge into: lp:~ubuntu-server-dev/neutron/havana
Diff against target: 193 lines (+44/-49)
2 files modified
debian/changelog (+6/-0)
debian/patches/fix-quantum-configuration.patch (+38/-49)
To merge this branch: bzr merge lp:~zulcss/neutron/quantum-refresh
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+170626@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-19 17:13:32 +0000
3+++ debian/changelog 2013-06-20 14:03:25 +0000
4@@ -1,3 +1,9 @@
5+quantum (1:2013.2~b1-0ubuntu3) UNRELEASED; urgency=low
6+
7+ * debian/patches/fix-quantum-configuration.patch: Refreshed
8+
9+ -- Chuck Short <zulcss@ubuntu.com> Thu, 20 Jun 2013 08:51:47 -0500
10+
11 quantum (1:2013.2~b1-0ubuntu2) saucy; urgency=low
12
13 [ Adam Gandelman ]
14
15=== modified file 'debian/patches/fix-quantum-configuration.patch'
16--- debian/patches/fix-quantum-configuration.patch 2013-05-31 19:00:26 +0000
17+++ debian/patches/fix-quantum-configuration.patch 2013-06-20 14:03:25 +0000
18@@ -1,7 +1,6 @@
19-Index: quantum/etc/quantum/plugins/bigswitch/restproxy.ini
20-===================================================================
21---- quantum.orig/etc/quantum/plugins/bigswitch/restproxy.ini 2013-05-31 11:57:14.397688352 -0700
22-+++ quantum/etc/quantum/plugins/bigswitch/restproxy.ini 2013-05-31 11:57:14.389688351 -0700
23+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
24+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/bigswitch/restproxy.ini 2013-06-20 08:30:58.000000000 -0500
25++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/bigswitch/restproxy.ini 2013-06-20 08:39:27.267763537 -0500
26 @@ -6,7 +6,7 @@
27 # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
28 # Replace 127.0.0.1 above with the IP address of the database used by the
29@@ -11,23 +10,21 @@
30 # Database reconnection retry times - in event connectivity is lost
31 # set to -1 implies an infinite retry count
32 # sql_max_retries = 10
33-Index: quantum/etc/quantum/plugins/brocade/brocade.ini
34-===================================================================
35---- quantum.orig/etc/quantum/plugins/brocade/brocade.ini 2013-05-31 11:57:14.397688352 -0700
36-+++ quantum/etc/quantum/plugins/brocade/brocade.ini 2013-05-31 11:57:14.389688351 -0700
37+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
38+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/brocade/brocade.ini 2013-06-20 08:30:58.000000000 -0500
39++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/brocade/brocade.ini 2013-06-20 08:41:01.359763583 -0500
40 @@ -11,7 +11,7 @@
41 # ostype = NOS
42
43- [DATABASE]
44+ [database]
45 -# sql_connection = sqlite://
46 +sql_connection = sqlite:////var/lib/quantum/brocade.sqlite
47 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
48 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
49 # sql_dbpool_enable = False
50-Index: quantum/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini
51-===================================================================
52---- quantum.orig/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini 2013-05-31 11:57:14.397688352 -0700
53-+++ quantum/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini 2013-05-31 11:57:14.389688351 -0700
54+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
55+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini 2013-06-20 08:30:58.000000000 -0500
56++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini 2013-06-20 08:39:27.267763537 -0500
57 @@ -4,7 +4,7 @@
58 # sql_connection = mysql://quantum:password@127.0.0.1:3306/hyperv_quantum
59 # Replace 127.0.0.1 above with the IP address of the database used by the
60@@ -37,10 +34,9 @@
61 # Database reconnection retry times - in event connectivity is lost
62 # set to -1 implies an infinite retry count
63 # sql_max_retries = 10
64-Index: quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
65-===================================================================
66---- quantum.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-05-31 11:57:14.397688352 -0700
67-+++ quantum/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-05-31 11:57:14.389688351 -0700
68+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
69+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-06-20 08:30:58.000000000 -0500
70++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-06-20 08:39:27.267763537 -0500
71 @@ -26,7 +26,7 @@
72 # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
73 # Replace 127.0.0.1 above with the IP address of the database used by the
74@@ -50,10 +46,9 @@
75 # Database reconnection retry times - in event connectivity is lost
76 # set to -1 implies an infinite retry count
77 # sql_max_retries = 10
78-Index: quantum/etc/quantum/plugins/midonet/midonet.ini
79-===================================================================
80---- quantum.orig/etc/quantum/plugins/midonet/midonet.ini 2013-05-31 11:57:14.397688352 -0700
81-+++ quantum/etc/quantum/plugins/midonet/midonet.ini 2013-05-31 11:57:14.389688351 -0700
82+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
83+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/midonet/midonet.ini 2013-06-20 08:30:58.000000000 -0500
84++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/midonet/midonet.ini 2013-06-20 08:39:27.267763537 -0500
85 @@ -4,7 +4,7 @@
86 # sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum
87 # Replace 127.0.0.1 above with the IP address of the database used by the
88@@ -63,10 +58,9 @@
89 # Database reconnection retry times - in event connectivity is lost
90 # set to -1 implies an infinite retry count
91 # sql_max_retries = 10
92-Index: quantum/etc/quantum/plugins/nec/nec.ini
93-===================================================================
94---- quantum.orig/etc/quantum/plugins/nec/nec.ini 2013-05-31 11:57:14.397688352 -0700
95-+++ quantum/etc/quantum/plugins/nec/nec.ini 2013-05-31 11:57:14.389688351 -0700
96+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
97+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/nec/nec.ini 2013-06-20 08:30:58.000000000 -0500
98++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/nec/nec.ini 2013-06-20 08:39:27.267763537 -0500
99 @@ -6,7 +6,7 @@
100 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
101 # Replace 127.0.0.1 above with the IP address of the database used by the
102@@ -76,19 +70,18 @@
103 # Database reconnection retry times - in event connectivity is lost
104 # set to -1 implies an infinite retry count
105 # sql_max_retries = 10
106-@@ -39,7 +39,7 @@
107+@@ -43,7 +43,7 @@ polling_interval = 2
108 # Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
109 # root filter facility.
110 # Change to "sudo" to skip the filtering and just run the comand directly
111 -root_helper = sudo
112 +root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
113
114- [SECURITYGROUP]
115+ [securitygroup]
116 # Firewall driver for realizing quantum security group function
117-Index: quantum/etc/quantum/plugins/nicira/nvp.ini
118-===================================================================
119---- quantum.orig/etc/quantum/plugins/nicira/nvp.ini 2013-05-31 11:57:14.397688352 -0700
120-+++ quantum/etc/quantum/plugins/nicira/nvp.ini 2013-05-31 11:57:14.389688351 -0700
121+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
122+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/nicira/nvp.ini 2013-06-20 08:30:58.000000000 -0500
123++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/nicira/nvp.ini 2013-06-20 08:39:27.267763537 -0500
124 @@ -68,7 +68,7 @@
125 # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum
126 # Replace 127.0.0.1 above with the IP address of the database used by the
127@@ -98,10 +91,9 @@
128
129 # Number of reconnection attempts to the DB; Set to -1 to try indefinitely
130 # sql_max_retries = 10
131-Index: quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
132-===================================================================
133---- quantum.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-05-31 11:57:14.397688352 -0700
134-+++ quantum/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-05-31 11:57:14.389688351 -0700
135+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
136+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-06-20 08:30:58.000000000 -0500
137++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-06-20 08:39:27.267763537 -0500
138 @@ -4,7 +4,7 @@
139 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
140 # Replace 127.0.0.1 above with the IP address of the database used by the
141@@ -111,10 +103,9 @@
142 # Database reconnection retry times - in event connectivity is lost
143 # set to -1 implies an infinite retry count
144 # sql_max_retries = 10
145-Index: quantum/etc/quantum/plugins/plumgrid/plumgrid.ini
146-===================================================================
147---- quantum.orig/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-05-31 11:57:14.397688352 -0700
148-+++ quantum/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-05-31 11:57:14.389688351 -0700
149+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
150+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-06-20 08:30:58.000000000 -0500
151++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-06-20 08:39:27.271763537 -0500
152 @@ -6,7 +6,7 @@
153 # sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum
154 # Replace <host> above with the IP address of the database used by the
155@@ -124,10 +115,9 @@
156 # Database reconnection retry times - in event connectivity is lost
157 # set to -1 implies an infinite retry count
158 # sql_max_retries = 10
159-Index: quantum/etc/quantum/plugins/ryu/ryu.ini
160-===================================================================
161---- quantum.orig/etc/quantum/plugins/ryu/ryu.ini 2013-05-31 11:57:14.397688352 -0700
162-+++ quantum/etc/quantum/plugins/ryu/ryu.ini 2013-05-31 11:57:14.393688351 -0700
163+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
164+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/ryu/ryu.ini 2013-06-20 08:30:58.000000000 -0500
165++++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/ryu/ryu.ini 2013-06-20 08:39:27.271763537 -0500
166 @@ -2,7 +2,7 @@
167 # This line MUST be changed to actually run the plugin.
168 # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum
169@@ -137,11 +127,10 @@
170 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
171 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
172 # sql_dbpool_enable = False
173-Index: quantum/etc/quantum.conf
174-===================================================================
175---- quantum.orig/etc/quantum.conf 2013-05-31 11:57:14.397688352 -0700
176-+++ quantum/etc/quantum.conf 2013-05-31 11:57:14.393688351 -0700
177-@@ -46,12 +46,13 @@
178+diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum.conf quantum-2013.2.a814.g9a884ce/etc/quantum.conf
179+--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum.conf 2013-06-20 08:30:58.000000000 -0500
180++++ quantum-2013.2.a814.g9a884ce/etc/quantum.conf 2013-06-20 08:39:27.271763537 -0500
181+@@ -46,12 +46,13 @@ bind_port = 9696
182
183 # Quantum plugin provider module
184 # core_plugin =
185@@ -156,7 +145,7 @@
186
187 # The strategy to be used for auth.
188 # Supported values are 'keystone'(default), 'noauth'.
189-@@ -301,6 +302,7 @@
190+@@ -301,6 +302,7 @@ notification_topics = notifications
191 # root filter facility.
192 # Change to "sudo" to skip the filtering and just run the comand directly
193 # root_helper = sudo

Subscribers

People subscribed via source and target branches