openstack/openstack-manuals
Code Issues Proposed changes

Merge "Switch from MySQL-python to PyMySQL"

Browse Source
This commit is contained in:
Jenkins 2015-08-28 00:59:51 +00:00 committed by Gerrit Code Review
commit 080330e951
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.svg
View File

@ -1832,7 +1832,7 @@
<v:ud v:nameU="visIsConnected" v:prompt="" v:val="VT0(0):26"/>
</v:userDefs>
<title>Database server</title>
<desc>MySQL --sql_connection=mysql://$nova_db_user:$nova_db_pass@$n...</desc>
<desc>MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n...</desc>
<g id="shape172-883" v:mID="172" v:groupContext="shape">
<title>Sheet.172</title>
<path d="M43.52 582.21 L51.02 578.17 L51.02 534.92 L31.4 524.41 L0 541.52 L0.01 585.45 A33.0369 30.8521 -180 0 0

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 139 KiB

After

Width:  |  Height:  |  Size: 139 KiB

2
doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.svg
View File

@ -1548,7 +1548,7 @@
<v:ud v:nameU="visIsConnected" v:prompt="" v:val="VT0(0):26"/>
</v:userDefs>
<title>Database server</title>
<desc>MySQL --sql_connection=mysql://$nova_db_user:$nova_db_pass@$n...</desc>
<desc>MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n...</desc>
<g id="shape172-599" v:mID="172" v:groupContext="shape">
<title>Sheet.172</title>
<path d="M43.52 582.21 L51.02 578.17 L51.02 534.92 L31.4 524.41 L0 541.52 L0.01 585.45 A33.0369 30.8521 -180 0 0

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 116 KiB

2
doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.svg
View File

@ -1170,7 +1170,7 @@
<v:ud v:nameU="visIsConnected" v:prompt="" v:val="VT0(0):26"/>
</v:userDefs>
<title>Database server</title>
<desc>MySQL --sql_connection=mysql://$nova_db_user:$nova_db_pass@$n...</desc>
<desc>MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n...</desc>
<g id="shape172-486" v:mID="172" v:groupContext="shape">
<title>Sheet.172</title>
<path d="M43.52 582.21 L51.02 578.17 L51.02 534.92 L31.4 524.41 L0 541.52 L0.01 585.45 A33.0369 30.8521 -180 0 0

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 93 KiB

2
doc/common/samples/cinder.conf
View File

@ -1,6 +1,6 @@
[DEFAULT]
rootwrap_config=/etc/cinder/rootwrap.conf
sql_connection = mysql://cinder:openstack@192.168.127.130/cinder
sql_connection = mysql+pymysql://cinder:openstack@192.168.127.130/cinder
api_paste_config = /etc/cinder/api-paste.ini
iscsi_helper=tgtadm

2
doc/common/samples/nova.conf
View File

@ -68,7 +68,7 @@ api_servers=192.168.206.130:9292
# DATABASE
[database]
connection=mysql://nova:yourpassword@192.168.206.130/nova
connection=mysql+pymysql://nova:yourpassword@192.168.206.130/nova
# LIBVIRT
[libvirt]

2
doc/common/samples/nova.conf-yum
View File

@ -71,4 +71,4 @@ api_servers=192.168.206.130:9292
# DATABASE
[database]
connection=mysql://nova:yourpassword@192.168.206.130/nova
connection=mysql+pymysql://nova:yourpassword@192.168.206.130/nova

2
doc/common/section_config_format.xml
View File

@ -27,7 +27,7 @@ verbose = true
[database]
# The SQLAlchemy connection string used to connect to the
# database (string value)
connection = mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replaceable>controller</replaceable>/keystone</programlisting>
connection = mysql+pymysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replaceable>controller</replaceable>/keystone</programlisting>
<para>

2
doc/config-reference/block-storage/drivers/windows-iscsi-volume-driver.xml
View File

@ -108,7 +108,7 @@ volume_driver = cinder.volume.drivers.windows.WindowsDriver
glance_api_servers = <replaceable>IP_ADDRESS</replaceable>:9292
rabbit_host = <replaceable>IP_ADDRESS</replaceable>
rabbit_port = 5672
sql_connection = mysql://root:Passw0rd@<replaceable>IP_ADDRESS</replaceable>/cinder
sql_connection = mysql+pymysql://root:Passw0rd@<replaceable>IP_ADDRESS</replaceable>/cinder
windows_iscsi_lun_path = C:\iSCSIVirtualDisks
verbose = True
rabbit_password = Passw0rd

2
doc/config-reference/compute/section_compute-config-samples.xml
View File

@ -69,7 +69,7 @@ ca_path=./nova/CA
# Add the following to your conf file if you're running on Ubuntu Maverick
xenapi_remap_vbd_dev=true
[database]
connection=mysql://root:&lt;password&gt;@127.0.0.1/nova</programlisting>
connection=mysql+pymysql://root:&lt;password&gt;@127.0.0.1/nova</programlisting>
<figure xml:id="Nova_conf_XEN_Flat">
<title>KVM, Flat, MySQL, and Glance, OpenStack or EC2
API</title>

2
doc/config-reference/compute/section_hypervisor_hyper-v.xml
View File

@ -240,7 +240,7 @@
</listitem>
</varlistentry>
<varlistentry>
<term><package>MySQL-python</package></term>
<term><package>PyMySQL</package></term>
<listitem>
<para><link xlink:href="http://codegood.com/download/10/">
http://codegood.com/download/10/</link></para>