CLOUDSTACK-1999: Fix cloud/cloudstack due to new packaging
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e06da55 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e06da55 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e06da55 Branch: refs/heads/vmsync Commit: 2e06da552c9561c0ec8612d47b39e66b78bf1cb3 Parents: 5bfae23 Author: Sebastien Goasguen <run...@gmail.com> Authored: Wed Apr 17 12:24:52 2013 -0400 Committer: Joe Brockmeier <j...@zonker.net> Committed: Sun Jun 23 13:48:26 2013 -0500 ---------------------------------------------------------------------- docs/en-US/about-password-encryption.xml | 2 +- docs/en-US/management-server-install-db-external.xml | 2 +- docs/en-US/management-server-install-db-local.xml | 4 ++-- docs/en-US/management-server-install-multi-node.xml | 4 ++-- docs/en-US/region-add.xml | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/about-password-encryption.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/about-password-encryption.xml b/docs/en-US/about-password-encryption.xml index 6c11c57..a13ff60 100644 --- a/docs/en-US/about-password-encryption.xml +++ b/docs/en-US/about-password-encryption.xml @@ -60,6 +60,6 @@ over a known port.</para> <para>The encryption type, database secret key, and Management Server secret key are set during &PRODUCT; installation. They are all parameters to the &PRODUCT; database setup script - (cloud-setup-databases). The default values are file, password, and password. It is, of course, + (cloudstack-setup-databases). The default values are file, password, and password. It is, of course, highly recommended that you change these to more secure keys.</para> </section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/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 a28dee5..2950720 100644 --- a/docs/en-US/management-server-install-db-external.xml +++ b/docs/en-US/management-server-install-db-external.xml @@ -132,7 +132,7 @@ bind-address = 0.0.0.0</programlisting> 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> \ + <programlisting language="Bash">cloudstack-setup-databases cloud:<dbpassword>@<ip address mysql server> \ --deploy-as=root:<password> \ -e <encryption_type> \ -m <management_server_key> \ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/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 310327f..ff5ab60 100644 --- a/docs/en-US/management-server-install-db-local.xml +++ b/docs/en-US/management-server-install-db-local.xml @@ -135,7 +135,7 @@ binlog-format = 'ROW'</programlisting> 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 \ + <programlisting language="Bash">cloudstack-setup-databases cloud:<dbpassword>@localhost \ --deploy-as=root:<password> \ -e <encryption_type> \ -m <management_server_key> \ @@ -160,7 +160,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><prompt>#</prompt> cloud-setup-management</programlisting> + <programlisting><prompt>#</prompt> cloudstack-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/cloudstack/blob/2e06da55/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 21cf28f..ae925bf 100644 --- a/docs/en-US/management-server-install-multi-node.xml +++ b/docs/en-US/management-server-install-multi-node.xml @@ -53,12 +53,12 @@ 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> -i <replaceable>management_server_ip</replaceable> + <programlisting><prompt>#</prompt> cloudstack-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> <para>Configure the OS and start the Management Server:</para> - <programlisting><prompt>#</prompt> cloud-setup-management</programlisting> + <programlisting><prompt>#</prompt> cloudstack-setup-management</programlisting> <para>The Management Server on this node should now be running.</para> </listitem> <listitem> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/region-add.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/region-add.xml b/docs/en-US/region-add.xml index 960777c..802e462 100644 --- a/docs/en-US/region-add.xml +++ b/docs/en-US/region-add.xml @@ -45,7 +45,7 @@ the additional command-line flag <code>-r <region_id></code> to set a region ID for the new region. The default region is automatically assigned a region ID of 1, so your first additional region might be region 2.</para> - <programlisting>cloud-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id></programlisting> + <programlisting>cloudstack-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id></programlisting> </listitem> <listitem><para>By the end of the installation procedure, the Management Server should have been started. Be sure that the Management Server installation was successful and complete.</para></listitem> <listitem><para>Add region 2 to region 1. Use the API command addRegion. (For information about how to make an API call, see the Developer's Guide.)</para> @@ -82,7 +82,7 @@ However, you must repeat certain steps additional times for each additional region:</para> <orderedlist> <listitem><para>Install &PRODUCT; in each additional region. Set the region ID for each region during the database setup step.</para> - <programlisting>cloud-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id></programlisting></listitem> + <programlisting>cloudstack-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id></programlisting></listitem> <listitem><para>Once the Management Server is running, add your new region to all existing regions by repeatedly calling the API command addRegion. For example, if you were adding region 3:</para> @@ -125,4 +125,4 @@ http://<IP_of_region_3_Management_Server>:8080/client/api?command=addRegio http://<IP_of_region_2_Management_Server>:8080/client/api?command=removeRegion&id=3&apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting> </section> -</section> \ No newline at end of file +</section>
