You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pd...@apache.org on 2015/03/08 22:53:41 UTC

cloudstack-docs-install git commit: CLOUDSTACK-4150: mysql configuration doc arrangement

Repository: cloudstack-docs-install
Updated Branches:
  refs/heads/master 47d5abd31 -> 41a6fda92


CLOUDSTACK-4150: mysql configuration doc arrangement


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/commit/41a6fda9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/tree/41a6fda9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/diff/41a6fda9

Branch: refs/heads/master
Commit: 41a6fda92f2f780c4e749b8348729b7ec1f1152e
Parents: 47d5abd
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Sun Mar 8 17:53:25 2015 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Sun Mar 8 17:53:25 2015 -0400

----------------------------------------------------------------------
 source/management-server/_database.rst | 31 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/41a6fda9/source/management-server/_database.rst
----------------------------------------------------------------------
diff --git a/source/management-server/_database.rst b/source/management-server/_database.rst
index 3956f3e..793367b 100644
--- a/source/management-server/_database.rst
+++ b/source/management-server/_database.rst
@@ -48,18 +48,13 @@ MySQL. See :ref:`install-database-on-separate-node`.
 #. Open the MySQL configuration file. The configuration file is
    ``/etc/my.cnf`` or ``/etc/mysql/my.cnf``, depending on your OS.
 
-#. Insert the following lines in the [mysqld] section.
+   Insert the following lines in the ``[mysqld]`` section.
 
    You can put these lines below the datadir line. The max\_connections
    parameter should be set to 350 multiplied by the number of Management
    Servers you are deploying. This example assumes one Management
    Server.
 
-   .. note:: 
-      On Ubuntu, you can also create a file `/etc/mysql/conf.d/cloudstack.cnf` 
-      and add these directives there. Don't forget to add [mysqld] on the 
-      first line of the file.
-
    .. sourcecode:: bash
 
       innodb_rollback_on_timeout=1
@@ -68,6 +63,13 @@ MySQL. See :ref:`install-database-on-separate-node`.
       log-bin=mysql-bin
       binlog-format = 'ROW'
 
+   .. note:: 
+      You can also create a file ``/etc/mysql/conf.d/cloudstack.cnf`` 
+      and add these directives there. Don't forget to add ``[mysqld]`` on the 
+      first line of the file.
+
+
+
 #. Start or restart MySQL to put the new configuration into effect.
 
    On RHEL/CentOS, MySQL doesn't automatically start after installation.
@@ -145,6 +147,15 @@ MySQL. See :ref:`install-database-on-separate-node`.
 #. Set up the database. The following command creates the "cloud" user
    on the database.
 
+   .. sourcecode:: bash
+
+      cloudstack-setup-databases cloud:<dbpassword>@localhost \
+      --deploy-as=root:<password> \
+      -e <encryption_type> \
+      -m <management_server_key> \
+      -k <database_key> \
+      -i <management_server_ip>
+
    -  In dbpassword, specify the password to be assigned to the "cloud"
       user. You can choose to provide no password although that is not
       recommended.
@@ -174,14 +185,6 @@ MySQL. See :ref:`install-database-on-separate-node`.
       cluster management server node IP. If not specified, the local IP
       address will be used.
 
-   .. sourcecode:: bash
-
-      cloudstack-setup-databases cloud:<dbpassword>@localhost \
-      --deploy-as=root:<password> \
-      -e <encryption_type> \
-      -m <management_server_key> \
-      -k <database_key> \
-      -i <management_server_ip>
 
    When this script is finished, you should see a message like
    “Successfully initialized the database.”