Updated Branches: refs/heads/4.1 5594b1d62 -> 85db26770
CLOUDSTACK-1106: Fix documentation for cloud-setup-databases Signed-off-by: Rohit Yadav <[email protected]> (cherry picked from commit 03b8181dcb8f7433204caea5ae69ce1c0a37a9de) Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/85db2677 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/85db2677 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/85db2677 Branch: refs/heads/4.1 Commit: 85db267709de1544561ea203479aa80554866468 Parents: 5594b1d Author: Logan McNaughton <[email protected]> Authored: Mon Feb 4 15:10:36 2013 -0500 Committer: Rohit Yadav <[email protected]> Committed: Tue Feb 12 21:06:10 2013 +0530 ---------------------------------------------------------------------- .../management-server-install-db-external.xml | 7 ++++++- docs/en-US/management-server-install-db-local.xml | 9 +++++++-- .../en-US/management-server-install-multi-node.xml | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/85db2677/docs/en-US/management-server-install-db-external.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/management-server-install-db-external.xml b/docs/en-US/management-server-install-db-external.xml index 3bba45f..a28dee5 100644 --- a/docs/en-US/management-server-install-db-external.xml +++ b/docs/en-US/management-server-install-db-external.xml @@ -127,12 +127,17 @@ bind-address = 0.0.0.0</programlisting> recommended that you replace this with a more secure value. See <xref linkend="about-password-encryption"/>.</para> </listitem> + <listitem> + <para>(Optional) For management_server_ip, you may explicitly specify cluster management + server node IP. If not specified, the local IP address will be used.</para> + </listitem> </itemizedlist> <programlisting language="Bash">cloud-setup-databases cloud:<dbpassword>@<ip address mysql server> \ --deploy-as=root:<password> \ -e <encryption_type> \ -m <management_server_key> \ --k <database_key></programlisting> +-k <database_key> \ +-i <management_server_ip></programlisting> <para>When this script is finished, you should see a message like âSuccessfully initialized the database.â</para> </listitem> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/85db2677/docs/en-US/management-server-install-db-local.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/management-server-install-db-local.xml b/docs/en-US/management-server-install-db-local.xml index 3e09c55..2422490 100644 --- a/docs/en-US/management-server-install-db-local.xml +++ b/docs/en-US/management-server-install-db-local.xml @@ -98,12 +98,17 @@ binlog-format = 'ROW'</programlisting> recommended that you replace this with a more secure value. See <xref linkend="about-password-encryption"/>.</para> </listitem> + <listitem> + <para>(Optional) For management_server_ip, you may explicitly specify cluster management + server node IP. If not specified, the local IP address will be used.</para> + </listitem> </itemizedlist> <programlisting language="Bash">cloud-setup-databases cloud:<dbpassword>@localhost \ --deploy-as=root:<password> \ -e <encryption_type> \ -m <management_server_key> \ --k <database_key></programlisting> +-k <database_key> \ +-i <management_server_ip></programlisting> <para>When this script is finished, you should see a message like âSuccessfully initialized the database.â</para> </listitem> @@ -118,7 +123,7 @@ binlog-format = 'ROW'</programlisting> <listitem> <para>Now that the database is set up, you can finish configuring the OS for the Management Server. This command will set up iptables, sudoers, and start the Management Server.</para> - <programlisting language="Bash"># cloud-setup-management</programlisting> + <programlisting><prompt>#</prompt> cloud-setup-management</programlisting> <para>You should see the message â&PRODUCT; Management Server setup is done.â</para> </listitem> </orderedlist> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/85db2677/docs/en-US/management-server-install-multi-node.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/management-server-install-multi-node.xml b/docs/en-US/management-server-install-multi-node.xml index e61f623..3f011b8 100644 --- a/docs/en-US/management-server-install-multi-node.xml +++ b/docs/en-US/management-server-install-multi-node.xml @@ -53,7 +53,7 @@ linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> as <para>Configure the database client. Note the absence of the --deploy-as argument in this case. (For more details about the arguments to this command, see <xref linkend="management-server-install-db-external"/>.) </para> - <programlisting><prompt>#</prompt> cloud-setup-databases cloud:<replaceable>dbpassword</replaceable>@<replaceable>dbhost</replaceable> -e <replaceable>encryption_type</replaceable> -m <replaceable>management_server_key</replaceable> -k <replaceable>database_key</replaceable> + <programlisting><prompt>#</prompt> cloud-setup-databases cloud:<replaceable>dbpassword</replaceable>@<replaceable>dbhost</replaceable> -e <replaceable>encryption_type</replaceable> -m <replaceable>management_server_key</replaceable> -k <replaceable>database_key</replaceable> -i <replaceable>management_server_ip</replaceable> </programlisting> </listitem> <listitem> @@ -69,4 +69,4 @@ linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> as Load Balancing.</para> </listitem> </orderedlist> -</section> \ No newline at end of file +</section>
