X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Ffix-quantum-configuration.patch;h=4b4780b7f6bb4f90449f3b8e6441054c37387021;hb=refs%2Fchanges%2F03%2F903%2F2;hp=bdfc073f67e28a21f2de1257feac2f583fa8a0cc;hpb=b6d392370814f21b32ba5f5325a1ebaa1241e103;p=openstack-build%2Fneutron-build.git diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch index bdfc073f6..4b4780b7f 100644 --- a/debian/patches/fix-quantum-configuration.patch +++ b/debian/patches/fix-quantum-configuration.patch @@ -1,133 +1,37 @@ ---- a/etc/quantum/plugins/bigswitch/restproxy.ini -+++ b/etc/quantum/plugins/bigswitch/restproxy.ini -@@ -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 - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/bigswitch.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 ---- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini -+++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini -@@ -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 - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/linuxbridge.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/nec/nec.ini -+++ b/etc/quantum/plugins/nec/nec.ini -@@ -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 - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/nec.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 -@@ -37,7 +37,7 @@ polling_interval = 2 - # Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real - # root filter facility. - # Change to "sudo" to skip the filtering and just run the comand directly --root_helper = sudo -+root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf - - [SECURITYGROUP] - # Firewall driver for realizing quantum security group function ---- a/etc/quantum/plugins/nicira/nvp.ini -+++ b/etc/quantum/plugins/nicira/nvp.ini -@@ -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 - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/nvp.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/openvswitch/ovs_quantum_plugin.ini -+++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini -@@ -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 - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/ovs.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/plumgrid/plumgrid.ini -+++ b/etc/quantum/plugins/plumgrid/plumgrid.ini -@@ -6,7 +6,7 @@ - # sql_connection = mysql://:@:3306/plumgrid_quantum - # Replace 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/ryu/ryu.ini -+++ b/etc/quantum/plugins/ryu/ryu.ini -@@ -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 - #sql_connection = mysql://:@:/ --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/ryu.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 ---- a/etc/quantum.conf -+++ b/etc/quantum.conf -@@ -43,12 +43,13 @@ bind_port = 9696 - - # Quantum plugin provider module - # core_plugin = -+core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2 - - # Advanced service modules - # service_plugins = - - # Paste configuration file --api_paste_config = api-paste.ini -+api_paste_config = /etc/quantum/api-paste.ini - - # The strategy to be used for auth. - # Supported values are 'keystone'(default), 'noauth'. -@@ -251,6 +252,7 @@ notification_topics = notifications +--- a/etc/neutron.conf ++++ b/etc/neutron.conf +@@ -7,7 +7,7 @@ + + # Where to store Neutron state files. This directory must be writable by the + # user executing the agent. +-# state_path = /var/lib/neutron ++state_path = /var/lib/neutron + + # Where to store lock files + lock_path = $state_path/lock +@@ -50,7 +50,7 @@ + # previous versions, the class name of a plugin can be specified instead of its + # entrypoint name. + # +-# core_plugin = ++core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 + # Example: core_plugin = ml2 + + # (ListOpt) List of service plugin entrypoints to be loaded from the +@@ -490,6 +490,7 @@ # root filter facility. # Change to "sudo" to skip the filtering and just run the comand directly # root_helper = sudo -+root_helper = sudo quantum-rootwrap /etc/quantum/rootwrap.conf - ++root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + # =========== items for agent management extension ============= - # seconds between nodes reporting state to server, should be less than ---- a/etc/quantum/plugins/midonet/midonet.ini -+++ b/etc/quantum/plugins/midonet/midonet.ini -@@ -4,7 +4,7 @@ - # sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum + # seconds between nodes reporting state to server; should be less than +@@ -512,7 +513,7 @@ + # connection = mysql://root:pass@127.0.0.1:3306/neutron # Replace 127.0.0.1 above with the IP address of the database used by the - # main quantum server. (Leave it as is if the database runs on this host.) --sql_connection = sqlite:// -+sql_connection = sqlite:////var/lib/quantum/midonet.sqlite - # Database reconnection retry times - in event connectivity is lost - # set to -1 implies an infinite retry count - # sql_max_retries = 10 + # main neutron server. (Leave it as is if the database runs on this host.) +-# connection = sqlite:// ++connection = sqlite:////var/lib/neutron/neutron.sqlite + # NOTE: In deployment the [database] section and its connection attribute may + # be set in the corresponding core plugin '.ini' file. However, it is suggested + # to put the [database] section and its connection attribute in this