From 5f58021891059bf4f8ac0fef2decc72776fe1407 Mon Sep 17 00:00:00 2001
From: daz <dazzachan@yahoo.com.au>
Date: Wed, 28 Sep 2016 15:51:43 +1000
Subject: [PATCH] [install guide] Change database configuration file path

1. Update file path for Ubuntu 16.04.
2. Move choosing your password step to the "Finalize installation"
section.

Change-Id: Idc755f7046abc3eb13ff484535fdeb0de29d6836
Closes-bug: #1628375
---
 .../source/environment-sql-database.rst       | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/doc/install-guide/source/environment-sql-database.rst b/doc/install-guide/source/environment-sql-database.rst
index fce5e52f6a..02c6c2a02b 100644
--- a/doc/install-guide/source/environment-sql-database.rst
+++ b/doc/install-guide/source/environment-sql-database.rst
@@ -36,7 +36,7 @@ Install and configure components
 
          # zypper install mariadb-client mariadb python-PyMySQL
 
-.. only:: ubuntu or debian
+.. only:: debian
 
    2. Choose a suitable password for the database ``root`` account.
 
@@ -60,6 +60,28 @@ Install and configure components
            collation-server = utf8_general_ci
            character-set-server = utf8
 
+.. only:: ubuntu
+
+   2. Create and edit the ``/etc/mysql/mariadb.conf.d/99-openstack.cnf`` file
+      and complete the following actions:
+
+      - Create a ``[mysqld]`` section, and set the ``bind-address``
+        key to the management IP address of the controller node to
+        enable access by other nodes via the management network. Set
+        additional keys to enable useful options and the UTF-8
+        character set:
+
+        .. code-block:: ini
+
+           [mysqld]
+           bind-address = 10.0.0.11
+
+           default-storage-engine = innodb
+           innodb_file_per_table
+           max_connections = 4096
+           collation-server = utf8_general_ci
+           character-set-server = utf8
+
 .. only:: obs or rdo
 
    2. Create and edit the ``/etc/my.cnf.d/openstack.cnf`` file
@@ -112,16 +134,7 @@ Finalize installation
             # systemctl enable mysql.service
             # systemctl start mysql.service
 
-.. only:: ubuntu
-
-   2. Secure the database service by running the ``mysql_secure_installation``
-      script.
-
-      .. code-block:: console
-
-         # mysql_secure_installation
-
-.. only:: rdo or obs
+.. only:: rdo or obs or ubuntu
 
    2. Secure the database service by running the ``mysql_secure_installation``
       script. In particular, choose a suitable password for the database