etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.1

This commit is contained in:
Chip Childers 2013-05-11 18:26:41 +01:00
parent a3b5980510 840bf2eda4
commit a86e53d187
19 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/en-US/Release_Notes.xml
View File

@ -5079,7 +5079,7 @@ under the License.
<listitem>
<para>Start the first Management Server. Do not start any other Management Server nodes
yet.</para>
<programlisting language="Bash"><prompt>#</prompt> service cloud-management start</programlisting>
<programlisting language="Bash"><prompt>#</prompt> service cloudstack-management start</programlisting>
<para>Wait until the databases are upgraded. Ensure that the database upgrade is complete.
After confirmation, start the other Management Servers one at a time by running the same
command on each node.</para>
@ -5092,7 +5092,7 @@ under the License.
<listitem>
<para>Start all Usage Servers (if they were running on your previous version). Perform
this on each Usage Server host.</para>
<para><command># service cloud-usage start</command></para>
<para><command># service cloudstack-usage start</command></para>
</listitem>
<listitem>
<note>
@ -5118,7 +5118,7 @@ under the License.
</listitem>
<listitem>
<para>Start the agent.</para>
<programlisting># service cloud-agent start</programlisting>
<programlisting># service cloudstack-agent start</programlisting>
</listitem>
<listitem>
<para>Edit <filename>/etc/cloud/agent/agent.properties</filename> to change the
@ -5662,7 +5662,7 @@ under the License.
<listitem>
<para>Start the first Management Server. Do not start any other Management Server nodes
yet.</para>
<programlisting language="Bash"><prompt>#</prompt> service cloud-management start</programlisting>
<programlisting language="Bash"><prompt>#</prompt> service cloudstack-management start</programlisting>
<para>Wait until the databases are upgraded. Ensure that the database upgrade is complete.
You should see a message like "Complete! Done." After confirmation, start the other
Management Servers one at a time by running the same command on each node.</para>
@ -5670,7 +5670,7 @@ under the License.
<listitem>
<para>Start all Usage Servers (if they were running on your previous version). Perform
this on each Usage Server host.</para>
<programlisting language="Bash"><prompt>#</prompt> service cloud-usage start</programlisting>
<programlisting language="Bash"><prompt>#</prompt> service cloudstack-usage start</programlisting>
</listitem>
<listitem>
<para>(KVM only) Additional steps are required for each KVM host. These steps will not
@ -5696,7 +5696,7 @@ under the License.
</listitem>
<listitem>
<para>Start the agent.</para>
<programlisting># service cloud-agent start</programlisting>
<programlisting># service cloudstack-agent start</programlisting>
</listitem>
<listitem>
<para> Copy the contents of the <filename>agent.properties</filename> file to the new

2
docs/en-US/aws-ec2-configuration.xml
View File

@ -35,7 +35,7 @@
<warning><para>Be sure you have included the Amazon default service offering, m1.small. As well as any EC2 instance types that you will use.</para></warning>
</listitem>
<listitem><para>If you did not already do so when you set the configuration parameter in step <xref linkend="set-global-config"/>, restart the Management Server.</para>
<programlisting># service cloud-management restart</programlisting>
<programlisting># service cloudstack-management restart</programlisting>
</listitem>
</orderedlist>
<para>The following sections provides details to perform these steps</para>

8
docs/en-US/change-database-password.xml
View File

@ -29,8 +29,8 @@
<listitem>
<para>Before changing the password, you'll need to stop CloudStack's management server and the usage engine if you've deployed that component.</para>
<screen>
<command># service cloud-management stop</command>
<command># service cloud-usage stop</command>
<command># service cloudstack-management stop</command>
<command># service cloudstack-usage stop</command>
</screen>
</listitem>
<listitem>
@ -68,8 +68,8 @@ db.usage.password=ENC(encrypted_password_from_above)
<listitem>
<para>After copying the new password over, you can now start CloudStack (and the usage engine, if necessary).</para>
<screen>
<command># service cloud-management start</command>
<command># service cloud-usage start</command>
<command># service cloudstack-management start</command>
<command># service cloudstack-usage start</command>
</screen>
</listitem>
</orderedlist>

4
docs/en-US/citrix-xenserver-installation.xml
View File

@ -610,8 +610,8 @@ master-password=[your password]</programlisting>
<listitem>
<para>Restart the Management Server and Usage Server. You only need to do this once for
all clusters.</para>
<programlisting># service cloud-management start
# service cloud-usage start</programlisting>
<programlisting language="Bash"># service cloud-management start
# service cloudstack-usage start</programlisting>
</listitem>
</orderedlist>
</listitem>

4
docs/en-US/configure-usage-server.xml
View File

