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

[Chuck Short]

configuration changes

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== 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 @@
+quantum (1:2013.1.a38.g511ac76-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches/fix-quantum-configuration.patch: Refreshed
+
+ -- Chuck Short <[e-mail]>  Tue, 26 Feb 2013 08:27:14 -0600
+
 quantum (2013.1.g3-0ubuntu1) raring; urgency=low
 
   [ Adam Gandelman ]

=== 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 @@
---- a/etc/dhcp_agent.ini
-+++ b/etc/dhcp_agent.ini
-@@ -4,7 +4,7 @@
- 
- # Where to store dnsmasq state files.  This directory must be writable by the
- # user executing the agent.
--# state_path = /var/lib/quantum
-+state_path = /var/lib/quantum
- 
- # The DHCP agent will resync its state with Quantum to recover from any
- # transient notification or rpc errors. The interval is number of
---- a/etc/quantum/plugins/bigswitch/restproxy.ini
-+++ b/etc/quantum/plugins/bigswitch/restproxy.ini
+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
 @@ -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
@@ -20,8 +10,21 @@
  # Database reconnection retry times - in event connectivity is lost
  # set to -1 implies an infinite retry count
  # sql_max_retries = 10
---- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
-+++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
+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
+@@ -11,7 +11,7 @@
+ # ostype   = NOS
+ 
+ [DATABASE]
+-# sql_connection = sqlite://
++sql_connection = sqlite:////var/lib/quantum/brocade.sqlite
+ # 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
 @@ -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
@@ -31,8 +34,9 @@
  # Database reconnection retry times - in event connectivity is lost
  # set to -1 implies an infinite retry count
  # sql_max_retries = 10
---- a/etc/quantum/plugins/nec/nec.ini
-+++ b/etc/quantum/plugins/nec/nec.ini
+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
 @@ -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
@@ -51,8 +55,9 @@
  
  [SECURITYGROUP]
  # Firewall driver for realizing quantum security group function
---- a/etc/quantum/plugins/nicira/nvp.ini
-+++ b/etc/quantum/plugins/nicira/nvp.ini
+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
 @@ -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
@@ -62,8 +67,9 @@
  # Database reconnection retry times - in event connectivity is lost
  # set to -1 implies an infinite retry count
  # sql_max_retries = 10
---- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
-+++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
+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
 @@ -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
@@ -73,8 +79,21 @@
  # Database reconnection retry times - in event connectivity is lost
  # set to -1 implies an infinite retry count
  # sql_max_retries = 10
---- a/etc/quantum/plugins/ryu/ryu.ini
-+++ b/etc/quantum/plugins/ryu/ryu.ini
+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
+@@ -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
+ # main quantum server.
+-# sql_connection = sqlite://
++sql_connection = sqlite:////var/lib/quantum/plumgrid.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/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
 @@ -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
@@ -84,9 +103,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
---- a/etc/quantum.conf
-+++ b/etc/quantum.conf
-@@ -39,12 +39,13 @@ bind_port = 9696
+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
+@@ -43,12 +43,13 @@ bind_port = 9696
  
  # Quantum plugin provider module
  # core_plugin =
@@ -101,7 +121,7 @@
  
  # The strategy to be used for auth.
  # Supported values are 'keystone'(default), 'noauth'.
-@@ -212,6 +213,7 @@ notification_topics = notifications
+@@ -226,6 +227,7 @@ notification_topics = notifications
  # root filter facility.
  # Change to "sudo" to skip the filtering and just run the comand directly
  # root_helper = sudo
@@ -109,25 +129,3 @@
  
  # =========== items for agent management extension =============
  # seconds between nodes reporting state to server, should be less than
---- 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
- # main quantum server.
--# sql_connection = sqlite://
-+sql_connection = sqlite:////var/lib/quantum/plumgrid.sqlite
- # Database reconnection retry times - in event connectivity is lost
- # set to -1 implies an infinite retry count
- # sql_max_retries = 10
---- a/etc/quantum/plugins/brocade/brocade.ini
-+++ b/etc/quantum/plugins/brocade/brocade.ini
-@@ -11,7 +11,7 @@
- # ostype   = NOS
- 
- [DATABASE]
--# sql_connection = sqlite://
-+sql_connection = sqlite:////var/lib/quantum/brocade.sqlite
- # 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