Merge "Clarify Database setup"

This commit is contained in:
Jenkins 2014-08-25 07:34:59 +00:00 committed by Gerrit Code Review
commit ef6ee6cd56

View File

@ -11,7 +11,7 @@
use a MySQL database that runs on the controller node. You must use a MySQL database that runs on the controller node. You must
install the MySQL database on the controller node. You must also install the MySQL database on the controller node. You must also
install the MySQL Python library on any additional nodes that install the MySQL Python library on any additional nodes that
access MySQL.</para> access MySQL. The following sections give detailed instructions.</para>
<para os="opensuse;sles">Most OpenStack services require a <para os="opensuse;sles">Most OpenStack services require a
database to store information. This guide uses a MySQL database database to store information. This guide uses a MySQL database
on SUSE Linux Enterprise Server and a compatible database on on SUSE Linux Enterprise Server and a compatible database on
@ -19,7 +19,8 @@
database for openSUSE is MariaDB. You must install the MariaDB database for openSUSE is MariaDB. You must install the MariaDB
database on the controller node. You must install the MySQL database on the controller node. You must install the MySQL
Python library on any additional nodes that access MySQL or MariaDB. Python library on any additional nodes that access MySQL or MariaDB.
</para> The following sections give detailed instructions.
</para>
<section xml:id="basics-database-controller"> <section xml:id="basics-database-controller">
<title>Controller node</title> <title>Controller node</title>
<para><phrase os="sles">For SUSE Linux Enterprise Server: <para><phrase os="sles">For SUSE Linux Enterprise Server: