neutron

Merge lp:~zulcss/neutron/quantum-config-refresh into lp:~openstack-ubuntu-testing/neutron/grizzly

  1. quantum-config-refresh
  2. Merge into grizzly
Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 134
Merged at revision: 134
Proposed branch: lp:~zulcss/neutron/quantum-config-refresh
Merge into: lp:~openstack-ubuntu-testing/neutron/grizzly
Diff against target: 171 lines (+54/-49)
2 files modified
debian/changelog (+7/-0)
debian/patches/fix-quantum-configuration.patch (+47/-49)
To merge this branch: bzr merge lp:~zulcss/neutron/quantum-config-refresh
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+150570@code.launchpad.net

Description of the change

configuration changes

To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

review: Approve

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-22 16:17:12 +0000
+++ debian/changelog 2013-02-26 14:39:02 +0000
@@ -1,3 +1,10 @@
1quantum (1:2013.1.a38.g511ac76-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release.
4 * debian/patches/fix-quantum-configuration.patch: Refreshed
5
6 -- Chuck Short <zulcss@ubuntu.com> Tue, 26 Feb 2013 08:27:14 -0600
7
1quantum (2013.1.g3-0ubuntu1) raring; urgency=low8quantum (2013.1.g3-0ubuntu1) raring; urgency=low
29
3 [ Adam Gandelman ]10 [ Adam Gandelman ]
411
=== modified file 'debian/patches/fix-quantum-configuration.patch'
--- debian/patches/fix-quantum-configuration.patch 2013-02-19 12:04:14 +0000
+++ debian/patches/fix-quantum-configuration.patch 2013-02-26 14:39:02 +0000
@@ -1,16 +1,6 @@
1--- a/etc/dhcp_agent.ini1diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/bigswitch/restproxy.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/bigswitch/restproxy.ini
2+++ b/etc/dhcp_agent.ini2--- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/bigswitch/restproxy.ini 2013-02-26 08:24:56.000000000 -0600
3@@ -4,7 +4,7 @@3+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/bigswitch/restproxy.ini 2013-02-26 08:29:05.948260373 -0600
4
5 # Where to store dnsmasq state files. This directory must be writable by the
6 # user executing the agent.
7-# state_path = /var/lib/quantum
8+state_path = /var/lib/quantum
9
10 # The DHCP agent will resync its state with Quantum to recover from any
11 # transient notification or rpc errors. The interval is number of
12--- a/etc/quantum/plugins/bigswitch/restproxy.ini
13+++ b/etc/quantum/plugins/bigswitch/restproxy.ini
14@@ -6,7 +6,7 @@4@@ -6,7 +6,7 @@
15 # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum5 # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
16 # Replace 127.0.0.1 above with the IP address of the database used by the6 # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -20,8 +10,21 @@
20 # Database reconnection retry times - in event connectivity is lost10 # Database reconnection retry times - in event connectivity is lost
21 # set to -1 implies an infinite retry count11 # set to -1 implies an infinite retry count
22 # sql_max_retries = 1012 # sql_max_retries = 10
23--- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini13diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/brocade/brocade.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/brocade/brocade.ini
24+++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini14--- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/brocade/brocade.ini 2013-02-26 08:24:56.000000000 -0600
15+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/brocade/brocade.ini 2013-02-26 08:29:05.952260373 -0600
16@@ -11,7 +11,7 @@
17 # ostype = NOS
18
19 [DATABASE]
20-# sql_connection = sqlite://
21+sql_connection = sqlite:////var/lib/quantum/brocade.sqlite
22 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
23 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
24 # sql_dbpool_enable = False
25diff -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
26--- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-02-26 08:24:56.000000000 -0600
27+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-02-26 08:29:05.948260373 -0600
25@@ -26,7 +26,7 @@28@@ -26,7 +26,7 @@
26 # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge29 # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
27 # Replace 127.0.0.1 above with the IP address of the database used by the30 # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -31,8 +34,9 @@
31 # Database reconnection retry times - in event connectivity is lost34 # Database reconnection retry times - in event connectivity is lost
32 # set to -1 implies an infinite retry count35 # set to -1 implies an infinite retry count
33 # sql_max_retries = 1036 # sql_max_retries = 10
34--- a/etc/quantum/plugins/nec/nec.ini37diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nec/nec.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nec/nec.ini
35+++ b/etc/quantum/plugins/nec/nec.ini38--- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nec/nec.ini 2013-02-26 08:24:56.000000000 -0600
39+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nec/nec.ini 2013-02-26 08:29:05.948260373 -0600
36@@ -6,7 +6,7 @@40@@ -6,7 +6,7 @@
37 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum41 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
38 # Replace 127.0.0.1 above with the IP address of the database used by the42 # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -51,8 +55,9 @@
51 55
52 [SECURITYGROUP]56 [SECURITYGROUP]
53 # Firewall driver for realizing quantum security group function57 # Firewall driver for realizing quantum security group function
54--- a/etc/quantum/plugins/nicira/nvp.ini58diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nicira/nvp.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nicira/nvp.ini
55+++ b/etc/quantum/plugins/nicira/nvp.ini59--- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nicira/nvp.ini 2013-02-26 08:24:56.000000000 -0600
60+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nicira/nvp.ini 2013-02-26 08:29:05.948260373 -0600
56@@ -4,7 +4,7 @@61@@ -4,7 +4,7 @@
57 # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum62 # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum
58 # Replace 127.0.0.1 above with the IP address of the database used by the63 # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -62,8 +67,9 @@
62 # Database reconnection retry times - in event connectivity is lost67 # Database reconnection retry times - in event connectivity is lost
63 # set to -1 implies an infinite retry count68 # set to -1 implies an infinite retry count
64 # sql_max_retries = 1069 # sql_max_retries = 10
65--- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini70diff -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
66+++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini71--- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-02-26 08:24:56.000000000 -0600
72+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-02-26 08:29:05.948260373 -0600
67@@ -4,7 +4,7 @@73@@ -4,7 +4,7 @@
68 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum74 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
69 # Replace 127.0.0.1 above with the IP address of the database used by the75 # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -73,8 +79,21 @@
73 # Database reconnection retry times - in event connectivity is lost79 # Database reconnection retry times - in event connectivity is lost
74 # set to -1 implies an infinite retry count80 # set to -1 implies an infinite retry count
75 # sql_max_retries = 1081 # sql_max_retries = 10
76--- a/etc/quantum/plugins/ryu/ryu.ini82diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/plumgrid/plumgrid.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/plumgrid/plumgrid.ini
77+++ b/etc/quantum/plugins/ryu/ryu.ini83--- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-02-26 08:24:56.000000000 -0600
84+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-02-26 08:29:05.948260373 -0600
85@@ -6,7 +6,7 @@
86 # sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum
87 # Replace <host> above with the IP address of the database used by the
88 # main quantum server.
89-# sql_connection = sqlite://
90+sql_connection = sqlite:////var/lib/quantum/plumgrid.sqlite
91 # Database reconnection retry times - in event connectivity is lost
92 # set to -1 implies an infinite retry count
93 # sql_max_retries = 10
94diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/ryu/ryu.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/ryu/ryu.ini
95--- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/ryu/ryu.ini 2013-02-26 08:24:56.000000000 -0600
96+++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/ryu/ryu.ini 2013-02-26 08:29:05.948260373 -0600
78@@ -2,7 +2,7 @@97@@ -2,7 +2,7 @@
79 # This line MUST be changed to actually run the plugin.98 # This line MUST be changed to actually run the plugin.
80 # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum99 # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum
@@ -84,9 +103,10 @@
84 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,103 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
85 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.104 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
86 # sql_dbpool_enable = False105 # sql_dbpool_enable = False
87--- a/etc/quantum.conf106diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum.conf quantum-2013.1.a38.g511ac76/etc/quantum.conf
88+++ b/etc/quantum.conf107--- quantum-2013.1.a38.g511ac76.orig/etc/quantum.conf 2013-02-26 08:24:56.000000000 -0600
89@@ -39,12 +39,13 @@ bind_port = 9696108+++ quantum-2013.1.a38.g511ac76/etc/quantum.conf 2013-02-26 08:29:05.948260373 -0600
109@@ -43,12 +43,13 @@ bind_port = 9696
90 110
91 # Quantum plugin provider module111 # Quantum plugin provider module
92 # core_plugin =112 # core_plugin =
@@ -101,7 +121,7 @@
101 121
102 # The strategy to be used for auth.122 # The strategy to be used for auth.
103 # Supported values are 'keystone'(default), 'noauth'.123 # Supported values are 'keystone'(default), 'noauth'.
104@@ -212,6 +213,7 @@ notification_topics = notifications124@@ -226,6 +227,7 @@ notification_topics = notifications
105 # root filter facility.125 # root filter facility.
106 # Change to "sudo" to skip the filtering and just run the comand directly126 # Change to "sudo" to skip the filtering and just run the comand directly
107 # root_helper = sudo127 # root_helper = sudo
@@ -109,25 +129,3 @@
109 129
110 # =========== items for agent management extension =============130 # =========== items for agent management extension =============
111 # seconds between nodes reporting state to server, should be less than131 # seconds between nodes reporting state to server, should be less than
112--- a/etc/quantum/plugins/plumgrid/plumgrid.ini
113+++ b/etc/quantum/plugins/plumgrid/plumgrid.ini
114@@ -6,7 +6,7 @@
115 # sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum
116 # Replace <host> above with the IP address of the database used by the
117 # main quantum server.
118-# sql_connection = sqlite://
119+sql_connection = sqlite:////var/lib/quantum/plumgrid.sqlite
120 # Database reconnection retry times - in event connectivity is lost
121 # set to -1 implies an infinite retry count
122 # sql_max_retries = 10
123--- a/etc/quantum/plugins/brocade/brocade.ini
124+++ b/etc/quantum/plugins/brocade/brocade.ini
125@@ -11,7 +11,7 @@
126 # ostype = NOS
127
128 [DATABASE]
129-# sql_connection = sqlite://
130+sql_connection = sqlite:////var/lib/quantum/brocade.sqlite
131 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
132 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
133 # sql_dbpool_enable = False

Subscribers

People subscribed via source and target branches