openstack/openstack-manuals
Code Issues Proposed changes

Merge "install: Update mariadb configuration"

Browse Source
This commit is contained in:
Jenkins 2015-10-13 16:13:36 +00:00 committed by Gerrit Code Review
commit fc2dc7bb7a
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
doc/install-guide/source/environment-dependencies.rst
View File

@ -335,15 +335,29 @@ Install and configure the database server
- In the ``[mysqld]`` section, set the following keys to enable - In the ``[mysqld]`` section, set the following keys to enable
useful options and the UTF-8 character set: useful options and the UTF-8 character set:
.. code-block:: ini .. only:: rdo
.. code-block:: ini
[mysqld]
...
default-storage-engine = innodb
innodb_file_per_table
collation-server = utf8_general_ci
init-connect = 'SET NAMES utf8'
character-set-server = utf8
.. only:: obs
.. code-block:: ini
[mysqld]
...
default-storage-engine = innodb
innodb_file_per_table
collation-server = utf8_general_ci
character-set-server = utf8
[mysqld]
...
default-storage-engine = innodb
innodb_file_per_table
collation-server = utf8_general_ci
init-connect = 'SET NAMES utf8'
character-set-server = utf8
To finalize installation To finalize installation
------------------------ ------------------------