@ -32,8 +32,8 @@
<listitem><para>In Actions, click the Edit icon.</para></listitem>
<listitem><para>Type the desired value and click the Save icon.</para></listitem>
<listitem><para>Restart the Management Server (as usual with any global configuration change) and also the Usage Server:</para>
<programlisting># service cloud-management restart
# service cloud-usage restart
<programlisting language="Bash"># service cloudstack-management restart
# service cloudstack-usage restart
</programlisting></listitem>
</orderedlist>
<para>The following table shows the global configuration settings that control the behavior of the Usage Server.</para>

2
docs/en-US/creating-network-offerings.xml
View File

@ -208,7 +208,7 @@
mode. In this mode, network resources are allocated only when the first virtual machine
starts in the network. When conservative mode is off, the public IP can only be used for
a single service. For example, a public IP used for a port forwarding rule cannot be
used for defining other services, such as SaticNAT or load balancing. When the conserve
used for defining other services, such as StaticNAT or load balancing. When the conserve
mode is on, you can define more than one service on the same public IP.</para>
<note>
<para>If StaticNAT is enabled, irrespective of the status of the conserve mode, no port

4
docs/en-US/database-replication.xml
View File

@ -121,14 +121,14 @@ mysql> start slave;
<title>Failover</title>
<para>This will provide for a replicated database that can be used to implement manual failover for the Management Servers. &PRODUCT; failover from one MySQL instance to another is performed by the administrator. In the event of a database failure you should:</para>
<orderedlist>
<listitem><para>Stop the Management Servers (via service cloud-management stop).</para></listitem>
<listitem><para>Stop the Management Servers (via service cloudstack-management stop).</para></listitem>
<listitem><para>Change the replica's configuration to be a master and restart it.</para></listitem>
<listitem><para>Ensure that the replica's port 3306 is open to the Management Servers.</para></listitem>
<listitem><para>Make a change so that the Management Server uses the new database. The simplest process here is to put the IP address of the new database server into each Management Server's /etc/cloud/management/db.properties.</para></listitem>
<listitem>
<para>Restart the Management Servers:</para>
<programlisting>
# service cloud-management start
# service cloudstack-management start
</programlisting>
</listitem>
</orderedlist>

6
docs/en-US/hypervisor-host-install-agent.xml
View File

@ -27,8 +27,8 @@
<para>To manage KVM instances on the host &PRODUCT; uses a Agent. This Agent communicates with the Management server and controls all the instances on the host.</para>
<para>First we start by installing the agent:</para>
<para>In RHEL or CentOS:</para>
<programlisting language="Bash"><command>$ yum install cloud-agent</command></programlisting>
<programlisting language="Bash"><command>$ yum install cloudstack-agent</command></programlisting>
<para>In Ubuntu:</para>
<programlisting language="Bash"><command>$ apt-get install cloud-agent</command></programlisting>
<programlisting language="Bash"><command>$ apt-get install cloudstack-agent</command></programlisting>
<para>The host is now ready to be added to a cluster. This is covered in a later section, see <xref linkend="host-add" />. It is recommended that you continue to read the documentation before adding the host!</para>
</section>
</section>

2
docs/en-US/hypervisor-host-install-libvirt.xml
View File

@ -24,7 +24,7 @@
<section id="hypervisor-host-install-libvirt">
<title>Install and Configure libvirt</title>
<para>&PRODUCT; uses libvirt for managing virtual machines. Therefore it is vital that libvirt is configured correctly. Libvirt is a dependency of cloud-agent and should already be installed.</para>
<para>&PRODUCT; uses libvirt for managing virtual machines. Therefore it is vital that libvirt is configured correctly. Libvirt is a dependency of cloudstack-agent and should already be installed.</para>
<orderedlist>
<listitem>
<para>In order to have live migration working libvirt has to listen for unsecured TCP connections. We also need to turn off libvirts attempt to use Multicast DNS advertising. Both of these settings are in <filename>/etc/libvirt/libvirtd.conf</filename></para>

2
docs/en-US/increase-management-server-max-memory.xml
View File

@ -28,7 +28,7 @@
<orderedlist>
<listitem><para>Edit the Tomcat configuration file:</para><programlisting>/etc/cloud/management/tomcat6.conf</programlisting></listitem>
<listitem><para>Change the command-line parameter -XmxNNNm to a higher value of N.</para><para>For example, if the current value is -Xmx128m, change it to -Xmx1024m or higher.</para></listitem>
<listitem><para>To put the new setting into effect, restart the Management Server.</para><programlisting># service cloud-management restart</programlisting></listitem>
<listitem><para>To put the new setting into effect, restart the Management Server.</para><programlisting># service cloudstack-management restart</programlisting></listitem>
</orderedlist>
<para>For more information about memory issues, see "FAQ: Memory" at <ulink url="http://wiki.apache.org/tomcat/FAQ/Memory">Tomcat Wiki.</ulink></para>
</section>

2
docs/en-US/install-usage-server.xml
View File

