From a3b03dc8c33812e2c6343d4fc5abf16dcc3b3468 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 20 Oct 2013 19:59:18 +0200 Subject: [PATCH] Install Guide: Don't use obsolete sql_connection For neutron and ceilometer, sql_connection is deprecated use instead: [database] connection Fixes some wrong format connection strings. Also, reconnect_interval is deprecated in favor of retry_interval Change-Id: Ieb72349bafcbd1795d64f832d64fdbce695147bf Backport: stable/havana Partial-Bug: #1243131 Closes-Bug: #1205060 --- .../section_networking-adv-config.xml | 4 ++-- .../section_networking-multi-dhcp-agents.xml | 8 +++---- .../ap-ceilometer-agent-central.txt | 7 +++--- .../ap-neutron-server.txt | 7 +++--- ...tion_networking-neutron-server-install.xml | 2 +- doc/install-guide/section_neutron-install.xml | 22 +++++++++---------- ...r-tenant-routers-with-private-networks.xml | 6 ++--- ...-provider-router-with-private_networks.xml | 10 ++++----- .../section_neutron-single-flat.xml | 4 ++-- .../ch042_database-overview.xml | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/doc/config-reference/networking/section_networking-adv-config.xml b/doc/config-reference/networking/section_networking-adv-config.xml index 6087bb8450..9e20562cd3 100644 --- a/doc/config-reference/networking/section_networking-adv-config.xml +++ b/doc/config-reference/networking/section_networking-adv-config.xml @@ -69,7 +69,7 @@ mysql> grant all on <database-name>.* to '<user-name>'@'%';neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 - sql_connection (in the plugin configuration file) + connection (in the plugin configuration file, section [database]) mysql://<username>:<password>@localhost/ovs_neutron?charset=utf8 @@ -89,7 +89,7 @@ mysql> grant all on <database-name>.* to '<user-name>'@'%';neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2 - sql_connection (in the plugin configuration file) + connection (in the plugin configuration file, section [database]) mysql://<username>:<password>@localhost/neutron_linux_bridge?charset=utf8 diff --git a/doc/config-reference/networking/section_networking-multi-dhcp-agents.xml b/doc/config-reference/networking/section_networking-multi-dhcp-agents.xml index ab2af12288..59da85cf5e 100644 --- a/doc/config-reference/networking/section_networking-multi-dhcp-agents.xml +++ b/doc/config-reference/networking/section_networking-multi-dhcp-agents.xml @@ -115,8 +115,8 @@ agent_down_time = 5 tenant_network_type = vlan network_vlan_ranges = physnet1:1000:2999 [database] -sql_connection = mysql://root:root@127.0.0.1:3306/neutron_linux_bridge -reconnect_interval = 2 +connection = mysql://root:root@127.0.0.1:3306/neutron_linux_bridge +retry_interval = 2 [linux_bridge] physical_interface_mappings = physnet1:eth0 @@ -145,8 +145,8 @@ host = HostA tenant_network_type = vlan network_vlan_ranges = physnet1:1000:2999 [database] -sql_connection = mysql://root:root@127.0.0.1:3306/neutron_linux_bridge -reconnect_interval = 2 +connection = mysql://root:root@127.0.0.1:3306/neutron_linux_bridge +retry_interval = 2 [linux_bridge] physical_interface_mappings = physnet1:eth0 diff --git a/doc/high-availability-guide/ap-ceilometer-agent-central.txt b/doc/high-availability-guide/ap-ceilometer-agent-central.txt index 1202062fc1..e7664f98a3 100644 --- a/doc/high-availability-guide/ap-ceilometer-agent-central.txt +++ b/doc/high-availability-guide/ap-ceilometer-agent-central.txt @@ -51,13 +51,14 @@ service, and its dependent resources, on one of your nodes. Edit +/etc/ceilometer/ceilometer.conf+ : ---- -# We have to use MySQL connection to store datas : -sql_connection=mysql://ceilometer:password@192.168.42.101/ceilometer - # We use API VIP for Identity Service connection : os_auth_url=http://192.168.42.103:5000/v2.0 # We send notifications to High Available RabbitMQ : notifier_strategy = rabbit rabbit_host = 192.168.42.102 + +[database] +# We have to use MySQL connection to store datas : +sql_connection=mysql://ceilometer:password@192.168.42.101/ceilometer ---- diff --git a/doc/high-availability-guide/ap-neutron-server.txt b/doc/high-availability-guide/ap-neutron-server.txt index 878e019e37..9ab1e3c757 100644 --- a/doc/high-availability-guide/ap-neutron-server.txt +++ b/doc/high-availability-guide/ap-neutron-server.txt @@ -46,15 +46,16 @@ Edit +/etc/neutron/neutron.conf+ : # We bind the service to the VIP : bind_host = 192.168.42.103 -# We have to use MySQL connection to store datas : -sql_connection = mysql://neutron:password@192.168.42.101/neutron - # We bind OpenStack Networking Server to the VIP : bind_host = 192.168.42.103 # We send notifications to Highly available RabbitMQ : notifier_strategy = rabbit rabbit_host = 192.168.42.102 + +[database] +# We have to use MySQL connection to store datas : +connection = mysql://neutron:password@192.168.42.101/neutron ---- diff --git a/doc/install-guide/section_networking-neutron-server-install.xml b/doc/install-guide/section_networking-neutron-server-install.xml index e46929bd3f..779df25b78 100644 --- a/doc/install-guide/section_networking-neutron-server-install.xml +++ b/doc/install-guide/section_networking-neutron-server-install.xml @@ -43,7 +43,7 @@ Set in the file: - sql_connection = mysql://<user>:<password>@localhost/neutron?charset=utf8 + connection = mysql://<user>:<password>@localhost/neutron?charset=utf8 diff --git a/doc/install-guide/section_neutron-install.xml b/doc/install-guide/section_neutron-install.xml index bc13f173a9..5fa8478a1c 100644 --- a/doc/install-guide/section_neutron-install.xml +++ b/doc/install-guide/section_neutron-install.xml @@ -129,12 +129,12 @@ admin_password=NEUTRON_PASS Edit the /etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini file under the [database] section: - [DATABASE] -connection = mysql://neutronUser:NEUTRON_DBPass@10.10.10.51/neutron + [database] +connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron - Also edit the [OVS] section: - [OVS] + Also edit the [ovs] section: + [ovs] tenant_network_type = gre tunnel_id_ranges = 1:1000 enable_tunneling = True @@ -142,7 +142,7 @@ enable_tunneling = True Edit the [securitygroup] to change the firewall driver: - [SECURITYGROUP] + [securitygroup] firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver @@ -259,7 +259,7 @@ admin_password = NEUTRON_PASS Edit the database URL under the [database] section: [database] - connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron +connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron Edit the @@ -314,10 +314,8 @@ admin_password = NEUTRON_PASS Finally, you must tell the OVS plug-in how to connect to the database by editing /etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini: - - [database] - connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron - + [database] +connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron Now, you must decide which networking type you want. @@ -685,7 +683,7 @@ PUT_YOUR_RPC_BACKEND_SETTINGS_HERE_TOO /etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini file: [database] -sql_connection = DATABASE_TYPE://neutron:NETURON_PASSWORD@CONTROLLER_NODE_HOSTNAME/neutron +connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron Configure the network type that you chose when you @@ -892,7 +890,7 @@ security_group_api=neutron /etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini file: [database] -sql_connection = DATABASE_TYPE://neutron:NETURON_PASSWORD@CONTROLLER_NODE_HOSTNAME/neutron +connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron Configure the network type that you chose when you diff --git a/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml b/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml index c67cb02894..6f7221d19a 100644 --- a/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml +++ b/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml @@ -165,7 +165,7 @@ admin_password=servicepassword Update the plug-in configuration file, /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini: [database] -sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 +connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 [ovs] tenant_network_type = gre tunnel_id_ranges = 1:1000 @@ -236,7 +236,7 @@ notification_driver = neutron.openstack.common.notifier.rabbit_notifier /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini. Compute node: [database] -sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 +connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 [ovs] tenant_network_type = gre tunnel_id_ranges = 1:1000 @@ -245,7 +245,7 @@ local_ip = 9.181.89.202 Network node: [database] -sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 +connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 [ovs] tenant_network_type = gre tunnel_id_ranges = 1:1000 diff --git a/doc/install-guide/section_neutron-provider-router-with-private_networks.xml b/doc/install-guide/section_neutron-provider-router-with-private_networks.xml index f4e5271dd3..22f9d7d42e 100644 --- a/doc/install-guide/section_neutron-provider-router-with-private_networks.xml +++ b/doc/install-guide/section_neutron-provider-router-with-private_networks.xml @@ -105,7 +105,7 @@ rabbit_password = guest /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini and modify: [database] -sql_connection = mysql://neutron:password@localhost:3306/neutron +connection = mysql://neutron:password@localhost:3306/neutron [ovs] tenant_network_type = vlan network_vlan_ranges = physnet1:100:2999 @@ -157,9 +157,9 @@ rabbit_host = controller Update the plugin configuration file, /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini - : + : [database] -sql_connection = mysql://neutron:password@192.168.0.1:3306/neutron +connection = mysql://neutron:password@192.168.0.1:3306/neutron [ovs] tenant_network_type=vlan network_vlan_ranges = physnet1:1:4094 @@ -243,7 +243,7 @@ admin_password = password Update the OpenStack Networking configuration file - /etc/neutron/neutron.conf: + /etc/neutron/neutron.conf: rabbit_password = guest rabbit_host = controller @@ -251,7 +251,7 @@ rabbit_host = controller Update the file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini: [database] -sql_connection = mysql://neutron:password@192.168.0.1:3306/neutron +connection = mysql://neutron:password@192.168.0.1:3306/neutron [ovs] tenant_network_type = vlan network_vlan_ranges = physnet1:1:4094 diff --git a/doc/install-guide/section_neutron-single-flat.xml b/doc/install-guide/section_neutron-single-flat.xml index bb12a4c49f..86183bc215 100644 --- a/doc/install-guide/section_neutron-single-flat.xml +++ b/doc/install-guide/section_neutron-single-flat.xml @@ -131,7 +131,7 @@ admin_password=servicepassword Update the plugin configuration file, /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini: [database] -sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 +connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 [ovs] network_vlan_ranges = physnet1 bridge_mappings = physnet1:br-eth0 @@ -194,7 +194,7 @@ notification_driver = neutron.openstack.common.notifier.rabbit_notifierUpdate the plugin configuration file, /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini: [database] -sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 +connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 [ovs] network_vlan_ranges = physnet1 bridge_mappings = physnet1:br-eth0 diff --git a/doc/security-guide/ch042_database-overview.xml b/doc/security-guide/ch042_database-overview.xml index 5b07e65a50..88b7a20401 100644 --- a/doc/security-guide/ch042_database-overview.xml +++ b/doc/security-guide/ch042_database-overview.xml @@ -88,7 +88,7 @@ hostssl dbname compute01 hostname cert OpenStack Service Database Configuration If your database server is configured to require X.509 certificates for authentication you will need to specify the appropriate SQLAlchemy query parameters for the database backend. These parameters specify the certificate, private key, and certificate authority information for use with the initial connection string. Example of an :sql_connection string for X.509 certificate authentication to MySQL: -   + sql_connection = mysql://compute01:password@localhost/nova? charset=utf8&ssl_ca=/etc/mysql/cacert.pem&ssl_cert=/etc/mysql/server-cert.pem&ssl_key=/etc/mysql/server-key.pem