openstack/openstack-manuals
Code Issues Proposed changes

Install Guide: Don't use obsolete sql_connection

Browse Source 
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
This commit is contained in:
Andreas Jaeger 2013-10-20 19:59:18 +02:00
parent 323c1340e0
commit a3b03dc8c3
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/config-reference/networking/section_networking-adv-config.xml
View File

@ -69,7 +69,7 @@ mysql&gt; grant all on &lt;database-name&gt;.* to '&lt;user-name&gt;'@'%';</comp
<td>neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</td> <td>neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</td>
</tr> </tr>
<tr> <tr>
<td>sql_connection (in the plugin configuration file)</td> <td>connection (in the plugin configuration file, section <code>[database]</code>)</td>
<td>mysql://&lt;username&gt;:&lt;password&gt;@localhost/ovs_neutron?charset=utf8</td> <td>mysql://&lt;username&gt;:&lt;password&gt;@localhost/ovs_neutron?charset=utf8</td>
</tr> </tr>
<tr> <tr>
@ -89,7 +89,7 @@ mysql&gt; grant all on &lt;database-name&gt;.* to '&lt;user-name&gt;'@'%';</comp
<td>neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2</td> <td>neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2</td>
</tr> </tr>
<tr> <tr>
<td>sql_connection (in the plugin configuration file)</td> <td>connection (in the plugin configuration file, section <code>[database]</code>)</td>
<td>mysql://&lt;username&gt;:&lt;password&gt;@localhost/neutron_linux_bridge?charset=utf8</td> <td>mysql://&lt;username&gt;:&lt;password&gt;@localhost/neutron_linux_bridge?charset=utf8</td>
</tr> </tr>
<tr> <tr>

8
doc/config-reference/networking/section_networking-multi-dhcp-agents.xml
View File

@ -115,8 +115,8 @@ agent_down_time = 5
tenant_network_type = vlan tenant_network_type = vlan
network_vlan_ranges = physnet1:1000:2999 network_vlan_ranges = physnet1:1000:2999
[database] [database]
sql_connection = mysql://root:root@127.0.0.1:3306/neutron_linux_bridge connection = mysql://root:root@127.0.0.1:3306/neutron_linux_bridge
reconnect_interval = 2 retry_interval = 2
[linux_bridge] [linux_bridge]
physical_interface_mappings = physnet1:eth0 physical_interface_mappings = physnet1:eth0
</programlisting> </programlisting>
@ -145,8 +145,8 @@ host = HostA
tenant_network_type = vlan tenant_network_type = vlan
network_vlan_ranges = physnet1:1000:2999 network_vlan_ranges = physnet1:1000:2999
[database] [database]
sql_connection = mysql://root:root@127.0.0.1:3306/neutron_linux_bridge connection = mysql://root:root@127.0.0.1:3306/neutron_linux_bridge
reconnect_interval = 2 retry_interval = 2
[linux_bridge] [linux_bridge]
physical_interface_mappings = physnet1:eth0</programlisting> physical_interface_mappings = physnet1:eth0</programlisting>
</listitem> </listitem>

7
doc/high-availability-guide/ap-ceilometer-agent-central.txt
View File

@ -51,13 +51,14 @@ service, and its dependent resources, on one of your nodes.
Edit +/etc/ceilometer/ceilometer.conf+ : 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 : # We use API VIP for Identity Service connection :
os_auth_url=http://192.168.42.103:5000/v2.0 os_auth_url=http://192.168.42.103:5000/v2.0
# We send notifications to High Available RabbitMQ : # We send notifications to High Available RabbitMQ :
notifier_strategy = rabbit notifier_strategy = rabbit
rabbit_host = 192.168.42.102 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
---- ----

7
doc/high-availability-guide/ap-neutron-server.txt
View File

@ -46,15 +46,16 @@ Edit +/etc/neutron/neutron.conf+ :
# We bind the service to the VIP : # We bind the service to the VIP :
bind_host = 192.168.42.103 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 : # We bind OpenStack Networking Server to the VIP :
bind_host = 192.168.42.103 bind_host = 192.168.42.103
# We send notifications to Highly available RabbitMQ : # We send notifications to Highly available RabbitMQ :
notifier_strategy = rabbit notifier_strategy = rabbit
rabbit_host = 192.168.42.102 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
---- ----

2
doc/install-guide/section_networking-neutron-server-install.xml
View File

@ -43,7 +43,7 @@
</step> </step>
<step> <step>
<para>Set in the file:</para> <para>Set in the file:</para>
<screen><computeroutput>sql_connection = mysql://&lt;user&gt;:&lt;password&gt;@localhost/neutron?charset=utf8</computeroutput></screen> <screen><computeroutput>connection = mysql://&lt;user&gt;:&lt;password&gt;@localhost/neutron?charset=utf8</computeroutput></screen>
</step> </step>
</substeps> </substeps>
</step> </step>

22
doc/install-guide/section_neutron-install.xml
View File

@ -129,12 +129,12 @@ admin_password=<replaceable>NEUTRON_PASS</replaceable></programlisting>
<para>Edit the <para>Edit the
<filename>/etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini</filename> <filename>/etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini</filename>
file under the <literal>[database]</literal> section:</para> file under the <literal>[database]</literal> section:</para>
<programlisting language="ini">[DATABASE] <programlisting language="ini">[database]
connection = mysql://neutronUser:NEUTRON_DBPass@10.10.10.51/neutron</programlisting> connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron</programlisting>
</step> </step>
<step> <step>
<para>Also edit the <literal>[OVS]</literal> section:</para> <para>Also edit the <literal>[ovs]</literal> section:</para>
<programlisting language="ini">[OVS] <programlisting language="ini">[ovs]
tenant_network_type = gre tenant_network_type = gre
tunnel_id_ranges = 1:1000 tunnel_id_ranges = 1:1000
enable_tunneling = True</programlisting> enable_tunneling = True</programlisting>
@ -142,7 +142,7 @@ enable_tunneling = True</programlisting>
<step> <step>
<para>Edit the <literal>[securitygroup]</literal> to change the <para>Edit the <literal>[securitygroup]</literal> to change the
firewall driver:</para> firewall driver:</para>
<programlisting language="ini">[SECURITYGROUP] <programlisting language="ini">[securitygroup]
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting> firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting>
</step> </step>
</procedure> </procedure>
@ -259,7 +259,7 @@ admin_password = NEUTRON_PASS</programlisting>
<para>Edit the database URL under the <para>Edit the database URL under the
<literal>[database]</literal> section:</para> <literal>[database]</literal> section:</para>
<programlisting language="ini">[database] <programlisting language="ini">[database]
connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron</programlisting> connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron</programlisting>
</step> </step>
<step> <step>
<para>Edit the <para>Edit the
@ -314,10 +314,8 @@ admin_password = NEUTRON_PASS</programlisting>
<para>Finally, you must tell the <acronym>OVS</acronym> <para>Finally, you must tell the <acronym>OVS</acronym>
plug-in how to connect to the database by editing plug-in how to connect to the database by editing
<filename>/etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini</filename>:</para> <filename>/etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini</filename>:</para>
<programlisting language="ini"> <programlisting language="ini">[database]
[database] connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron</programlisting>
connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron
</programlisting>
</step> </step>
<step> <step>
<para>Now, you must decide which networking type you want. <para>Now, you must decide which networking type you want.
@ -685,7 +683,7 @@ PUT_YOUR_RPC_BACKEND_SETTINGS_HERE_TOO</programlisting>
<filename>/etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini</filename> <filename>/etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini</filename>
file:</para> file:</para>
<programlisting language="ini">[database] <programlisting language="ini">[database]
sql_connection = DATABASE_TYPE://neutron:NETURON_PASSWORD@CONTROLLER_NODE_HOSTNAME/neutron</programlisting> connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron</programlisting>
</step> </step>
<step> <step>
<para>Configure the network type that you chose when you <para>Configure the network type that you chose when you
@ -892,7 +890,7 @@ security_group_api=neutron</programlisting>
<filename>/etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini</filename> <filename>/etc/neutron/plug-ins/openvswitch/ovs_neutron_plugin.ini</filename>
file:</para> file:</para>
<programlisting language="ini">[database] <programlisting language="ini">[database]
sql_connection = DATABASE_TYPE://neutron:NETURON_PASSWORD@CONTROLLER_NODE_HOSTNAME/neutron</programlisting> connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron</programlisting>
</step> </step>
<step> <step>
<para>Configure the network type that you chose when you <para>Configure the network type that you chose when you

6
doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml
View File

@ -165,7 +165,7 @@ admin_password=servicepassword
<para>Update the plug-in configuration file, <para>Update the plug-in configuration file,
<filename>/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para> <filename>/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para>
<programlisting>[database] <programlisting>[database]
sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8
[ovs] [ovs]
tenant_network_type = gre tenant_network_type = gre
tunnel_id_ranges = 1:1000 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</filename>.</para> /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>.</para>
<para>Compute node:</para> <para>Compute node:</para>
<programlisting language="ini">[database] <programlisting language="ini">[database]
sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8
[ovs] [ovs]
tenant_network_type = gre tenant_network_type = gre
tunnel_id_ranges = 1:1000 tunnel_id_ranges = 1:1000
@ -245,7 +245,7 @@ local_ip = 9.181.89.202
</programlisting> </programlisting>
<para>Network node:</para> <para>Network node:</para>
<programlisting language="ini">[database] <programlisting language="ini">[database]
sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8
[ovs] [ovs]
tenant_network_type = gre tenant_network_type = gre
tunnel_id_ranges = 1:1000 tunnel_id_ranges = 1:1000

6
doc/install-guide/section_neutron-provider-router-with-private_networks.xml
View File

@ -105,7 +105,7 @@ rabbit_password = guest</programlisting>
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename> /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>
and modify:</para> and modify:</para>
<programlisting language="ini">[database] <programlisting language="ini">[database]
sql_connection = mysql://neutron:password@localhost:3306/neutron connection = mysql://neutron:password@localhost:3306/neutron
[ovs] [ovs]
tenant_network_type = vlan tenant_network_type = vlan
network_vlan_ranges = physnet1:100:2999</programlisting> network_vlan_ranges = physnet1:100:2999</programlisting>
@ -159,7 +159,7 @@ rabbit_host = controller</programlisting>
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
</filename>:</para> </filename>:</para>
<programlisting language="ini">[database] <programlisting language="ini">[database]
sql_connection = mysql://neutron:password@192.168.0.1:3306/neutron connection = mysql://neutron:password@192.168.0.1:3306/neutron
[ovs] [ovs]
tenant_network_type=vlan tenant_network_type=vlan
network_vlan_ranges = physnet1:1:4094 network_vlan_ranges = physnet1:1:4094
@ -251,7 +251,7 @@ rabbit_host = controller</programlisting>
<para>Update the file <filename> <para>Update the file <filename>
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para> /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para>
<programlisting language="ini">[database] <programlisting language="ini">[database]
sql_connection = mysql://neutron:password@192.168.0.1:3306/neutron connection = mysql://neutron:password@192.168.0.1:3306/neutron
[ovs] [ovs]
tenant_network_type = vlan tenant_network_type = vlan
network_vlan_ranges = physnet1:1:4094 network_vlan_ranges = physnet1:1:4094

4
doc/install-guide/section_neutron-single-flat.xml
View File

@ -131,7 +131,7 @@ admin_password=servicepassword
<para>Update the plugin configuration file, <filename> <para>Update the plugin configuration file, <filename>
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para> /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para>
<programlisting>[database] <programlisting>[database]
sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8
[ovs] [ovs]
network_vlan_ranges = physnet1 network_vlan_ranges = physnet1
bridge_mappings = physnet1:br-eth0 bridge_mappings = physnet1:br-eth0
@ -194,7 +194,7 @@ notification_driver = neutron.openstack.common.notifier.rabbit_notifier</program
<para>Update the plugin configuration file, <filename> <para>Update the plugin configuration file, <filename>
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para> /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para>
<programlisting>[database] <programlisting>[database]
sql_connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8 connection = mysql://root:root@controlnode:3306/ovs_neutron?charset=utf8
[ovs] [ovs]
network_vlan_ranges = physnet1 network_vlan_ranges = physnet1
bridge_mappings = physnet1:br-eth0</programlisting> bridge_mappings = physnet1:br-eth0</programlisting>

2
doc/security-guide/ch042_database-overview.xml
View File

@ -88,7 +88,7 @@ hostssl dbname compute01 hostname cert</screen>
<title>OpenStack Service Database Configuration</title> <title>OpenStack Service Database Configuration</title>
<para>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.</para> <para>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.</para>
<para>Example of an <literal>:sql_connection</literal> string for X.509 certificate authentication to MySQL:</para> <para>Example of an <literal>:sql_connection</literal> string for X.509 certificate authentication to MySQL:</para>
<screen>  <screen>
sql_connection = mysql://compute01:password@localhost/nova? sql_connection = mysql://compute01:password@localhost/nova?
charset=utf8&amp;ssl_ca=/etc/mysql/cacert.pem&amp;ssl_cert=/etc/mysql/server-cert.pem&amp;ssl_key=/etc/mysql/server-key.pem</screen> charset=utf8&amp;ssl_ca=/etc/mysql/cacert.pem&amp;ssl_cert=/etc/mysql/server-cert.pem&amp;ssl_key=/etc/mysql/server-key.pem</screen>
</section> </section>