@ -52,7 +52,7 @@
<listitem>
<para>Once installed, start the Usage Server with the following command.</para>
<programlisting>
# service cloud-usage start
# service cloudstack-usage start
</programlisting>
</listitem>
</orderedlist>

2
docs/en-US/removing-xenserver-kvm-hosts.xml
View File

@ -27,7 +27,7 @@
<para>A node cannot be removed from a cluster until it has been placed in maintenance mode. This will ensure that all of the VMs on it have been migrated to other Hosts. To remove a Host from the cloud:</para>
<orderedlist>
<listitem><para>Place the node in maintenance mode.</para><para> See <xref linkend="scheduled-maintenance-maintenance-mode-hosts"/>.</para></listitem>
<listitem><para>For KVM, stop the cloud-agent service.</para></listitem>
<listitem><para>For KVM, stop the cloudstack-agent service.</para></listitem>
<listitem><para>Use the UI option to remove the node.</para><para>Then you may power down the Host, re-use its IP address, re-install it, etc</para></listitem>
</orderedlist>
</section>

2
docs/en-US/set-database-buffer-pool-size.xml
View File

@ -26,7 +26,7 @@
<title>Set Database Buffer Pool Size</title>
<para>It is important to provide enough memory space for the MySQL database to cache data and indexes:</para>
<orderedlist>
<listitem><para>Edit the Tomcat configuration file:</para><programlisting>/etc/my.cnf</programlisting></listitem>
<listitem><para>Edit the MySQL configuration file:</para><programlisting>/etc/my.cnf</programlisting></listitem>
<listitem><para>Insert the following line in the [mysqld] section, below the datadir line. Use a value that is appropriate for your situation. We recommend setting the buffer pool at 40% of RAM if MySQL is on the same server as the management server or 70% of RAM if MySQL has a dedicated server. The following example assumes a dedicated server with 1024M of RAM.</para>
<programlisting>innodb_buffer_pool_size=700M</programlisting></listitem>
<listitem><para>Restart the MySQL service.</para><programlisting># service mysqld restart</programlisting></listitem>

2
docs/en-US/set-global-project-resource-limits.xml
View File

@ -76,7 +76,7 @@
</listitem>
<listitem>
<para>Restart the Management Server.</para>
<programlisting># service cloud-management restart</programlisting>
<programlisting># service cloudstack-management restart</programlisting>
</listitem>
</orderedlist>
</section>

2
docs/en-US/set-projects-creator-permissions.xml
View File

@ -56,7 +56,7 @@
</listitem>
<listitem>
<para>Restart the Management Server.</para>
<programlisting># service cloud-management restart</programlisting>
<programlisting># service cloudstack-management restart</programlisting>
</listitem>
</orderedlist>
</section>

2
docs/en-US/set-up-invitations.xml
View File

@ -89,7 +89,7 @@
</informaltable>
</listitem>
<listitem><para>Restart the Management Server:</para>
<programlisting>service cloud-management restart</programlisting></listitem>
<programlisting>service cloudstack-management restart</programlisting></listitem>
</orderedlist>
</section>

6
docs/en-US/stop-restart-management-server.xml
View File

@ -26,9 +26,9 @@
<para>The root administrator will need to stop and restart the Management Server from time to time.</para>
<para>For example, after changing a global configuration parameter, a restart is required. If you have multiple Management Server nodes, restart all of them to put the new parameter value into effect consistently throughout the cloud..</para>
<para>To stop the Management Server, issue the following command at the operating system prompt on the Management Server node:</para>
<programlisting># service cloud-management stop</programlisting>
<programlisting># service cloudstack-management stop</programlisting>
<para>To start the Management Server:</para>
<programlisting># service cloud-management start</programlisting>
<programlisting># service cloudstack-management start</programlisting>
<para>To stop the Management Server:</para>
<programlisting># service cloud-management stop</programlisting>
<programlisting># service cloudstack-management stop</programlisting>
</section>

2
docs/en-US/sys-offering-sysvm.xml
View File

@ -65,7 +65,7 @@
<listitem>
<para>Restart &PRODUCT; Management Server. Restarting is required because the default
offerings are loaded into the memory at startup.</para>
<programlisting>service cloud-management restart</programlisting>
<programlisting>service cloudstack-management restart</programlisting>
</listitem>
<listitem>
<para>Destroy the existing CPVM or SSVM offerings and wait for them to be recreated. The new

2
docs/en-US/zone-add.xml
View File

@ -42,7 +42,7 @@
</para>
</listitem>
<listitem><para>Restart the Management Server.</para>
<programlisting># service cloud-management restart</programlisting>
<programlisting># service cloudstack-management restart</programlisting>
</listitem>
<listitem><para>Refresh the &PRODUCT; UI browser tab and log back in.</para></listitem>
</orderedlist>