1
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
2
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/bigswitch/restproxy.ini 2013-06-20 08:30:58.000000000 -0500
3
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/bigswitch/restproxy.ini 2013-06-20 08:39:27.267763537 -0500
5
# sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
6
# Replace 127.0.0.1 above with the IP address of the database used by the
7
# main quantum server. (Leave it as is if the database runs on this host.)
8
-sql_connection = sqlite://
9
+sql_connection = sqlite:////var/lib/quantum/bigswitch.sqlite
10
# Database reconnection retry times - in event connectivity is lost
11
# set to -1 implies an infinite retry count
12
# sql_max_retries = 10
13
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
14
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/brocade/brocade.ini 2013-06-20 08:30:58.000000000 -0500
15
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/brocade/brocade.ini 2013-06-20 08:41:01.359763583 -0500
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
25
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
26
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini 2013-06-20 08:30:58.000000000 -0500
27
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini 2013-06-20 08:39:27.267763537 -0500
29
# sql_connection = mysql://quantum:password@127.0.0.1:3306/hyperv_quantum
30
# Replace 127.0.0.1 above with the IP address of the database used by the
31
# main quantum server. (Leave it as is if the database runs on this host.)
32
-sql_connection = sqlite://
33
+sql_connection = sqlite:////var/lib/quantum/hyperv.sqlite
34
# Database reconnection retry times - in event connectivity is lost
35
# set to -1 implies an infinite retry count
36
# sql_max_retries = 10
37
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
38
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-06-20 08:30:58.000000000 -0500
39
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-06-20 08:39:27.267763537 -0500
41
# sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
42
# Replace 127.0.0.1 above with the IP address of the database used by the
43
# main quantum server. (Leave it as is if the database runs on this host.)
44
-sql_connection = sqlite://
45
+sql_connection = sqlite:////var/lib/quantum/linuxbridge.sqlite
46
# Database reconnection retry times - in event connectivity is lost
47
# set to -1 implies an infinite retry count
48
# sql_max_retries = 10
49
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
50
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/midonet/midonet.ini 2013-06-20 08:30:58.000000000 -0500
51
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/midonet/midonet.ini 2013-06-20 08:39:27.267763537 -0500
53
# sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum
54
# Replace 127.0.0.1 above with the IP address of the database used by the
55
# main quantum server. (Leave it as is if the database runs on this host.)
56
-sql_connection = sqlite://
57
+sql_connection = sqlite:////var/lib/quantum/midonet.sqlite
58
# Database reconnection retry times - in event connectivity is lost
59
# set to -1 implies an infinite retry count
60
# sql_max_retries = 10
61
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
62
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/nec/nec.ini 2013-06-20 08:30:58.000000000 -0500
63
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/nec/nec.ini 2013-06-20 08:39:27.267763537 -0500
65
# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
66
# Replace 127.0.0.1 above with the IP address of the database used by the
67
# main quantum server. (Leave it as is if the database runs on this host.)
68
-sql_connection = sqlite://
69
+sql_connection = sqlite:////var/lib/quantum/nec.sqlite
70
# Database reconnection retry times - in event connectivity is lost
71
# set to -1 implies an infinite retry count
72
# sql_max_retries = 10
73
@@ -43,7 +43,7 @@ polling_interval = 2
74
# Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
75
# root filter facility.
76
# Change to "sudo" to skip the filtering and just run the comand directly
78
+root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
81
# Firewall driver for realizing quantum security group function
82
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
83
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/nicira/nvp.ini 2013-06-20 08:30:58.000000000 -0500
84
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/nicira/nvp.ini 2013-06-20 08:39:27.267763537 -0500
86
# sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum
87
# Replace 127.0.0.1 above with the IP address of the database used by the
88
# main quantum server. (Leave it as is if the database runs on this host.)
89
-sql_connection = sqlite://
90
+sql_connection = sqlite:////var/lib/quantum/nvp.sqlite
92
# Number of reconnection attempts to the DB; Set to -1 to try indefinitely
93
# sql_max_retries = 10
94
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
95
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-06-20 08:30:58.000000000 -0500
96
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-06-20 08:39:27.267763537 -0500
98
# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
99
# Replace 127.0.0.1 above with the IP address of the database used by the
100
# main quantum server. (Leave it as is if the database runs on this host.)
101
-sql_connection = sqlite://
102
+sql_connection = sqlite:////var/lib/quantum/ovs.sqlite
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
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
107
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-06-20 08:30:58.000000000 -0500
108
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-06-20 08:39:27.271763537 -0500
110
# sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum
111
# Replace <host> above with the IP address of the database used by the
112
# main quantum server.
113
-# sql_connection = sqlite://
114
+sql_connection = sqlite:////var/lib/quantum/plumgrid.sqlite
115
# Database reconnection retry times - in event connectivity is lost
116
# set to -1 implies an infinite retry count
117
# sql_max_retries = 10
118
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
119
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum/plugins/ryu/ryu.ini 2013-06-20 08:30:58.000000000 -0500
120
+++ quantum-2013.2.a814.g9a884ce/etc/quantum/plugins/ryu/ryu.ini 2013-06-20 08:39:27.271763537 -0500
122
# This line MUST be changed to actually run the plugin.
123
# Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum
124
#sql_connection = mysql://<user>:<pass>@<IP>:<port>/<dbname>
125
-sql_connection = sqlite://
126
+sql_connection = sqlite:////var/lib/quantum/ryu.sqlite
127
# Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
128
# sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
129
# sql_dbpool_enable = False
130
diff -Naurp quantum-2013.2.a814.g9a884ce.orig/etc/quantum.conf quantum-2013.2.a814.g9a884ce/etc/quantum.conf
131
--- quantum-2013.2.a814.g9a884ce.orig/etc/quantum.conf 2013-06-20 08:30:58.000000000 -0500
132
+++ quantum-2013.2.a814.g9a884ce/etc/quantum.conf 2013-06-20 08:39:27.271763537 -0500
133
@@ -46,12 +46,13 @@ bind_port = 9696
135
# Quantum plugin provider module
137
+core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2
139
# Advanced service modules
142
# Paste configuration file
143
-api_paste_config = api-paste.ini
144
+api_paste_config = /etc/quantum/api-paste.ini
146
# The strategy to be used for auth.
147
# Supported values are 'keystone'(default), 'noauth'.
148
@@ -301,6 +302,7 @@ notification_topics = notifications
149
# root filter facility.
150
# Change to "sudo" to skip the filtering and just run the comand directly
152
+root_helper = sudo quantum-rootwrap /etc/quantum/rootwrap.conf
154
# =========== items for agent management extension =============
155
# seconds between nodes reporting state to server, should be less than
1
diff -Naurp neutron-2013.2.a951.ga79faea.orig/etc/neutron.conf neutron-2013.2.a951.ga79faea/etc/neutron.conf
2
--- neutron-2013.2.a951.ga79faea.orig/etc/neutron.conf 2013-07-15 10:38:36.000000000 -0400
3
+++ neutron-2013.2.a951.ga79faea/etc/neutron.conf 2013-07-15 10:53:13.120144414 -0400
4
@@ -330,7 +330,7 @@ signing_dir = /var/lib/quantum/keystone-
5
# connection = mysql://root:pass@127.0.0.1:3306/quantum
6
# Replace 127.0.0.1 above with the IP address of the database used by the
7
# main quantum server. (Leave it as is if the database runs on this host.)
8
-# connection = sqlite://
9
+connection = sqlite:////var/lib/neutron/neutron.sqlite
11
# The SQLAlchemy connection string used to connect to the slave database