You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/09/10 08:39:10 UTC

[01/40] git commit: CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: This closes #9

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/4.4 00c90ec09 -> 6507638ec


CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: This closes #9

Signed-off-by: Sebastien Goasguen <ru...@gmail.com>


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

Branch: refs/heads/4.4
Commit: ba544d2ad6f075325d28e80049a4dc6b80082341
Parents: 8bacccc
Author: Will Stevens <ws...@cloudops.com>
Authored: Mon May 12 12:56:36 2014 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Thu May 15 16:56:41 2014 +0200

----------------------------------------------------------------------
 source/networking2.rst      |   2 +
 source/palo_alto_config.rst | 282 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 284 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/networking2.rst
----------------------------------------------------------------------
diff --git a/source/networking2.rst b/source/networking2.rst
index b020a19..b3743fc 100644
--- a/source/networking2.rst
+++ b/source/networking2.rst
@@ -6952,6 +6952,8 @@ To create a persistent network, perform the following:
 
    Click OK.
 
+.. include:: palo_alto_config.rst
+
 .. |guest-traffic-setup.png| image:: _static/images/guest-traffic-setup.png
    :alt: Depicts a guest traffic setup
 .. |networksinglepod.png| image:: _static/images/network-singlepod.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/palo_alto_config.rst
----------------------------------------------------------------------
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
new file mode 100644
index 0000000..6c0aa46
--- /dev/null
+++ b/source/palo_alto_config.rst
@@ -0,0 +1,282 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+
+Setup a Palo Alto Networks Firewall
+-----------------------------------
+
+
+Functionality Provided
+~~~~~~~~~~~~~~~~~~~~~~
+
+This implementation enable the orchestration of a Palo Alto Networks Firewall from within CloudStack UI and API.  
+
+**The following features are supported**:
+
+- List/Add/Delete Palo Alto Networks service provider
+- List/Add/Delete Palo Alto Networks network service offering
+- List/Add/Delete Palo Alto Networks network using the above service offering
+- Add an instance to a Palo Alto Networks network
+- Source NAT management on network create and delete
+- List/Add/Delete Ingress Firewall rule
+- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules supported)
+- List/Add/Delete Port Forwarding rule
+- List/Add/Delete Static NAT rule
+- Apply a Threat Profile to all firewall rules (more details in the Additional Features section)
+- Apply a Log Forwarding profile to all firewall rules (more details in the Additional Features section)
+
+
+
+Initial Palo Alto Networks Firewall Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Anatomy of the Palo Alto Networks Firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- In **'Network > Interfaces'** there is a list of physical interfaces as well as aggregated physical interfaces which are used for managing traffic in and out of the Palo Alto Networks Firewall device.
+- In **'Network > Zones'** there is a list of the different configuration zones.  This implementation will use two zones; a public (defaults to 'untrust') and private (defaults to 'trust') zone.
+- In **'Network > Virtual Routers'** there is a list of VRs which handle traffic routing for the Palo Alto Firewall.  We only use a single Virtual Router on the firewall and it is used to handle all the routing to the next network hop.
+- In **'Objects > Security Profile Groups'** there is a list of profiles which can be applied to firewall rules.  These profiles are used to better understand the types of traffic that is flowing through your network.  Configured when you add the firewall provider to CloudStack.
+- In **'Objects > Log Forwarding'** there is a list of profiles which can be applied to firewall rules.  These profiles are used to better track the logs generated by the firewall.  Configured when you add the firewall provider to CloudStack.
+- In **'Policies > Security'** there is a list of firewall rules that are currently configured.  You will not need to modify this section because it will be completely automated by CloudStack, but you can review the firewall rules which have been created here.
+- In **'Policies > NAT'** there is a list of the different NAT rules.  You will not need to modify this section because it will be completely automated by CloudStack, but you can review the different NAT rules that have been created here.  Source NAT, Static NAT and Destination NAT (Port Forwarding) rules will show up in this list.
+
+
+
+Configure the Public / Private Zones on the firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+No manual configuration is required to setup these zones because CloudStack will configure them automatically when you add the Palo Alto Networks firewall device to CloudStack as a service provider.  This implementation depends on two zones, one for the public side and one for the private side of the firewall.  
+
+- The public zone (defaults to 'untrust') will contain all of the public interfaces and public IPs.
+- The private zone (defaults to 'trust') will contain all of the private interfaces and guest network gateways.
+
+The NAT and firewall rules will be configured between these zones.
+
+
+
+Configure the Public / Private Interfaces on the firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This implementation supports standard physical interfaces as well as grouped physical interfaces called aggregated interfaces.  Both standard interfaces and aggregated interfaces are treated the same, so they can be used interchangeably. For this document, we will assume that we are using 'ethernet1/1' as the public interface and 'ethernet1/2' as the private interface.  If aggregated interfaces where used, you would use something like 'ae1' and 'ae2' as the interfaces.
+
+This implementation requires that the 'Interface Type' be set to 'Layer3' for both the public and private interfaces.  If you want to be able to use the 'Untagged' VLAN tag for public traffic in CloudStack, you will need to enable support for it in the public 'ethernet1/1' interface (details below).  
+
+**Steps to configure the Public Interface**:
+
+#. Log into Palo Alto Networks Firewall
+#. Navigate to 'Network > Interfaces'
+#. Click on 'ethernet1/1' (for aggregated ethernet, it will probably be called 'ae1')
+#. Select 'Layer3' from the 'Interface Type' list
+#. Click 'Advanced'
+#. Check the 'Untagged Subinterface' check-box
+#. Click 'OK'
+
+**Steps to configure the Private Interface**:
+
+#. Click on 'ethernet1/2' (for aggregated ethernet, it will probably be called 'ae2')
+#. Select 'Layer3' from the 'Interface Type' list
+#. Click 'OK'
+
+
+
+Configure a Virtual Router on the firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The Virtual Router on the Palo Alto Networks Firewall is not to be confused with the Virtual Routers that CloudStack provisions.  For this implementation, the Virtual Router on the Palo Alto Networks Firewall will ONLY handle the upstream routing from the Firewall to the next hop.
+
+**Steps to configure the Virtual Router**:
+
+#. Log into Palo Alto Networks Firewall
+#. Navigate to 'Network > Virtual Routers'
+#. Select the 'default' Virtual Router or Add a new Virtual Router if there are none in the list
+
+   - If you added a new Virtual Router, you will need to give it a 'Name'
+
+#. Navigate to 'Static Routes > IPv4'
+#. 'Add' a new static route
+
+   - **Name**: next_hop (you can name it anything you want)
+   - **Destination**: 0.0.0.0/0 (send all traffic to this route)
+   - **Interface**: ethernet1/1 (or whatever you set your public interface as)
+   - **Next Hop**: (specify the gateway IP for the next hop in your network)
+   - Click 'OK'
+
+#. Click 'OK'
+
+
+
+Configure the default Public Subinterface
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The current implementation of the Palo Alto Networks firewall integration uses CIDRs in the form of 'w.x.y.z/32' for the public IP addresses that CloudStack provisions.  Because no broadcast or gateway IPs are in this single IP range, there is no way for the firewall to route the traffic for these IPs.  To route the traffic for these IPs, we create a single subinterface on the public interface with an IP and a CIDR which encapsulates the CloudStack public IP range.  This IP will need to be inside the subnet defined by the CloudStack public range netmask, but outside the CloudStack public IP range.  The CIDR should reflect the same subnet defined by the CloudStack public range netmask.  The name of the subinterface is determined by the VLAN configured for the public range in CloudStack.
+
+To clarify this concept, we will use the following example.
+
+**Example CloudStack Public Range Configuration**:
+
+- **Gateway**: 172.30.0.1
+- **Netmask**: 255.255.255.0
+- **IP Range**: 172.30.0.100 - 172.30.0.199
+- **VLAN**: Untagged
+
+**Configure the Public Subinterface**:
+
+#. Log into Palo Alto Networks Firewall
+#. Navigate to 'Network > Interfaces'
+#. Select the 'ethernet1/1' line (not clicking on the name)
+#. Click 'Add Subinterface' at the bottom of the window
+#. Enter 'Interface Name': 'ethernet1/1' . '9999' 
+
+   - 9999 is used if the CloudStack public range VLAN is 'Untagged'
+   - If the CloudStack public range VLAN is tagged (eg: 333), then the name will reflect that tag
+
+#. The 'Tag' is the VLAN tag that the traffic is sent to the next hop with, so set it accordingly.  If you are passing 'Untagged' traffic from CloudStack to your next hop, leave it blank.  If you want to pass tagged traffic from CloudStack, specify the tag.
+#. Select 'default' from the 'Config > Virtual Router' drop-down (assuming that is what your virtual router is called)
+#. Click the 'IPv4' tab
+#. Select 'Static' from the 'Type' radio options
+#. Click 'Add' in the 'IP' section
+#. Enter '172.30.0.254/24' in the new line
+
+   - The IP can be any IP outside the CloudStack public IP range, but inside the CloudStack public range netmask (it can NOT be the gateway IP)
+   - The subnet defined by the CIDR should match the CloudStack public range netmask
+   
+#. Click 'OK'
+
+
+Commit configuration on the Palo Alto Networks Firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In order for all the changes we just made to take effect, we need to commit the changes.
+
+#. Click the 'Commit' link in the top right corner of the window
+#. Click 'OK' in the commit window overlay
+#. Click 'Close' to the resulting commit status window after the commit finishes
+
+
+
+Setup the Palo Alto Networks Firewall in CloudStack
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add the Palo Alto Networks Firewall as a Service Provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Navigate to 'Infrastructure > Zones > ZONE_NAME > Physical Network > NETWORK_NAME (guest) > Configure; Network Service Providers'
+#. Click on 'Palo Alto' in the list
+#. Click 'View Devices'
+#. Click 'Add Palo Alto Device'
+#. Enter your configuration in the overlay.  This example will reflect the details previously used in this guide.
+
+   - **IP Address**: (the IP of the Palo Alto Networks Firewall)
+   - **Username**: (the admin username for the firewall)
+   - **Password**: (the admin password for the firewall)
+   - **Type**: Palo Alto Firewall
+   - **Public Interface**: ethernet1/1 (use what you setup earlier as the public interface if it is different from my examples)
+   - **Private Interface**: ethernet1/2 (use what you setup earlier as the private interface if it is different from my examples)
+   - **Number of Retries**: 2 (the default is fine)
+   - **Timeout**: 300 (the default is fine) 
+   - **Public Network**: untrust (this is the public zone on the firewall and did not need to be configured)
+   - **Private Network**: trust (this is the private zone on the firewall and did not need to be configured)
+   - **Virtual Router**: default (this is the name of the Virtual Router we setup on the firewall)
+   - **Palo Alto Threat Profile**: (not required.  name of the 'Security Profile Groups' to apply.  more details in the 'Additional Features' section)
+   - **Palo Alto Log Profile**: (not required.  name of the 'Log Forwarding' profile to apply.  more details in the 'Additional Features' section)
+   - **Capacity**: (not required) 
+   - **Dedicated**: (not required)
+
+#. Click 'OK'
+#. Click on 'Palo Alto' in the breadcrumbs to go back one screen.
+#. Click on 'Enable Provider' (its the middle icon that looks like two plugs together)
+
+
+Add a Network Service Offering to use the new Provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There are 6 'Supported Services' that need to be configured in the network service offering for this functionality.  They are DHCP, DNS, Firewall, Source NAT, Static NAT and Port Forwarding.  For the other settings, there are probably additional configurations which will work, but I will just document a common case.
+
+#. Navigate to 'Service Offerings'
+#. In the drop-down at the top, select 'Network Offerings'
+#. Click 'Add Network Offering'
+
+   - **Name**: (name it whatever you want)
+   - **Description**: (again, can be whatever you want)
+   - **Guest Type**: Isolated
+   - **Supported Services**:
+
+      - **DHCP**: Provided by 'VirtualRouter'
+      - **DNS**: Provided by 'VirtualRouter'
+      - **Firewall**: Provided by 'PaloAlto'
+      - **Source NAT**: Provided by 'PaloAlto'
+      - **Static NAT**: Provided by 'PaloAlto'
+      - **Port Forwarding**: Provided by 'PaloAlto'
+
+   - **System Offering for Router**: System Offering For Software Router
+   - **Supported Source NAT Type**: Per account (this is the only supported option)
+   - **Default egress policy**: (both 'Allow' and 'Deny' are supported)
+
+#. Click 'OK'
+#. Click on the newly created service offering
+#. Click 'Enable network offering' (the middle icon that looks like two plugs together)
+
+When adding networks in CloudStack, select this network offering to use the Palo Alto Networks firewall.
+
+
+Additional Features
+~~~~~~~~~~~~~~~~~~~
+
+In addition to the standard functionality exposed by CloudStack, we have added a couple additional features to this implementation.  We did not add any new screens to CloudStack, but we have added a couple fields to the 'Add Palo Alto Service Provider' screen which will add functionality globally for the device.
+
+
+Palo Alto Networks Threat Profile
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This feature allows you to specify a 'Security Profile Group' to be applied to all of the firewall rules which are created on the Palo Alto Networks firewall device.
+
+To create a 'Security Profile Group' on the Palo Alto Networks firewall, do the following: 
+
+#. Log into the Palo Alto Networks firewall
+#. Navigate to 'Objects > Security Profile Groups'
+#. Click 'Add' at the bottom of the page to add a new group
+#. Give the group a Name and specify the profiles you would like to include in the group
+#. Click 'OK'
+#. Click the 'Commit' link in the top right of the screen and follow the on screen instructions
+
+Once you have created a profile, you can reference it by Name in the 'Palo Alto Threat Profile' field in the 'Add the Palo Alto Networks Firewall as a Service Provider' step.
+
+
+Palo Alto Networks Log Forwarding Profile
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This feature allows you to specify a 'Log Forwarding' profile to better manage where the firewall logs are sent to.  This is helpful for keeping track of issues that can arise on the firewall.
+
+To create a 'Log Forwarding' profile on the Palo Alto Networks Firewall, do the following: 
+
+#. Log into the Palo Alto Networks firewall
+#. Navigate to 'Objects > Log Forwarding'
+#. Click 'Add' at the bottom of the page to add a new profile
+#. Give the profile a Name and specify the details you want for the traffic and threat settings
+#. Click 'OK'
+#. Click the 'Commit' link in the top right of the screen and follow the on screen instructions
+
+Once you have created a profile, you can reference it by Name in the 'Palo Alto Log Profile' field in the 'Add the Palo Alto Networks Firewall as a Service Provider' step.
+
+
+
+Limitations
+~~~~~~~~~~~
+
+- The implementation currently only supports a single public IP range in CloudStack
+- Usage tracking is not yet implemented
+


[10/40] Fixed formatting by Will stevens

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/templates.rst
----------------------------------------------------------------------
diff --git a/source/templates.rst b/source/templates.rst
index c4d33b2..bc55aa2 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -12,7 +12,8 @@
    KIND, either express or implied.  See the License for the
    specific language governing permissions and limitations
    under the License.
-   
+
+
 Working with Templates
 ======================
 
@@ -30,6 +31,7 @@ CloudStack ships with a default template. In order to present more
 choices to users, CloudStack administrators and users can create
 templates and add them to CloudStack.
 
+
 Creating Templates: Overview
 ----------------------------
 
@@ -38,18 +40,12 @@ system. There are a variety of ways to add more templates.
 Administrators and end users can add templates. The typical sequence of
 events is:
 
-#. 
-
-   Launch a VM instance that has the operating system you want. Make any
+#. Launch a VM instance that has the operating system you want. Make any
    other desired configuration changes to the VM.
 
-#. 
-
-   Stop the VM.
-
-#. 
+#. Stop the VM.
 
-   Convert the volume into a template.
+#. Convert the volume into a template.
 
 There are other ways to add templates to CloudStack. For example, you
 can take a snapshot of the VM's volume and create a template from the
@@ -58,19 +54,17 @@ snapshot, or import a VHD from another system into CloudStack.
 The various techniques for creating templates are described in the next
 few sections.
 
+
 Requirements for Templates
 --------------------------
 
--  
-
-   For XenServer, install PV drivers / Xen tools on each template that
+-  For XenServer, install PV drivers / Xen tools on each template that
    you create. This will enable live migration and clean guest shutdown.
 
--  
-
-   For vSphere, install VMware Tools on each template that you create.
+-  For vSphere, install VMware Tools on each template that you create.
    This will enable console view to work properly.
 
+
 Best Practices for Templates
 ----------------------------
 
@@ -78,6 +72,7 @@ If you plan to use large templates (100 GB or larger), be sure you have
 a 10-gigabit network to support the large templates. A slower network
 can lead to timeouts and other errors when large templates are used.
 
+
 The Default Template
 --------------------
 
@@ -98,30 +93,31 @@ block most access to the template excluding ssh.
 
 .. code:: bash
 
-    # iptables --list
-    Chain INPUT (policy ACCEPT)
-    target     prot opt source               destination
-    RH-Firewall-1-INPUT  all  --  anywhere             anywhere
-
-    Chain FORWARD (policy ACCEPT)
-    target     prot opt source               destination
-    RH-Firewall-1-INPUT  all  --  anywhere             anywhere
-
-    Chain OUTPUT (policy ACCEPT)
-    target     prot opt source               destination
-
-    Chain RH-Firewall-1-INPUT (2 references)
-    target     prot opt source               destination
-    ACCEPT     all  --  anywhere             anywhere
-    ACCEPT     icmp --  anywhere        anywhere       icmp any
-    ACCEPT     esp  --  anywhere        anywhere
-    ACCEPT     ah   --  anywhere        anywhere
-    ACCEPT     udp  --  anywhere        224.0.0.251    udp dpt:mdns
-    ACCEPT     udp  --  anywhere        anywhere       udp dpt:ipp
-    ACCEPT     tcp  --  anywhere        anywhere       tcp dpt:ipp
-    ACCEPT     all  --  anywhere        anywhere       state RELATED,ESTABLISHED
-    ACCEPT     tcp  --  anywhere        anywhere       state NEW tcp dpt:ssh
-    REJECT     all  --  anywhere        anywhere       reject-with icmp-host-
+   # iptables --list
+   Chain INPUT (policy ACCEPT)
+   target     prot opt source               destination
+   RH-Firewall-1-INPUT  all  --  anywhere             anywhere
+
+   Chain FORWARD (policy ACCEPT)
+   target     prot opt source               destination
+   RH-Firewall-1-INPUT  all  --  anywhere             anywhere
+
+   Chain OUTPUT (policy ACCEPT)
+   target     prot opt source               destination
+
+   Chain RH-Firewall-1-INPUT (2 references)
+   target     prot opt source               destination
+   ACCEPT     all  --  anywhere             anywhere
+   ACCEPT     icmp --  anywhere        anywhere       icmp any
+   ACCEPT     esp  --  anywhere        anywhere
+   ACCEPT     ah   --  anywhere        anywhere
+   ACCEPT     udp  --  anywhere        224.0.0.251    udp dpt:mdns
+   ACCEPT     udp  --  anywhere        anywhere       udp dpt:ipp
+   ACCEPT     tcp  --  anywhere        anywhere       tcp dpt:ipp
+   ACCEPT     all  --  anywhere        anywhere       state RELATED,ESTABLISHED
+   ACCEPT     tcp  --  anywhere        anywhere       state NEW tcp dpt:ssh
+   REJECT     all  --  anywhere        anywhere       reject-with icmp-host-
+
 
 Private and Public Templates
 ----------------------------
@@ -141,92 +137,75 @@ in a private Zone, it is available only to users in the domain assigned
 to that Zone. If a public template is created in a public Zone, it is
 available to all users in all domains.
 
+
 Creating a Template from an Existing Virtual Machine
 ----------------------------------------------------
 
 Once you have at least one VM set up in the way you want, you can use it
 as the prototype for other VMs.
 
-#. 
-
-   Create and start a virtual machine using any of the techniques given
+#. Create and start a virtual machine using any of the techniques given
    in `“Creating VMs” <virtual_machines.html#creating-vms>`_.
 
-#. 
-
-   Make any desired configuration changes on the running VM, then click
+#. Make any desired configuration changes on the running VM, then click
    Stop.
 
-#. 
-
-   Wait for the VM to stop. When the status shows Stopped, go to the
+#. Wait for the VM to stop. When the status shows Stopped, go to the
    next step.
 
-#. 
-
-   Click Create Template and provide the following:
-
-   -  
+#. Click Create Template and provide the following:
 
-      **Name and Display Text**. These will be shown in the UI, so
+   -  **Name and Display Text**. These will be shown in the UI, so
       choose something descriptive.
 
-   -  
-
-      **OS Type**. This helps CloudStack and the hypervisor perform
+   -  **OS Type**. This helps CloudStack and the hypervisor perform
       certain operations and make assumptions that improve the
       performance of the guest. Select one of the following.
 
-      -  
-
-         If the operating system of the stopped VM is listed, choose it.
-
-      -  
+      -  If the operating system of the stopped VM is listed, choose it.
 
-         If the OS type of the stopped VM is not listed, choose Other.
+      -  If the OS type of the stopped VM is not listed, choose Other.
 
-      -  
-
-         If you want to boot from this template in PV mode, choose Other
+      -  If you want to boot from this template in PV mode, choose Other
          PV (32-bit) or Other PV (64-bit). This choice is available only
          for XenServere:
 
          .. note:: 
-            Generally you should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.
-
-   -  
+            Generally you should not choose an older version of the OS 
+            than the version in the image. For example, choosing CentOS 
+            5.4 to support a CentOS 6.2 image will in general not work. 
+            In those cases you should choose Other.
 
-      **Public**. Choose Yes to make this template accessible to all
+   -  **Public**. Choose Yes to make this template accessible to all
       users of this CloudStack installation. The template will appear in
       the Community Templates list. See `“Private and
       Public Templates” <#private-and-public-templates>`_.
 
-   -  
-
-      **Password Enabled**. Choose Yes if your template has the
+   -  **Password Enabled**. Choose Yes if your template has the
       CloudStack password change script installed. See 
       :ref:`adding-password-management-to-templates`.
 
-#. 
-
-   Click Add.
+#. Click Add.
 
 The new template will be visible in the Templates section when the
 template creation process has been completed. The template is then
 available when creating a new VM.
 
+
 Creating a Template from a Snapshot
 -----------------------------------
 
 If you do not want to stop the VM in order to use the Create Template
-menu item (as described in `“Creating a Template from an
-Existing Virtual Machine” <#creating-a-template-from-an-existing-virtual-machine>`_), you
-can create a template directly from any snapshot through the CloudStack
-UI.
+menu item (as described in `“Creating a Template from an Existing 
+Virtual Machine” <#creating-a-template-from-an-existing-virtual-machine>`_), 
+you can create a template directly from any snapshot through the 
+CloudStack UI.
+
 
 Uploading Templates
 -------------------
 
+
 vSphere Templates and ISOs
 --------------------------
 
@@ -240,86 +219,61 @@ them to decrease upload times.
 
 To upload a template:
 
-#. 
+#. In the left navigation bar, click Templates.
 
-   In the left navigation bar, click Templates.
+#. Click Register Template.
 
-#. 
+#. Provide the following:
 
-   Click Register Template.
-
-#. 
-
-   Provide the following:
-
-   -  
-
-      **Name and Description**. These will be shown in the UI, so choose
+   -  **Name and Description**. These will be shown in the UI, so choose
       something descriptive.
 
-   -  
-
-      **URL**. The Management Server will download the file from the
+   -  **URL**. The Management Server will download the file from the
       specified URL, such as ``http://my.web.server/filename.vhd.gz``.
 
-   -  
-
-      **Zone**. Choose the zone where you want the template to be
+   -  **Zone**. Choose the zone where you want the template to be
       available, or All Zones to make it available throughout
       CloudStack.
 
-   -  
-
-      **OS Type**: This helps CloudStack and the hypervisor perform
+   -  **OS Type**: This helps CloudStack and the hypervisor perform
       certain operations and make assumptions that improve the
       performance of the guest. Select one of the following:
 
-      -  
-
-         If the operating system of the stopped VM is listed, choose it.
+      -  If the operating system of the stopped VM is listed, choose it.
 
-      -  
-
-         If the OS type of the stopped VM is not listed, choose Other.
+      -  If the OS type of the stopped VM is not listed, choose Other.
 
          .. note:: 
-            You should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.
-
-   -  
+            You should not choose an older version of the OS than the 
+            version in the image. For example, choosing CentOS 5.4 to 
+            support a CentOS 6.2 image will in general not work. In 
+            those cases you should choose Other.
 
-      **Hypervisor**: The supported hypervisors are listed. Select the
+   -  **Hypervisor**: The supported hypervisors are listed. Select the
       desired one.
 
-   -  
-
-      **Format**. The format of the template upload file, such as VHD or
+   -  **Format**. The format of the template upload file, such as VHD or
       OVA.
 
-   -  
-
-      **Password Enabled**. Choose Yes if your template has the
-      CloudStack password change script installed. See :ref:`adding-password-management-to-templates`.
-
-   -  
+   -  **Password Enabled**. Choose Yes if your template has the
+      CloudStack password change script installed. 
+      See :ref:`adding-password-management-to-templates`.
 
-      **Extractable**. Choose Yes if the template is available for
+   -  **Extractable**. Choose Yes if the template is available for
       extraction. If this option is selected, end users can download a
       full image of a template.
 
-   -  
-
-      **Public**. Choose Yes to make this template accessible to all
+   -  **Public**. Choose Yes to make this template accessible to all
       users of this CloudStack installation. The template will appear in
       the Community Templates list. See `“Private and
       Public Templates” <#private-and-public-templates>`_.
 
-   -  
-
-      **Featured**. Choose Yes if you would like this template to be
+   -  **Featured**. Choose Yes if you would like this template to be
       more prominent for users to select. The template will appear in
       the Featured Templates list. Only an administrator can make a
       template Featured.
 
+
 Exporting Templates
 -------------------
 
@@ -327,6 +281,7 @@ End users and Administrators may export templates from the CloudStack.
 Navigate to the template in the UI and choose the Download function from
 the Actions menu.
 
+
 Creating a Linux Template
 -------------------------
 
@@ -339,30 +294,23 @@ assumes openssh-server is installed during installation.
 
 An overview of the procedure is as follow:
 
-#. 
-
-   Upload your Linux ISO.
+#. Upload your Linux ISO.
 
    For more information, see `“Adding an
    ISO” <virtual_machines.html#adding-an-iso>`_.
 
-#. 
-
-   Create a VM Instance with this ISO.
+#. Create a VM Instance with this ISO.
 
    For more information, see `“Creating
    VMs” <virtual_machines.html#creating-vms>`_.
 
-#. 
-
-   Prepare the Linux VM
+#. Prepare the Linux VM
 
-#. 
+#. Create a template from the VM.
 
-   Create a template from the VM.
+   For more information, see `“Creating a Template from an Existing 
+   Virtual Machine” <#creating-a-template-from-an-existing-virtual-machine>`_.
 
-   For more information, see `“Creating a Template from an
-   Existing Virtual Machine” <#creating-a-template-from-an-existing-virtual-machine>`_.
 
 System preparation for Linux
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -370,9 +318,7 @@ System preparation for Linux
 The following steps will prepare a basic Linux installation for
 templating.
 
-#. 
-
-   **Installation**
+#. **Installation**
 
    It is good practice to name your VM something generic during
    installation, this will ensure components such as LVM do not appear
@@ -387,69 +333,61 @@ templating.
 
    .. code:: bash
 
-                DEVICE=eth0
-                TYPE=Ethernet
-                BOOTPROTO=dhcp
-                ONBOOT=yes
+      DEVICE=eth0
+      TYPE=Ethernet
+      BOOTPROTO=dhcp
+      ONBOOT=yes
 
    The next steps updates the packages on the Template Master.
 
-   -  
-
-      Ubuntu
+   -  Ubuntu
 
       .. code:: bash
 
-                          sudo -i
-                          apt-get update
-                          apt-get upgrade -y
-                          apt-get install -y acpid ntp
-                          reboot
-
-   -  
+         sudo -i
+         apt-get update
+         apt-get upgrade -y
+         apt-get install -y acpid ntp
+         reboot
 
-      CentOS
+   -  CentOS
 
       .. code:: bash
 
-                          ifup eth0
-                          yum update -y
-                          reboot
+         ifup eth0
+         yum update -y
+         reboot
 
-#. 
-
-   **Password management**
+#. **Password management**
 
    .. note:: 
-      If preferred, custom users (such as ones created during the Ubuntu installation) should be removed. First ensure the root user account is enabled by giving it a password and then login as root to continue.
+      If preferred, custom users (such as ones created during the Ubuntu 
+      installation) should be removed. First ensure the root user account 
+      is enabled by giving it a password and then login as root to continue.
 
    .. code:: bash
 
-                sudo passwd root
-                logout
+      sudo passwd root
+      logout
 
    As root, remove any custom user accounts created during the
    installation process.
 
    .. code:: bash
 
-                deluser myuser --remove-home
+      deluser myuser --remove-home
 
    See :ref:`adding-password-management-to-templates` for
    instructions to setup the password management script, this will allow
    CloudStack to change your root password from the web interface.
 
-#. 
-
-   **Hostname Management**
+#. **Hostname Management**
 
    CentOS configures the hostname by default on boot. Unfortunately
    Ubuntu does not have this functionality, for Ubuntu installations use
    the following steps.
 
-   -  
-
-      Ubuntu
+   -  Ubuntu
 
       The hostname of a Templated VM is set by a custom script in
       `/etc/dhcp/dhclient-exit-hooks.d`, this script first checks if the
@@ -466,64 +404,60 @@ templating.
 
       .. code:: bash
 
-            #!/bin/sh
-            # dhclient change hostname script for Ubuntu
-            oldhostname=$(hostname -s)
-            if [ $oldhostname = 'localhost' ]
-            then
-                sleep 10 # Wait for configuration to be written to disk
-                hostname=$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /host-name/ { host = $3 }  END { printf host } ' | sed     's/[";]//g' )
-                fqdn="$hostname.$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /domain-name/ { domain = $3 }  END { printf     domain } ' | sed 's/[";]//g')"
-                ip=$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /fixed-address/ { lease = $2 }  END { printf lease } ' | sed     's/[";]//g')
-                echo "cloudstack-hostname: Hostname _localhost_ detected. Changing hostname and adding hosts."
-                echo " Hostname: $hostname \n FQDN: $fqdn \n IP: $ip"
-                # Update /etc/hosts
-                awk -v i="$ip" -v f="$fqdn" -v h="$hostname" "/^127/{x=1} !/^127/ && x { x=0; print i,f,h; } { print $0; }" /etc/  hosts > /etc/hosts.dhcp.tmp
-                mv /etc/hosts /etc/hosts.dhcp.bak
-                mv /etc/hosts.dhcp.tmp /etc/hosts
-                # Rename Host
-                echo $hostname > /etc/hostname
-                hostname $hostname
-                # Recreate SSH2
-                export DEBIAN_FRONTEND=noninteractive
-                dpkg-reconfigure openssh-server
-            fi
-            ### End of Script ###
-            
-            chmod 774  /etc/dhcp/dhclient-exit-hooks.d/sethostname
+         #!/bin/sh
+         # dhclient change hostname script for Ubuntu
+         oldhostname=$(hostname -s)
+         if [ $oldhostname = 'localhost' ]
+         then
+             sleep 10 # Wait for configuration to be written to disk
+             hostname=$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /host-name/ { host = $3 }  END { printf host } ' | sed     's/[";]//g' )
+             fqdn="$hostname.$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /domain-name/ { domain = $3 }  END { printf     domain } ' | sed 's/[";]//g')"
+             ip=$(cat /var/lib/dhcp/dhclient.eth0.leases  |  awk ' /fixed-address/ { lease = $2 }  END { printf lease } ' | sed     's/[";]//g')
+             echo "cloudstack-hostname: Hostname _localhost_ detected. Changing hostname and adding hosts."
+             echo " Hostname: $hostname \n FQDN: $fqdn \n IP: $ip"
+             # Update /etc/hosts
+             awk -v i="$ip" -v f="$fqdn" -v h="$hostname" "/^127/{x=1} !/^127/ && x { x=0; print i,f,h; } { print $0; }" /etc/  hosts > /etc/hosts.dhcp.tmp
+             mv /etc/hosts /etc/hosts.dhcp.bak
+             mv /etc/hosts.dhcp.tmp /etc/hosts
+             # Rename Host
+             echo $hostname > /etc/hostname
+             hostname $hostname
+             # Recreate SSH2
+             export DEBIAN_FRONTEND=noninteractive
+             dpkg-reconfigure openssh-server
+         fi
+         ### End of Script ###
+         
+         chmod 774  /etc/dhcp/dhclient-exit-hooks.d/sethostname
 
    .. warning:: 
-        The following steps should be run when you are ready to template your Template Master. If the Template Master is rebooted during these steps you will have to run all the steps again. At the end of this process the Template Master should be shutdown and the template created in order to create and deploy the final template.
-
-#. 
+      The following steps should be run when you are ready to template 
+      your Template Master. If the Template Master is rebooted during 
+      these steps you will have to run all the steps again. At the end 
+      of this process the Template Master should be shutdown and the 
+      template created in order to create and deploy the final template.
 
-   **Remove the udev persistent device rules**
+#. **Remove the udev persistent device rules**
 
    This step removes information unique to your Template Master such as
    network MAC addresses, lease files and CD block devices, the files
    are automatically generated on next boot.
 
-   -  
-
-      Ubuntu
+   -  Ubuntu
 
       .. code:: bash
 
-                          rm -f /etc/udev/rules.d/70*
-                          rm -f /var/lib/dhcp/dhclient.*
+         rm -f /etc/udev/rules.d/70*
+         rm -f /var/lib/dhcp/dhclient.*
 
-   -  
-
-      CentOS
+   -  CentOS
 
       .. code:: bash
 
-                          rm -f /etc/udev/rules.d/70*
-                          rm -f /var/lib/dhclient/*
-
-#. 
+         rm -f /etc/udev/rules.d/70*
+         rm -f /var/lib/dhclient/*
 
-   **Remove SSH Keys**
+#. **Remove SSH Keys**
 
    This step is to ensure all your Templated VMs do not have the same
    SSH keys, which would decrease the security of the machines
@@ -531,24 +465,20 @@ templating.
 
    .. code:: bash
 
-                rm -f /etc/ssh/*key*
+      rm -f /etc/ssh/*key*
 
-#. 
-
-   **Cleaning log files**
+#. **Cleaning log files**
 
    It is good practice to remove old logs from the Template Master.
 
    .. code:: bash
 
-                cat /dev/null > /var/log/audit/audit.log 2>/dev/null
-                cat /dev/null > /var/log/wtmp 2>/dev/null
-                logrotate -f /etc/logrotate.conf 2>/dev/null
-                rm -f /var/log/*-* /var/log/*.gz 2>/dev/null
-
-#. 
+      cat /dev/null > /var/log/audit/audit.log 2>/dev/null
+      cat /dev/null > /var/log/wtmp 2>/dev/null
+      logrotate -f /etc/logrotate.conf 2>/dev/null
+      rm -f /var/log/*-* /var/log/*.gz 2>/dev/null
 
-   **Setting hostname**
+#. **Setting hostname**
 
    In order for the Ubuntu DHCP script to function and the CentOS
    dhclient to set the VM hostname they both require the Template
@@ -557,89 +487,81 @@ templating.
 
    .. code:: bash
 
-                hostname localhost
-                echo "localhost" > /etc/hostname
-
-#. 
+      hostname localhost
+      echo "localhost" > /etc/hostname
 
-   **Set user password to expire**
+#. **Set user password to expire**
 
    This step forces the user to change the password of the VM after the
    template has been deployed.
 
    .. code:: bash
 
-                passwd --expire root
+      passwd --expire root
 
-#. 
-
-   **Clearing User History**
+#. **Clearing User History**
 
    The next step clears the bash commands you have just run.
 
    .. code:: bash
 
-                history -c
-                unset HISTFILE
-
-#. 
+      history -c
+      unset HISTFILE
 
-   **Shutdown the VM**
+#. **Shutdown the VM**
 
    Your now ready to shutdown your Template Master and create a
    template!
 
    .. code:: bash
 
-                halt -p
+      halt -p
 
-#. 
-
-   **Create the template!**
+#. **Create the template!**
 
    You are now ready to create the template, for more information see
    `“Creating a Template from an Existing Virtual
    Machine” <#creating-a-template-from-an-existing-virtual-machine>`_.
 
-.. note:: Templated VMs for both Ubuntu and CentOS may require a reboot after provisioning in order to pickup the hostname.
+.. note::
+   Templated VMs for both Ubuntu and CentOS may require a reboot after 
+   provisioning in order to pickup the hostname.
+
 
 Creating a Windows Template
-----------------------------------
+---------------------------
 
 Windows templates must be prepared with Sysprep before they can be
 provisioned on multiple machines. Sysprep allows you to create a generic
 Windows template and avoid any possible SID conflicts.
 
 .. note:: 
-    (XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.
+   (XenServer) Windows VMs running on XenServer require PV drivers, which 
+   may be provided in the template or added after the VM is created. The 
+   PV drivers are necessary for essential management functions such as 
+   mounting additional volumes and ISO images, live migration, and 
+   graceful shutdown.
 
 An overview of the procedure is as follows:
 
-#. 
-
-   Upload your Windows ISO.
+#. Upload your Windows ISO.
 
    For more information, see `“Adding an
    ISO” <virtual_machines.html#adding-an-iso>`_.
 
-#. 
-
-   Create a VM Instance with this ISO.
+#. Create a VM Instance with this ISO.
 
    For more information, see `“Creating
    VMs” <virtual_machines.html#creating-vms>`_.
 
-#. 
-
-   Follow the steps in Sysprep for Windows Server 2008 R2 (below) or
+#. Follow the steps in Sysprep for Windows Server 2008 R2 (below) or
    Sysprep for Windows Server 2003 R2, depending on your version of
    Windows Server
 
-#. 
-
-   The preparation steps are complete. Now you can actually create the
+#. The preparation steps are complete. Now you can actually create the
    template as described in Creating the Windows Template.
 
+
 System Preparation for Windows Server 2008 R2
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -652,50 +574,40 @@ Center <http://www.microsoft.com/en-us/download/details.aspx?id=9085>`_.
 Use the following steps to run sysprep for Windows 2008 R2:
 
 .. note:: 
-    The steps outlined here are derived from the excellent guide by Charity Shelbourne, originally published at `Windows Server 2008 Sysprep Mini-Setup. <http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx>`_
-
-#. 
+   The steps outlined here are derived from the excellent guide by 
+   Charity Shelbourne, originally published at `Windows Server 2008 
+   Sysprep Mini-Setup. 
+   <http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx>`_
 
-   Download and install the Windows AIK
+#. Download and install the Windows AIK
 
-   .. note:: Windows AIK should not be installed on the Windows 2008 R2 VM you just created. Windows AIK should not be part of the template you create. It is only used to create the sysprep answer file.
-
-#. 
+   .. note:: 
+      Windows AIK should not be installed on the Windows 2008 R2 VM you 
+      just created. Windows AIK should not be part of the template you 
+      create. It is only used to create the sysprep answer file.
 
-   Copy the install.wim file in the \\sources directory of the Windows
+#. Copy the install.wim file in the \\sources directory of the Windows
    2008 R2 installation DVD to the hard disk. This is a very large file
    and may take a long time to copy. Windows AIK requires the WIM file
    to be writable.
 
-#. 
-
-   Start the Windows System Image Manager, which is part of the Windows
+#. Start the Windows System Image Manager, which is part of the Windows
    AIK.
 
-#. 
-
-   In the Windows Image pane, right click the Select a Windows image or
+#. In the Windows Image pane, right click the Select a Windows image or
    catalog file option to load the install.wim file you just copied.
 
-#. 
-
-   Select the Windows 2008 R2 Edition.
+#. Select the Windows 2008 R2 Edition.
 
    You may be prompted with a warning that the catalog file cannot be
    opened. Click Yes to create a new catalog file.
 
-#. 
-
-   In the Answer File pane, right click to create a new answer file.
-
-#. 
+#. In the Answer File pane, right click to create a new answer file.
 
-   Generate the answer file from the Windows System Image Manager using
+#. Generate the answer file from the Windows System Image Manager using
    the following steps:
 
-   #. 
-
-      The first page you need to automate is the Language and Country or
+   #. The first page you need to automate is the Language and Country or
       Region Selection page. To automate this, expand Components in your
       Windows Image pane, right-click and add the
       Microsoft-Windows-International-Core setting to Pass 7 oobeSystem.
@@ -709,9 +621,7 @@ Use the following steps to run sysprep for Windows 2008 R2:
 
       |sysmanager.png|
 
-   #. 
-
-      You need to automate the Software License Terms Selection page,
+   #. You need to automate the Software License Terms Selection page,
       otherwise known as the End-User License Agreement (EULA). To do
       this, expand the Microsoft-Windows-Shell-Setup component.
       High-light the OOBE setting, and add the setting to the Pass 7
@@ -719,18 +629,15 @@ Use the following steps to run sysprep for Windows 2008 R2:
 
       |software-license.png|
 
-   #. 
-
-      Make sure the license key is properly set. If you use MAK key, you
+   #. Make sure the license key is properly set. If you use MAK key, you
       can just enter the MAK key on the Windows 2008 R2 VM. You need not
       input the MAK into the Windows System Image Manager. If you use
       KMS host for activation you need not enter the Product Key.
       Details of Windows Volume Activation can be found at
-      `http://technet.microsoft.com/en-us/library/bb892849.aspx <http://technet.microsoft.com/en-us/library/bb892849.aspx>`_
+      `http://technet.microsoft.com/en-us/library/bb892849.aspx 
+      <http://technet.microsoft.com/en-us/library/bb892849.aspx>`_
 
-   #. 
-
-      You need to automate is the Change Administrator Password page.
+   #. You need to automate is the Change Administrator Password page.
       Expand the Microsoft-Windows-Shell-Setup component (if it is not
       still expanded), expand UserAccounts, right-click on
       AdministratorPassword, and add the setting to the Pass 7
@@ -743,140 +650,90 @@ Use the following steps to run sysprep for Windows 2008 R2:
       suit your deployment. The steps above are the minimum needed to
       make Windows unattended setup work.
 
-#. 
-
-   Save the answer file as unattend.xml. You can ignore the warning
+#. Save the answer file as unattend.xml. You can ignore the warning
    messages that appear in the validation window.
 
-#. 
-
-   Copy the unattend.xml file into the c:\\windows\\system32\\sysprep
+#. Copy the unattend.xml file into the c:\\windows\\system32\\sysprep
    directory of the Windows 2008 R2 Virtual Machine
 
-#. 
-
-   Once you place the unattend.xml file in
+#. Once you place the unattend.xml file in
    c:\\windows\\system32\\sysprep directory, you run the sysprep tool as
    follows:
 
    .. code:: bash
 
-       cd c:\Windows\System32\sysprep
-       sysprep.exe /oobe /generalize /shutdown
+      cd c:\Windows\System32\sysprep
+      sysprep.exe /oobe /generalize /shutdown
 
    The Windows 2008 R2 VM will automatically shut down after sysprep is
    complete.
 
+
 System Preparation for Windows Server 2003 R2
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Earlier versions of Windows have a different sysprep tool. Follow these
 steps for Windows Server 2003 R2.
 
-#. 
-
-   Extract the content of \\support\\tools\\deploy.cab on the Windows
+#. Extract the content of \\support\\tools\\deploy.cab on the Windows
    installation CD into a directory called c:\\sysprep on the Windows
    2003 R2 VM.
 
-#. 
-
-   Run c:\\sysprep\\setupmgr.exe to create the sysprep.inf file.
-
-   #. 
+#. Run c:\\sysprep\\setupmgr.exe to create the sysprep.inf file.
 
-      Select Create New to create a new Answer File.
+   #. Select Create New to create a new Answer File.
 
-   #. 
+   #. Enter “Sysprep setup” for the Type of Setup.
 
-      Enter “Sysprep setup” for the Type of Setup.
+   #. Select the appropriate OS version and edition.
 
-   #. 
-
-      Select the appropriate OS version and edition.
-
-   #. 
-
-      On the License Agreement screen, select “Yes fully automate the
+   #. On the License Agreement screen, select “Yes fully automate the
       installation”.
 
-   #. 
-
-      Provide your name and organization.
-
-   #. 
-
-      Leave display settings at default.
-
-   #. 
-
-      Set the appropriate time zone.
-
-   #. 
-
-      Provide your product key.
+   #. Provide your name and organization.
 
-   #. 
+   #. Leave display settings at default.
 
-      Select an appropriate license mode for your deployment
+   #. Set the appropriate time zone.
 
-   #. 
+   #. Provide your product key.
 
-      Select “Automatically generate computer name”.
+   #. Select an appropriate license mode for your deployment
 
-   #. 
+   #. Select “Automatically generate computer name”.
 
-      Type a default administrator password. If you enable the password
+   #. Type a default administrator password. If you enable the password
       reset feature, the users will not actually use this password. This
       password will be reset by the instance manager after the guest
       boots up.
 
-   #. 
+   #. Leave Network Components at “Typical Settings”.
 
-      Leave Network Components at “Typical Settings”.
+   #. Select the “WORKGROUP” option.
 
-   #. 
+   #. Leave Telephony options at default.
 
-      Select the “WORKGROUP” option.
+   #. Select appropriate Regional Settings.
 
-   #. 
+   #. Select appropriate language settings.
 
-      Leave Telephony options at default.
+   #. Do not install printers.
 
-   #. 
+   #. Do not specify “Run Once commands”.
 
-      Select appropriate Regional Settings.
+   #. You need not specify an identification string.
 
-   #. 
+   #. Save the Answer File as c:\\sysprep\\sysprep.inf.
 
-      Select appropriate language settings.
-
-   #. 
-
-      Do not install printers.
-
-   #. 
-
-      Do not specify “Run Once commands”.
-
-   #. 
-
-      You need not specify an identification string.
-
-   #. 
-
-      Save the Answer File as c:\\sysprep\\sysprep.inf.
-
-#. 
-
-   Run the following command to sysprep the image:
+#. Run the following command to sysprep the image:
 
    .. code:: bash
 
-       c:\sysprep\sysprep.exe -reseal -mini -activated
+      c:\sysprep\sysprep.exe -reseal -mini -activated
 
    After this step the machine will automatically shut down
 
+
 Importing Amazon Machine Images
 -------------------------------
 
@@ -892,52 +749,46 @@ You need to have a XenServer host with a file-based storage repository
 file has been customized on the Centos/Fedora host.
 
 .. note:: 
-    When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.
+   When copying and pasting a command, be sure the command has pasted as 
+   a single line before executing. Some document viewers may introduce 
+   unwanted line breaks in copied text.
 
 To import an AMI:
 
-#. 
-
-   Set up loopback on image file:
+#. Set up loopback on image file:
 
    .. code:: bash
 
-       # mkdir -p /mnt/loop/centos62
-       # mount -o loop  CentOS_6.2_x64 /mnt/loop/centos54
-
-#. 
+      # mkdir -p /mnt/loop/centos62
+      # mount -o loop  CentOS_6.2_x64 /mnt/loop/centos54
 
-   Install the kernel-xen package into the image. This downloads the PV
+#. Install the kernel-xen package into the image. This downloads the PV
    kernel and ramdisk to the image.
 
    .. code:: bash
 
-       # yum -c /mnt/loop/centos54/etc/yum.conf --installroot=/mnt/loop/centos62/ -y install kernel-xen
+      # yum -c /mnt/loop/centos54/etc/yum.conf --installroot=/mnt/loop/centos62/ -y install kernel-xen
 
-#. 
-
-   Create a grub entry in /boot/grub/grub.conf.
+#. Create a grub entry in /boot/grub/grub.conf.
 
    .. code:: bash
 
-       # mkdir -p /mnt/loop/centos62/boot/grub
-       # touch /mnt/loop/centos62/boot/grub/grub.conf
-       # echo "" > /mnt/loop/centos62/boot/grub/grub.conf
-
-#. 
+      # mkdir -p /mnt/loop/centos62/boot/grub
+      # touch /mnt/loop/centos62/boot/grub/grub.conf
+      # echo "" > /mnt/loop/centos62/boot/grub/grub.conf
 
-   Determine the name of the PV kernel that has been installed into the
+#. Determine the name of the PV kernel that has been installed into the
    image.
 
    .. code:: bash
 
-       # cd /mnt/loop/centos62
-       # ls lib/modules/
-       2.6.16.33-xenU  2.6.16-xenU  2.6.18-164.15.1.el5xen  2.6.18-164.6.1.el5.centos.plus  2.6.18-xenU-ec2-v1.0  2.6.21.7-2.fc8xen  2.6.31-302-ec2
-       # ls boot/initrd*
-       boot/initrd-2.6.18-164.6.1.el5.centos.plus.img boot/initrd-2.6.18-164.15.1.el5xen.img
-       # ls boot/vmlinuz*
-       boot/vmlinuz-2.6.18-164.15.1.el5xen  boot/vmlinuz-2.6.18-164.6.1.el5.centos.plus  boot/vmlinuz-2.6.18-xenU-ec2-v1.0  boot/vmlinuz-2.6.21-2952.fc8xen
+      # cd /mnt/loop/centos62
+      # ls lib/modules/
+      2.6.16.33-xenU  2.6.16-xenU  2.6.18-164.15.1.el5xen  2.6.18-164.6.1.el5.centos.plus  2.6.18-xenU-ec2-v1.0  2.6.21.7-2.fc8xen  2.6.31-302-ec2
+      # ls boot/initrd*
+      boot/initrd-2.6.18-164.6.1.el5.centos.plus.img boot/initrd-2.6.18-164.15.1.el5xen.img
+      # ls boot/vmlinuz*
+      boot/vmlinuz-2.6.18-164.15.1.el5xen  boot/vmlinuz-2.6.18-164.6.1.el5.centos.plus  boot/vmlinuz-2.6.18-xenU-ec2-v1.0  boot/vmlinuz-2.6.21-2952.fc8xen
 
    Xen kernels/ramdisk always end with "xen". For the kernel version you
    choose, there has to be an entry for that version under lib/modules,
@@ -945,146 +796,121 @@ To import an AMI:
    the only kernel that satisfies this condition is
    2.6.18-164.15.1.el5xen.
 
-#. 
-
-   Based on your findings, create an entry in the grub.conf file. Below
+#. Based on your findings, create an entry in the grub.conf file. Below
    is an example entry.
 
    .. code:: bash
 
-       default=0
-       timeout=5
-       hiddenmenu
-       title CentOS (2.6.18-164.15.1.el5xen)
-               root (hd0,0)
-               kernel /boot/vmlinuz-2.6.18-164.15.1.el5xen ro root=/dev/xvda 
-               initrd /boot/initrd-2.6.18-164.15.1.el5xen.img
-
-#. 
+      default=0
+      timeout=5
+      hiddenmenu
+      title CentOS (2.6.18-164.15.1.el5xen)
+         root (hd0,0)
+         kernel /boot/vmlinuz-2.6.18-164.15.1.el5xen ro root=/dev/xvda 
+         initrd /boot/initrd-2.6.18-164.15.1.el5xen.img
 
-   Edit etc/fstab, changing “sda1” to “xvda” and changing “sdb” to
+#. Edit etc/fstab, changing “sda1” to “xvda” and changing “sdb” to
    “xvdb”.
 
    .. code:: bash
 
-       # cat etc/fstab
-       /dev/xvda  /         ext3    defaults        1 1
-       /dev/xvdb  /mnt      ext3    defaults        0 0
-       none       /dev/pts  devpts  gid=5,mode=620  0 0
-       none       /proc     proc    defaults        0 0
-       none       /sys      sysfs   defaults        0 0
-
-#. 
+      # cat etc/fstab
+      /dev/xvda  /         ext3    defaults        1 1
+      /dev/xvdb  /mnt      ext3    defaults        0 0
+      none       /dev/pts  devpts  gid=5,mode=620  0 0
+      none       /proc     proc    defaults        0 0
+      none       /sys      sysfs   defaults        0 0
 
-   Enable login via the console. The default console device in a
+#. Enable login via the console. The default console device in a
    XenServer system is xvc0. Ensure that etc/inittab and etc/securetty
    have the following lines respectively:
 
    .. code:: bash
 
-       # grep xvc0 etc/inittab 
-       co:2345:respawn:/sbin/agetty xvc0 9600 vt100-nav
-       # grep xvc0 etc/securetty 
-       xvc0
+      # grep xvc0 etc/inittab 
+      co:2345:respawn:/sbin/agetty xvc0 9600 vt100-nav
+      # grep xvc0 etc/securetty 
+      xvc0
 
-#. 
-
-   Ensure the ramdisk supports PV disk and PV network. Customize this
+#. Ensure the ramdisk supports PV disk and PV network. Customize this
    for the kernel version you have determined above.
 
    .. code:: bash
 
-       # chroot /mnt/loop/centos54
-       # cd /boot/
-       # mv initrd-2.6.18-164.15.1.el5xen.img initrd-2.6.18-164.15.1.el5xen.img.bak
-       # mkinitrd -f /boot/initrd-2.6.18-164.15.1.el5xen.img --with=xennet --preload=xenblk --omit-scsi-modules 2.6.18-164.15.1.el5xen
-
-#. 
+      # chroot /mnt/loop/centos54
+      # cd /boot/
+      # mv initrd-2.6.18-164.15.1.el5xen.img initrd-2.6.18-164.15.1.el5xen.img.bak
+      # mkinitrd -f /boot/initrd-2.6.18-164.15.1.el5xen.img --with=xennet --preload=xenblk --omit-scsi-modules 2.6.18-164.15.1.el5xen
 
-   Change the password.
+#. Change the password.
 
    .. code:: bash
 
-       # passwd
-       Changing password for user root.
-       New UNIX password: 
-       Retype new UNIX password: 
-       passwd: all authentication tokens updated successfully.
+      # passwd
+      Changing password for user root.
+      New UNIX password: 
+      Retype new UNIX password: 
+      passwd: all authentication tokens updated successfully.
 
-#. 
-
-   Exit out of chroot.
+#. Exit out of chroot.
 
    .. code:: bash
 
-       # exit
-
-#. 
+      # exit
 
-   Check `etc/ssh/sshd_config` for lines allowing ssh login using a
+#. Check `etc/ssh/sshd_config` for lines allowing ssh login using a
    password.
 
    .. code:: bash
 
-       # egrep "PermitRootLogin|PasswordAuthentication" /mnt/loop/centos54/etc/ssh/sshd_config  
-       PermitRootLogin yes
-       PasswordAuthentication yes
-
-#. 
+      # egrep "PermitRootLogin|PasswordAuthentication" /mnt/loop/centos54/etc/ssh/sshd_config  
+      PermitRootLogin yes
+      PasswordAuthentication yes
 
-   If you need the template to be enabled to reset passwords from the
+#. If you need the template to be enabled to reset passwords from the
    CloudStack UI or API, install the password change script into the
    image at this point. See :ref:`adding-password-management-to-templates`.
 
-#. 
-
-   Unmount and delete loopback mount.
+#. Unmount and delete loopback mount.
 
    .. code:: bash
 
-       # umount /mnt/loop/centos54
-       # losetup -d /dev/loop0
-
-#. 
+      # umount /mnt/loop/centos54
+      # losetup -d /dev/loop0
 
-   Copy the image file to your XenServer host's file-based storage
+#. Copy the image file to your XenServer host's file-based storage
    repository. In the example below, the Xenserver is "xenhost". This
    XenServer has an NFS repository whose uuid is
    a9c5b8c8-536b-a193-a6dc-51af3e5ff799.
 
    .. code:: bash
 
-       # scp CentOS_6.2_x64 xenhost:/var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799/
+      # scp CentOS_6.2_x64 xenhost:/var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799/
 
-#. 
-
-   Log in to the Xenserver and create a VDI the same size as the image.
+#. Log in to the Xenserver and create a VDI the same size as the image.
 
    .. code:: bash
 
-       [root@xenhost ~]# cd /var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799
-       [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]#  ls -lh CentOS_6.2_x64
-       -rw-r--r-- 1 root root 10G Mar 16 16:49 CentOS_6.2_x64
-       [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-create virtual-size=10GiB sr-uuid=a9c5b8c8-536b-a193-a6dc-51af3e5ff799 type=user name-label="Centos 6.2 x86_64"
-       cad7317c-258b-4ef7-b207-cdf0283a7923
-
-#. 
+      [root@xenhost ~]# cd /var/run/sr-mount/a9c5b8c8-536b-a193-a6dc-51af3e5ff799
+      [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]#  ls -lh CentOS_6.2_x64
+      -rw-r--r-- 1 root root 10G Mar 16 16:49 CentOS_6.2_x64
+      [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-create virtual-size=10GiB sr-uuid=a9c5b8c8-536b-a193-a6dc-51af3e5ff799 type=user name-label="Centos 6.2 x86_64"
+      cad7317c-258b-4ef7-b207-cdf0283a7923
 
-   Import the image file into the VDI. This may take 10–20 minutes.
+#. Import the image file into the VDI. This may take 10–20 minutes.
 
    .. code:: bash
 
-       [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-import filename=CentOS_6.2_x64 uuid=cad7317c-258b-4ef7-b207-cdf0283a7923
-
-#. 
+      [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# xe vdi-import filename=CentOS_6.2_x64 uuid=cad7317c-258b-4ef7-b207-cdf0283a7923
 
-   Locate a the VHD file. This is the file with the VDI’s UUID as its
+#. Locate a the VHD file. This is the file with the VDI’s UUID as its
    name. Compress it and upload it to your web server.
 
    .. code:: bash
 
-       [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# bzip2 -c cad7317c-258b-4ef7-b207-cdf0283a7923.vhd > CentOS_6.2_x64.vhd.bz2
-       [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# scp CentOS_6.2_x64.vhd.bz2 webserver:/var/www/html/templates/
+      [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# bzip2 -c cad7317c-258b-4ef7-b207-cdf0283a7923.vhd > CentOS_6.2_x64.vhd.bz2
+      [root@xenhost a9c5b8c8-536b-a193-a6dc-51af3e5ff799]# scp CentOS_6.2_x64.vhd.bz2 webserver:/var/www/html/templates/
+
 
 Converting a Hyper-V VM to a Template
 -------------------------------------
@@ -1101,24 +927,16 @@ clone if you still want to use the VM in Hyper-V. Uninstall Hyper-V
 Integration Components and check for any references to device names in
 /etc/fstab:
 
-#. 
-
-   From the linux\_ic/drivers/dist directory, run make uninstall (where
+#. From the linux\_ic/drivers/dist directory, run make uninstall (where
    "linux\_ic" is the path to the copied Hyper-V Integration Components
    files).
 
-#. 
-
-   Restore the original initrd from backup in /boot/ (the backup is
+#. Restore the original initrd from backup in /boot/ (the backup is
    named \*.backup0).
 
-#. 
-
-   Remove the "hdX=noprobe" entries from /boot/grub/menu.lst.
-
-#. 
+#. Remove the "hdX=noprobe" entries from /boot/grub/menu.lst.
 
-   Check /etc/fstab for any partitions mounted by device name. Change
+#. Check /etc/fstab for any partitions mounted by device name. Change
    those entries (if any) to mount by LABEL or UUID. You can get that
    information with the blkid command.
 
@@ -1127,57 +945,35 @@ the VHD into XenServer. There are two options for doing this.
 
 Option one:
 
-#. 
-
-   Import the VHD using XenCenter. In XenCenter, go to Tools>Virtual
+#. Import the VHD using XenCenter. In XenCenter, go to Tools>Virtual
    Appliance Tools>Disk Image Import.
 
-#. 
-
-   Choose the VHD, then click Next.
+#. Choose the VHD, then click Next.
 
-#. 
-
-   Name the VM, choose the NFS VHD SR under Storage, enable "Run
+#. Name the VM, choose the NFS VHD SR under Storage, enable "Run
    Operating System Fixups" and choose the NFS ISO SR.
 
-#. 
-
-   Click Next, then Finish. A VM should be created.
+#. Click Next, then Finish. A VM should be created.
 
 Option two:
 
-#. 
-
-   Run XenConvert, under From choose VHD, under To choose XenServer.
+#. Run XenConvert, under From choose VHD, under To choose XenServer.
    Click Next.
 
-#. 
-
-   Choose the VHD, then click Next.
-
-#. 
+#. Choose the VHD, then click Next.
 
-   Input the XenServer host info, then click Next.
+#. Input the XenServer host info, then click Next.
 
-#. 
-
-   Name the VM, then click Next, then Convert. A VM should be created.
+#. Name the VM, then click Next, then Convert. A VM should be created.
 
 Once you have a VM created from the Hyper-V VHD, prepare it using the
 following steps:
 
-#. 
-
-   Boot the VM, uninstall Hyper-V Integration Services, and reboot.
-
-#. 
+#. Boot the VM, uninstall Hyper-V Integration Services, and reboot.
 
-   Install XenServer Tools, then reboot.
+#. Install XenServer Tools, then reboot.
 
-#. 
-
-   Prepare the VM as desired. For example, run sysprep on Windows VMs.
+#. Prepare the VM as desired. For example, run sysprep on Windows VMs.
    See `“Creating a Windows
    Template” <#creating-a-windows-template>`_.
 
@@ -1186,37 +982,26 @@ Windows VMs, but Linux VMs may not perform optimally. Converting a Linux
 VM to PV mode will require additional steps and will vary by
 distribution.
 
-#. 
-
-   Shut down the VM and copy the VHD from the NFS storage to a web
+#. Shut down the VM and copy the VHD from the NFS storage to a web
    server; for example, mount the NFS share on the web server and copy
    it, or from the XenServer host use sftp or scp to upload it to the
    web server.
 
-#. 
+#. In CloudStack, create a new template using the following values:
 
-   In CloudStack, create a new template using the following values:
+   -  URL. Give the URL for the VHD
 
-   -  
-
-      URL. Give the URL for the VHD
-
-   -  
-
-      OS Type. Use the appropriate OS. For PV mode on CentOS, choose
+   -  OS Type. Use the appropriate OS. For PV mode on CentOS, choose
       Other PV (32-bit) or Other PV (64-bit). This choice is available
       only for XenServer.
 
-   -  
-
-      Hypervisor. XenServer
-
-   -  
+   -  Hypervisor. XenServer
 
-      Format. VHD
+   -  Format. VHD
 
 The template will be created, and you can create instances from it.
 
+
 .. _adding-password-management-to-templates:
 
 Adding Password Management to Your Templates
@@ -1243,43 +1028,36 @@ any password changes.
 If the script is unable to contact the virtual router during instance
 boot it will not set the password but boot will continue normally.
 
+
 Linux OS Installation
 ~~~~~~~~~~~~~~~~~~~~~
 
 Use the following steps to begin the Linux OS installation:
 
-#. 
-
-   Download the script file cloud-set-guest-password:
-
-   -  
-
-      `http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_
+#. Download the script file cloud-set-guest-password:
 
-#. 
+   -  `http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in 
+      <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_
 
-   Copy this file to /etc/init.d.
+#. Copy this file to /etc/init.d.
 
    On some Linux distributions, copy the file to ``/etc/rc.d/init.d``.
 
-#. 
-
-   Run the following command to make the script executable:
+#. Run the following command to make the script executable:
 
    .. code:: bash
 
-       chmod +x /etc/init.d/cloud-set-guest-password
-
-#. 
+      chmod +x /etc/init.d/cloud-set-guest-password
 
-   Depending on the Linux distribution, continue with the appropriate
+#. Depending on the Linux distribution, continue with the appropriate
    step.
 
    On Fedora, CentOS/RHEL, and Debian, run:
 
    .. code:: bash
 
-       chkconfig --add cloud-set-guest-password
+      chkconfig --add cloud-set-guest-password
+
 
 Windows OS Installation
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -1288,6 +1066,7 @@ Download the installer, CloudInstanceManager.msi, from the `Download
 page <http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download>`_
 and run the installer in the newly created Windows VM.
 
+
 Deleting Templates
 ------------------
 
@@ -1301,6 +1080,7 @@ When templates are deleted, the VMs instantiated from them will continue
 to run. However, new VMs cannot be created based on the deleted
 template.
 
+
 .. |sysmanager.png| image:: _static/images/sysmanager.png
    :alt: System Image Manager
 .. |software-license.png| image:: _static/images/software-license.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/troubleshooting.rst
----------------------------------------------------------------------
diff --git a/source/troubleshooting.rst b/source/troubleshooting.rst
index df5782c..290622c 100644
--- a/source/troubleshooting.rst
+++ b/source/troubleshooting.rst
@@ -13,6 +13,7 @@
    specific language governing permissions and limitations
    under the License.
    
+
 TroubleShooting
 ===============
 
@@ -26,13 +27,13 @@ messages. We recommend this command to find the problematic output in
 the Management Server log:.
 
 .. note:: 
-    When copying and pasting a command, be sure the command has pasted as a
-    single line before executing. Some document viewers may introduce
-    unwanted line breaks in copied text.
+   When copying and pasting a command, be sure the command has pasted as a
+   single line before executing. Some document viewers may introduce
+   unwanted line breaks in copied text.
 
 .. code:: bash
 
-            grep -i -E 'exception|unable|fail|invalid|leak|warn|error' /var/log/cloudstack/management/management-server.log
+   grep -i -E 'exception|unable|fail|invalid|leak|warn|error' /var/log/cloudstack/management/management-server.log
 
 The CloudStack processes requests with a Job ID. If you find an error in
 the logs and you are interested in debugging the issue you can grep for
@@ -41,14 +42,14 @@ find the following ERROR message:
 
 .. code:: bash
 
-            2010-10-04 13:49:32,595 ERROR [cloud.vm.UserVmManagerImpl] (Job-Executor-11:job-1076) Unable to find any host for [User|i-8-42-VM-untagged]
+   2010-10-04 13:49:32,595 ERROR [cloud.vm.UserVmManagerImpl] (Job-Executor-11:job-1076) Unable to find any host for [User|i-8-42-VM-untagged]
 
 Note that the job ID is 1076. You can track back the events relating to
 job 1076 with the following grep:
 
 .. code:: bash
 
-            grep "job-1076)" management-server.log
+   grep "job-1076)" management-server.log
 
 The CloudStack Agent Server logs its activities in `/var/log/cloudstack/agent/`.
 
@@ -62,6 +63,7 @@ Symptom
 Loss of existing data on primary storage which has been exposed as a
 Linux NFS server export on an iSCSI volume.
 
+
 Cause
 ~~~~~
 
@@ -69,6 +71,7 @@ It is possible that a client from outside the intended pool has mounted
 the storage. When this occurs, the LVM is wiped and all data in the
 volume is lost
 
+
 Solution
 ~~~~~~~~
 
@@ -77,16 +80,18 @@ allowed access by specifying a subnet mask. For example:
 
 .. code:: bash
 
-    echo “/export 192.168.1.0/24(rw,async,no_root_squash,no_subtree_check)” > /etc/exports
+   echo “/export 192.168.1.0/24(rw,async,no_root_squash,no_subtree_check)” > /etc/exports
 
 Adjust the above command to suit your deployment needs.
 
+
 More Information
 ~~~~~~~~~~~~~~~~
 
 See the export procedure in the "Secondary Storage" section of the
 CloudStack Installation Guide
 
+
 Recovering a Lost Virtual Router
 --------------------------------
 
@@ -96,11 +101,13 @@ Symptom
 A virtual router is running, but the host is disconnected. A virtual
 router no longer functions as expected.
 
+
 Cause
 ~~~~~
 
 The Virtual router is lost or down.
 
+
 Solution
 ~~~~~~~~
 
@@ -109,20 +116,14 @@ functions as expected, destroy it. You must create one afresh while
 keeping the backup router up and running (it is assumed this is in a
 redundant router setup):
 
--  
-
-   Force stop the router. Use the stopRouter API with forced=true
+-  Force stop the router. Use the stopRouter API with forced=true
    parameter to do so.
 
--  
-
-   Before you continue with destroying this router, ensure that the
+-  Before you continue with destroying this router, ensure that the
    backup router is running. Otherwise the network connection will be
    lost.
 
--  
-
-   Destroy the router by using the destroyRouter API.
+-  Destroy the router by using the destroyRouter API.
 
 Recreate the missing router by using the restartNetwork API with
 cleanup=false parameter. For more information about redundant router
@@ -131,6 +132,7 @@ setup, see Creating a New Network Offering.
 For more information about the API syntax, see the API Reference at
 `http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_.
 
+
 Maintenance mode not working on vCenter
 ---------------------------------------
 
@@ -139,12 +141,14 @@ Symptom
 
 Host was placed in maintenance mode, but still appears live in vCenter.
 
+
 Cause
 ~~~~~~
 
 The CloudStack administrator UI was used to place the host in scheduled
 maintenance mode. This mode is separate from vCenter's maintenance mode.
 
+
 Solution
 ~~~~~~~~
 
@@ -159,6 +163,7 @@ Symptom
 
 When attempting to create a VM, the VM will not deploy.
 
+
 Cause
 ~~~~~
 
@@ -166,11 +171,13 @@ If the template was created by uploading an OVA file that was created
 using vSphere Client, it is possible the OVA contained an ISO image. If
 it does, the deployment of VMs from the template will fail.
 
+
 Solution
 ~~~~~~~~
 
 Remove the ISO and re-upload the template.
 
+
 Unable to power on virtual machine on VMware
 --------------------------------------------
 
@@ -179,17 +186,12 @@ Symptom
 
 Virtual machine does not power on. You might see errors like:
 
--  
-
-   Unable to open Swap File
-
--  
+-  Unable to open Swap File
 
-   Unable to access a file since it is locked
+-  Unable to access a file since it is locked
 
--  
+-  Unable to access Virtual machine configuration
 
-   Unable to access Virtual machine configuration
 
 Cause
 ~~~~~
@@ -200,13 +202,15 @@ Sometimes the files are not unlocked when the virtual machine is powered
 off. When a virtual machine attempts to power on, it can not access
 these critical files, and the virtual machine is unable to power on.
 
+
 Solution
 ~~~~~~~~
 
 See the following:
 
-`VMware Knowledge Base
-Article <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=10051/>`_
+`VMware Knowledge Base Article 
+<http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=10051/>`_
+
 
 Load balancer rules fail after changing network offering
 --------------------------------------------------------
@@ -217,6 +221,7 @@ Symptom
 After changing the network offering on a network, load balancer rules
 stop working.
 
+
 Cause
 ~~~~~
 
@@ -225,18 +230,21 @@ that includes an external load balancer device such as NetScaler, and
 later the network service offering changed to one that uses the
 CloudStack virtual router.
 
+
 Solution
 ~~~~~~~~
 
 Create a firewall rule on the virtual router for each of your existing
 load balancing rules so that they continue to function.
 
+
 Troubleshooting Internet Traffic
 --------------------------------
 
 Below are a few troubleshooting steps to check whats going wrong with your
 network...
 
+
 Trouble Shooting Steps
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -248,17 +256,17 @@ Trouble Shooting Steps
 
    ::
 
-     kvm1 ~$ vconfig add eth0 64
-     kvm1 ~$ ifconfig eth0.64 1.2.3.4 netmask 255.255.255.0 up
-     kvm1 ~$ ping 1.2.3.5
+      kvm1 ~$ vconfig add eth0 64
+      kvm1 ~$ ifconfig eth0.64 1.2.3.4 netmask 255.255.255.0 up
+      kvm1 ~$ ping 1.2.3.5
 
    On *host2 (kvm2)*
 
    ::
 
-     kvm2 ~$ vconfig add eth0 64
-     kvm2 ~$ ifconfig eth0.64 1.2.3.5 netmask 255.255.255.0 up
-     kvm2 ~$ ping 1.2.3.4
+      kvm2 ~$ vconfig add eth0 64
+      kvm2 ~$ ifconfig eth0.64 1.2.3.5 netmask 255.255.255.0 up
+      kvm2 ~$ ping 1.2.3.4
 
    If the pings dont work, run *tcpdump(8)* all over the place to check
    who is gobbling up the packets. Ultimately, if the switches are not
@@ -282,33 +290,33 @@ Trouble Shooting Steps
 
    ::
 
-     acs-manager ~$ cloudmonkey list traffictypes physicalnetworkid=41cb7ff6-8eb2-4630-b577-1da25e0e1145
-     count = 4
-     traffictype:
-     id = cd0915fe-a660-4a82-9df7-34aebf90003e
-     kvmnetworklabel = cloudbr0
-     physicalnetworkid = 41cb7ff6-8eb2-4630-b577-1da25e0e1145
-     traffictype = Guest
-     xennetworklabel = MGMT
-     ========================================================
-     id = f5524b8f-6605-41e4-a982-81a356b2a196
-     kvmnetworklabel = cloudbr0
-     physicalnetworkid = 41cb7ff6-8eb2-4630-b577-1da25e0e1145
-     traffictype = Management
-     xennetworklabel = MGMT
-     ========================================================
-     id = 266bad0e-7b68-4242-b3ad-f59739346cfd
-     kvmnetworklabel = cloudbr0
-     physicalnetworkid = 41cb7ff6-8eb2-4630-b577-1da25e0e1145
-     traffictype = Public
-     xennetworklabel = MGMT
-     ========================================================
-     id = a2baad4f-7ce7-45a8-9caf-a0b9240adf04
-     kvmnetworklabel = cloudbr0
-     physicalnetworkid = 41cb7ff6-8eb2-4630-b577-1da25e0e1145
-     traffictype = Storage
-     xennetworklabel = MGMT
-     =========================================================
+      acs-manager ~$ cloudmonkey list traffictypes physicalnetworkid=41cb7ff6-8eb2-4630-b577-1da25e0e1145
+      count = 4
+      traffictype:
+      id = cd0915fe-a660-4a82-9df7-34aebf90003e
+      kvmnetworklabel = cloudbr0
+      physicalnetworkid = 41cb7ff6-8eb2-4630-b577-1da25e0e1145
+      traffictype = Guest
+      xennetworklabel = MGMT
+      ========================================================
+      id = f5524b8f-6605-41e4-a982-81a356b2a196
+      kvmnetworklabel = cloudbr0
+      physicalnetworkid = 41cb7ff6-8eb2-4630-b577-1da25e0e1145
+      traffictype = Management
+      xennetworklabel = MGMT
+      ========================================================
+      id = 266bad0e-7b68-4242-b3ad-f59739346cfd
+      kvmnetworklabel = cloudbr0
+      physicalnetworkid = 41cb7ff6-8eb2-4630-b577-1da25e0e1145
+      traffictype = Public
+      xennetworklabel = MGMT
+      ========================================================
+      id = a2baad4f-7ce7-45a8-9caf-a0b9240adf04
+      kvmnetworklabel = cloudbr0
+      physicalnetworkid = 41cb7ff6-8eb2-4630-b577-1da25e0e1145
+      traffictype = Storage
+      xennetworklabel = MGMT
+      =========================================================
   
 #. KVM traffic labels require to be named as *"cloudbr0"*, *"cloudbr2"*,
    *"cloudbrN"* etc and the corresponding bridge must exist on the KVM
@@ -319,15 +327,15 @@ Trouble Shooting Steps
 
    ::
 
-    kvm1 ~$ ifconfig cloudbr0
-    cloudbr0  Link encap:Ethernet  HWaddr 00:0C:29:EF:7D:78  
-          inet addr:192.168.44.22  Bcast:192.168.44.255  Mask:255.255.255.0
-          inet6 addr: fe80::20c:29ff:feef:7d78/64 Scope:Link
-          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
-          RX packets:92435 errors:0 dropped:0 overruns:0 frame:0
-          TX packets:50596 errors:0 dropped:0 overruns:0 carrier:0
-          collisions:0 txqueuelen:0 
-          RX bytes:94985932 (90.5 MiB)  TX bytes:61635793 (58.7 MiB)
+      kvm1 ~$ ifconfig cloudbr0
+      cloudbr0  Link encap:Ethernet  HWaddr 00:0C:29:EF:7D:78  
+         inet addr:192.168.44.22  Bcast:192.168.44.255  Mask:255.255.255.0
+         inet6 addr: fe80::20c:29ff:feef:7d78/64 Scope:Link
+         UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+         RX packets:92435 errors:0 dropped:0 overruns:0 frame:0
+         TX packets:50596 errors:0 dropped:0 overruns:0 carrier:0
+         collisions:0 txqueuelen:0 
+         RX bytes:94985932 (90.5 MiB)  TX bytes:61635793 (58.7 MiB)
 
 #. The Virtual Router, SSVM, CPVM *public* interface would be bridged to
    a physical interface on the host. In the example below, *cloudbr0* is
@@ -341,22 +349,22 @@ Trouble Shooting Steps
 
    ::
 
-     kvm-host1 ~$ brctl show
-     bridge name  bridge id           STP enabled interfaces
-     breth0-64    8000.000c29ef7d78   no          eth0.64
-                                                  vnet2
-     cloud0       8000.fe00a9fe0219   no          vnet0
-     cloudbr0     8000.000c29ef7d78   no          eth0
-                                                  vnet1
-                                                  vnet3
-     virbr0       8000.5254008e321a   yes         virbr0-nic
+      kvm-host1 ~$ brctl show
+      bridge name  bridge id           STP enabled interfaces
+      breth0-64    8000.000c29ef7d78   no          eth0.64
+                                                   vnet2
+      cloud0       8000.fe00a9fe0219   no          vnet0
+      cloudbr0     8000.000c29ef7d78   no          eth0
+                                                   vnet1
+                                                   vnet3
+      virbr0       8000.5254008e321a   yes         virbr0-nic
 
    ::
 
-     xenserver1 ~$ brctl show
-     bridge name  bridge id           STP enabled interfaces
-     xapi0    0000.e2b76d0a1149       no          vif1.0
-     xenbr0   0000.000c299b54dc       no          eth0
+      xenserver1 ~$ brctl show
+      bridge name  bridge id           STP enabled interfaces
+      xapi0    0000.e2b76d0a1149       no          vif1.0
+      xenbr0   0000.000c299b54dc       no          eth0
                                                   xapi1
                                                   vif1.1
                                                   vif1.2
@@ -367,11 +375,11 @@ Trouble Shooting Steps
 
    ::
 
-     xenserver1 ~$ xe network-list 
-     uuid ( RO)                : aaa-bbb-ccc-ddd
-               name-label ( RW): MGMT
-         name-description ( RW): 
-                   bridge ( RO): xenbr0
+      xenserver1 ~$ xe network-list 
+      uuid ( RO)                : aaa-bbb-ccc-ddd
+                name-label ( RW): MGMT
+          name-description ( RW): 
+                    bridge ( RO): xenbr0
 
 
 #. The Internet would be accessible from both the SSVM and CPVM
@@ -385,25 +393,25 @@ Trouble Shooting Steps
 
    ::
 
-     root@s-1-VM:~# ping -c 3 google.com
-     PING google.com (74.125.236.164): 56 data bytes
-     64 bytes from 74.125.236.164: icmp_seq=0 ttl=55 time=26.932 ms
-     64 bytes from 74.125.236.164: icmp_seq=1 ttl=55 time=29.156 ms
-     64 bytes from 74.125.236.164: icmp_seq=2 ttl=55 time=25.000 ms
-     --- google.com ping statistics ---
-     3 packets transmitted, 3 packets received, 0% packet loss
-     round-trip min/avg/max/stddev = 25.000/27.029/29.156/1.698 ms
+      root@s-1-VM:~# ping -c 3 google.com
+      PING google.com (74.125.236.164): 56 data bytes
+      64 bytes from 74.125.236.164: icmp_seq=0 ttl=55 time=26.932 ms
+      64 bytes from 74.125.236.164: icmp_seq=1 ttl=55 time=29.156 ms
+      64 bytes from 74.125.236.164: icmp_seq=2 ttl=55 time=25.000 ms
+      --- google.com ping statistics ---
+      3 packets transmitted, 3 packets received, 0% packet loss
+      round-trip min/avg/max/stddev = 25.000/27.029/29.156/1.698 ms
 
    ::
 
-     root@v-2-VM:~# ping -c 3 google.com
-     PING google.com (74.125.236.164): 56 data bytes
-     64 bytes from 74.125.236.164: icmp_seq=0 ttl=55 time=32.125 ms
-     64 bytes from 74.125.236.164: icmp_seq=1 ttl=55 time=26.324 ms
-     64 bytes from 74.125.236.164: icmp_seq=2 ttl=55 time=37.001 ms
-     --- google.com ping statistics ---
-     3 packets transmitted, 3 packets received, 0% packet loss
-     round-trip min/avg/max/stddev = 26.324/31.817/37.001/4.364 ms
+      root@v-2-VM:~# ping -c 3 google.com
+      PING google.com (74.125.236.164): 56 data bytes
+      64 bytes from 74.125.236.164: icmp_seq=0 ttl=55 time=32.125 ms
+      64 bytes from 74.125.236.164: icmp_seq=1 ttl=55 time=26.324 ms
+      64 bytes from 74.125.236.164: icmp_seq=2 ttl=55 time=37.001 ms
+      --- google.com ping statistics ---
+      3 packets transmitted, 3 packets received, 0% packet loss
+      round-trip min/avg/max/stddev = 26.324/31.817/37.001/4.364 ms
 
 
 #. The Virtual Router (VR) should also be able to reach the Internet
@@ -412,14 +420,14 @@ Trouble Shooting Steps
 
    ::
 
-     root@r-4-VM:~# ping -c 3 google.com
-     PING google.com (74.125.236.164): 56 data bytes
-     64 bytes from 74.125.236.164: icmp_seq=0 ttl=55 time=28.098 ms
-     64 bytes from 74.125.236.164: icmp_seq=1 ttl=55 time=34.785 ms
-     64 bytes from 74.125.236.164: icmp_seq=2 ttl=55 time=69.179 ms
-     --- google.com ping statistics ---
-     3 packets transmitted, 3 packets received, 0% packet loss
-     round-trip min/avg/max/stddev = 28.098/44.021/69.179/17.998 ms
+      root@r-4-VM:~# ping -c 3 google.com
+      PING google.com (74.125.236.164): 56 data bytes
+      64 bytes from 74.125.236.164: icmp_seq=0 ttl=55 time=28.098 ms
+      64 bytes from 74.125.236.164: icmp_seq=1 ttl=55 time=34.785 ms
+      64 bytes from 74.125.236.164: icmp_seq=2 ttl=55 time=69.179 ms
+      --- google.com ping statistics ---
+      3 packets transmitted, 3 packets received, 0% packet loss
+      round-trip min/avg/max/stddev = 28.098/44.021/69.179/17.998 ms
 
 #. However, the Virtual Router's (VR) Source NAT Public IP address
    **WONT** be reachable until appropriate Ingress rules are
@@ -443,5 +451,6 @@ Trouble Shooting Steps
 In a vast majority of the cases, the problem has turned out to be at the
 switching layer where the L3 switches were configured incorrectly.
 
-This section was contibuted by Shanker Balan and was originally published on `Shapeblue's blog <http://shankerbalan.net/blog/internet-not-working-on-cloudstack-vms/>`_
+This section was contibuted by Shanker Balan and was originally published on 
+`Shapeblue's blog <http://shankerbalan.net/blog/internet-not-working-on-cloudstack-vms/>`_
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/tuning.rst
----------------------------------------------------------------------
diff --git a/source/tuning.rst b/source/tuning.rst
index 5ff2584..75b0954 100644
--- a/source/tuning.rst
+++ b/source/tuning.rst
@@ -20,6 +20,7 @@ Tuning
 This section provides tips on how to improve the performance of your
 cloud.
 
+
 Performance Monitoring
 ----------------------
 
@@ -28,55 +29,47 @@ administrators. This allows the user to monitor their utilization of
 resources and determine when it is appropriate to choose a more powerful
 service offering or larger disk.
 
+
 Increase Management Server Maximum Memory
 -----------------------------------------
 
 If the Management Server is subject to high demand, the default maximum
 JVM memory allocation can be insufficient. To increase the memory:
 
-#. 
-
-   Edit the Tomcat configuration file:
+#. Edit the Tomcat configuration file:
 
    .. code:: bash
 
-       /etc/cloudstack/management/tomcat6.conf
+      /etc/cloudstack/management/tomcat6.conf
 
-#. 
-
-   Change the command-line parameter -XmxNNNm to a higher value of N.
+#. Change the command-line parameter -XmxNNNm to a higher value of N.
 
    For example, if the current value is -Xmx128m, change it to -Xmx1024m
    or higher.
 
-#. 
-
-   To put the new setting into effect, restart the Management Server.
+#. To put the new setting into effect, restart the Management Server.
 
    .. code:: bash
 
-       # service cloudstack-management restart
+      # service cloudstack-management restart
 
 For more information about memory issues, see "FAQ: Memory" at `Tomcat
 Wiki. <http://wiki.apache.org/tomcat/FAQ/Memory>`_
 
+
 Set Database Buffer Pool Size
 -----------------------------
 
 It is important to provide enough memory space for the MySQL database to
 cache data and indexes:
 
-#. 
-
-   Edit the MySQL configuration file:
+#. Edit the MySQL configuration file:
 
    .. code:: bash
 
-       /etc/my.cnf
-
-#. 
+      /etc/my.cnf
 
-   Insert the following line in the [mysqld] section, below the datadir
+#. 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
@@ -85,20 +78,19 @@ cache data and indexes:
 
    .. code:: bash
 
-       innodb_buffer_pool_size=700M
-
-#. 
+      innodb_buffer_pool_size=700M
 
-   Restart the MySQL service.
+#. Restart the MySQL service.
 
    .. code:: bash
 
-       # service mysqld restart
+      # service mysqld restart
 
 For more information about the buffer pool, see "The InnoDB Buffer Pool"
 at `MySQL Reference
 Manual <http://dev.mysql.com/doc/refman/5.5/en/innodb-buffer-pool.html>`_.
 
+
 Set and Monitor Total VM Limits per Host
 ----------------------------------------
 
@@ -119,6 +111,7 @@ cluster is at most (N-1) \* (per-host-limit). Once a cluster reaches
 this number of VMs, use the CloudStack UI to disable allocation of more
 VMs to the cluster.
 
+
 Configure XenServer dom0 Memory
 -------------------------------
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/ui.rst
----------------------------------------------------------------------
diff --git a/source/ui.rst b/source/ui.rst
index 9b63600..c2d6bf3 100644
--- a/source/ui.rst
+++ b/source/ui.rst
@@ -13,6 +13,7 @@
    specific language governing permissions and limitations
    under the License.
 
+
 User Interface
 ==============
 
@@ -28,7 +29,7 @@ management server IP address)
 
 .. sourcecode:: bash
 
-    http://<management-server-ip-address>:8080/client
+   http://<management-server-ip-address>:8080/client
 
 On a fresh Management Server installation, a guided tour splash screen
 appears. On later visits, you’ll see a login screen where you specify
@@ -36,8 +37,8 @@ the following to proceed to your Dashboard:
 
 Username -> The user ID of your account. The default username is admin.
 
-Password -> The password associated with the user ID. The password for the default
-username is password.
+Password -> The password associated with the user ID. The password for 
+the default username is password.
 
 Domain -> If you are a root user, leave this field blank.
 
@@ -52,6 +53,7 @@ enter Comp1/sales.
 For more guidance about the choices that appear when you log in to this
 UI, see Logging In as the Root Administrator.
 
+
 End User's UI Overview
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -61,6 +63,7 @@ data volumes and snapshots, guest networks, and IP addresses. If the
 user is a member or administrator of one or more CloudStack projects,
 the UI can provide a project-oriented view.
 
+
 Root Administrator's UI Overview
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -74,6 +77,7 @@ screen and the navigation bar on the left provide access to a variety of
 administrative functions. The root administrator can also use the UI to
 perform all the same tasks that are present in the end-user’s UI.
 
+
 Logging In as the Root Administrator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -81,26 +85,20 @@ After the Management Server software is installed and running, you can
 run the CloudStack user interface. This UI is there to help you
 provision, view, and manage your cloud infrastructure.
 
-#. 
-
-   Open your favorite Web browser and go to this URL. Substitute the IP
+#. Open your favorite Web browser and go to this URL. Substitute the IP
    address of your own Management Server:
 
    .. sourcecode:: bash
 
-       http://<management-server-ip-address>:8080/client
+      http://<management-server-ip-address>:8080/client
 
    After logging into a fresh Management Server installation, a guided
    tour splash screen appears. On later visits, you’ll be taken directly
    into the Dashboard.
 
-#. 
+#. If you see the first-time splash screen, choose one of the following.
 
-   If you see the first-time splash screen, choose one of the following.
-
-   -  
-
-      **Continue with basic setup.** Choose this if you're just trying
+   -  **Continue with basic setup.** Choose this if you're just trying
       CloudStack, and you want a guided walkthrough of the simplest
       possible configuration so that you can get started right away.
       We'll help you set up a cloud with the following features: a
@@ -112,9 +110,7 @@ provision, view, and manage your cloud infrastructure.
       information you need, but if you want just a bit more detail, you
       can follow along in the Trial Installation Guide.
 
-   -  
-
-      **I have used CloudStack before.** Choose this if you have already
+   -  **I have used CloudStack before.** Choose this if you have already
       gone through a design phase and planned a more sophisticated
       deployment, or you are ready to start scaling up a trial cloud
       that you set up earlier with the basic setup screens. In the
@@ -126,15 +122,17 @@ provision, view, and manage your cloud infrastructure.
 
       The root administrator Dashboard appears.
 
-#. 
-
-   You should set a new root administrator password. If you chose basic
+#. You should set a new root administrator password. If you chose basic
    setup, you’ll be prompted to create a new password right away. If you
    chose experienced user, use the steps in :ref:`changing-root-password`.
 
-.. warning:: 
-
-   You are logging in as the root administrator. This account manages the CloudStack deployment, including physical infrastructure. The root administrator can modify configuration settings to change basic functionality, create or delete user accounts, and take many actions that should be performed only by an authorized person. Please change the default password to a new, unique password.
+.. warning::
+   You are logging in as the root administrator. This account manages the 
+   CloudStack deployment, including physical infrastructure. The root 
+   administrator can modify configuration settings to change basic 
+   functionality, create or delete user accounts, and take many actions 
+   that should be performed only by an authorized person. Please change 
+   the default password to a new, unique password.
 
 .. _changing-root-password:
 
@@ -150,43 +148,27 @@ many actions that should be performed only by an authorized person. When
 first installing CloudStack, be sure to change the default password to a
 new, unique value.
 
-#. 
-
-   Open your favorite Web browser and go to this URL. Substitute the IP
+#. Open your favorite Web browser and go to this URL. Substitute the IP
    address of your own Management Server:
 
    .. sourcecode:: bash
 
-       http://<management-server-ip-address>:8080/client
-
-#. 
+      http://<management-server-ip-address>:8080/client
 
-   Log in to the UI using the current root user ID and password. The
+#. Log in to the UI using the current root user ID and password. The
    default is admin, password.
 
-#. 
-
-   Click Accounts.
-
-#. 
-
-   Click the admin account name.
-
-#. 
-
-   Click View Users.
-
-#. 
+#. Click Accounts.
 
-   Click the admin user name.
+#. Click the admin account name.
 
-#. 
+#. Click View Users.
 
-   Click the Change Password button. |change-password.png|
+#. Click the admin user name.
 
-#. 
+#. Click the Change Password button. |change-password.png|
 
-   Type the new password, and click OK.
+#. Type the new password, and click OK.
 
 
 .. |change-password.png| image:: _static/images/change-password.png


[23/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/networking.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/networking.po b/source/locale/zh_CN/LC_MESSAGES/networking.po
new file mode 100644
index 0000000..81430a8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/networking.po
@@ -0,0 +1,901 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# aguncn <ag...@163.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-23 12:39+0000\n"
+"Last-Translator: aguncn <ag...@163.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 378fc355da2a4f7d8546a95fd9b3f5dc
+#: ../../networking.rst:18
+msgid "Setting Up Networking for Users"
+msgstr "用户网络设置"
+
+# 17e4cb5cdf264aa19e3578731bf842c4
+#: ../../networking.rst:21
+msgid "Overview of Setting Up Networking for Users"
+msgstr "用户网络设置概览"
+
+# 96d37a14970944b58909ecaace082018
+#: ../../networking.rst:23
+msgid ""
+"People using cloud infrastructure have a variety of needs and preferences "
+"when it comes to the networking services provided by the cloud. As a "
+"CloudStack administrator, you can do the following things to set up "
+"networking for your users:"
+msgstr "当涉及到云计算所提供的网络服务, 使用云基础设施的人都有各自不同的需求和喜好. 作为CloudStack管理员, 你可以为你的用户做下面的事情来设置网络:"
+
+# 3db74da31e2046a8908c67bf3c665472
+#: ../../networking.rst:30
+msgid "Set up physical networks in zones"
+msgstr "在资源域里设置物理网络"
+
+# 94e40111c3614cebb720933c53c016bb
+#: ../../networking.rst:34
+msgid ""
+"Set up several different providers for the same service on a single physical"
+" network (for example, both Cisco and Juniper firewalls)"
+msgstr "在单个物理网卡上为同一服务设置不同的服务提供者(例如, 同时设置Cisco和Juniper的防火墙)"
+
+# f7ee99dc067d4b129ec339cb1799e0cd
+#: ../../networking.rst:39
+msgid ""
+"Bundle different types of network services into network offerings, so users "
+"can choose the desired network services for any given virtual machine"
+msgstr "绑定不同类型的网络服务到网络方案中, 这样用户可以在给定的虚机中使用期望的网络服务."
+
+# c5a8692df93942eca2c97aa1872928c6
+#: ../../networking.rst:45
+msgid ""
+"Add new network offerings as time goes on so end users can upgrade to a "
+"better class of service on their network"
+msgstr "随着时间的推移, 添加新的网络方案以便是最终用户升级他们的网络服务."
+
+# f11d70f72e114c728425a80bf2c162c5
+#: ../../networking.rst:50
+msgid ""
+"Provide more ways for a network to be accessed by a user, such as through a "
+"project of which the user is a member"
+msgstr "提供更多的途径让一个用户访问一个网络, 比如通过用户所在的一个项目"
+
+# aa05ae98bb2a4229a3c0478a99a39fe6
+#: ../../networking.rst:54
+msgid "About Virtual Networks"
+msgstr "关于虚拟网络"
+
+# a08bd43e29f54560ba910cb343eb5f53
+#: ../../networking.rst:56
+msgid ""
+"A virtual network is a logical construct that enables multi-tenancy on a "
+"single physical network. In CloudStack a virtual network can be shared or "
+"isolated."
+msgstr "虚拟网络是使多租户在一个物理网络中的逻辑结构。在CloudStack中,虚拟网络可以被共享或隔离。"
+
+# d1784c41349f444cbaaffea5119ee4bf
+#: ../../networking.rst:61
+msgid "Isolated Networks"
+msgstr "隔离的网络"
+
+# db4418e95acd4fa69374025ca81020cb
+#: ../../networking.rst:63
+msgid ""
+"An isolated network can be accessed only by virtual machines of a single "
+"account. Isolated networks have the following properties."
+msgstr "一个隔离的网络可以访问虚拟机的单一账户。隔离的网络具有下列性质。"
+
+# 554e4288f8524114a4bcf6da37435d19
+#: ../../networking.rst:68
+msgid "Resources such as VLAN are allocated and garbage collected dynamically"
+msgstr "如VLAN等资源被动态分配和垃圾收集"
+
+# 55a8c8a3a194402a9e55453f2ec86253
+#: ../../networking.rst:73
+msgid "There is one network offering for the entire network"
+msgstr "有一个用于整个网络的网络方案"
+
+# 6da623bb1302444ebd2054fdbf1743b7
+#: ../../networking.rst:77
+msgid ""
+"The network offering can be upgraded or downgraded but it is for the entire "
+"network"
+msgstr "网络提供可升级或降级,但它是用于整个网络的"
+
+# c3f3fb10b1b84b56b1a7c5c1d57144f7
+#: ../../networking.rst:80
+msgid ""
+"For more information, see `“Configure Guest Traffic in an Advanced Zone” "
+"<networking2.html#configure-guest-traffic-in-an-advanced-zone>`_."
+msgstr "更多信息,参考`“在高级区域中配置来宾流量” <networking2.html#configure-guest-traffic-in-an-advanced-zone>`_."
+
+# 774c3f3c464645b68e37c9d0558753fc
+#: ../../networking.rst:83
+msgid "Shared Networks"
+msgstr "共享网络"
+
+# a3d1aa420b2e4d5b9d13ffb9fc397614
+#: ../../networking.rst:85
+msgid ""
+"A shared network can be accessed by virtual machines that belong to many "
+"different accounts. Network Isolation on shared networks is accomplished by "
+"using techniques such as security groups, which is supported only in Basic "
+"zones in CloudStack 3.0.3 and later versions."
+msgstr "共享网络可以被属于不同客户的虚拟机访问。共享网络中的网络隔离通过安全组实现(仅在CloudStack 3.0.3及以后的基本区域中支持)"
+
+# 0046613bd7254cef901e0515e4a83759
+#: ../../networking.rst:92
+msgid "Shared Networks are created by the administrator"
+msgstr "管理员创建的共享网络"
+
+# 4f8d81c8a66e42688826ed6e2e945dcb
+#: ../../networking.rst:96
+msgid "Shared Networks can be designated to a certain domain"
+msgstr "在一个确定的哉中设计共享网络"
+
+# ed54831a452d415eaadb8ceee4586eca
+#: ../../networking.rst:100
+msgid ""
+"Shared Network resources such as VLAN and physical network that it maps to "
+"are designated by the administrator"
+msgstr "共享网络资源如VLAN和物理网络,它映射到指定的管理员"
+
+# da3c9bed2af34e42a36b14d2b5ff6541
+#: ../../networking.rst:105
+msgid "Shared Networks can be isolated by security groups"
+msgstr "共享网络通过安全组实现隔离"
+
+# 0b46085b309e4593b1de03c7e4b4bf9c
+#: ../../networking.rst:109
+msgid "Public Network is a shared network that is not shown to the end users"
+msgstr "公网网络作为一个共享网络不会展示给终端用户"
+
+# 44ffaf3770314f4c887d620f8aca1f78
+#: ../../networking.rst:113
+msgid ""
+"Source NAT per zone is not supported in Shared Network when the service "
+"provider is virtual router. However, Source NAT per account is supported. "
+"For information, see `“Configuring a Shared Guest Network” "
+"<networking2.html#configuring-a-shared-guest-network>`_."
+msgstr "当共享网络是由虚拟路由提供的服务,则每个区域是不支持Source NAT功能的。然而,每个帐户是支持Source NAT功能的。更多信息,参考`“配置共享来宾网络” <networking2.html#configuring-a-shared-guest-network>`_."
+
+# f6678b56239e4ca6bde83febb7adfae4
+#: ../../networking.rst:119
+msgid "Runtime Allocation of Virtual Network Resources"
+msgstr "虚拟网络资源的运行时分配"
+
+# e38a78ac1a6049de83a965db1b35dae3
+#: ../../networking.rst:121
+msgid ""
+"When you define a new virtual network, all your settings for that network "
+"are stored in CloudStack. The actual network resources are activated only "
+"when the first virtual machine starts in the network. When all virtual "
+"machines have left the virtual network, the network resources are garbage "
+"collected so they can be allocated again. This helps to conserve network "
+"resources."
+msgstr "当你定义一个新的虚拟网络,该网络的所有的设置都存储在CloudStack中。只有当第一台虚拟机在该网络中启动时,实际的网络资源才会被激活。当所有的虚拟机都离开了虚拟网络,系统进行网络资源垃圾收集,使它们能够重新分配。这有助于节约网络资源。"
+
+# 8ab8ea2db95d4c4f810705a814fb93b9
+#: ../../networking.rst:129
+msgid "Network Service Providers"
+msgstr "网络服务提供者"
+
+# d6ce8ef140484edcb8039a76dc385b9e
+#: ../../networking.rst:132
+msgid ""
+"For the most up-to-date list of supported network service providers, see the"
+" CloudStack UI or call `listNetworkServiceProviders`."
+msgstr "查看最新的网络服务提供者支持列表请见CloudStack用户界面或者调用listNetworkServiceProviders`.。"
+
+# 1cbf32a3d9944d6f8bb5bd6c44f80f49
+#: ../../networking.rst:134
+msgid ""
+"A service provider (also called a network element) is hardware or virtual "
+"appliance that makes a network service possible; for example, a firewall "
+"appliance can be installed in the cloud to provide firewall service. On a "
+"single network, multiple providers can provide the same network service. For"
+" example, a firewall service may be provided by Cisco or Juniper devices in "
+"the same physical network."
+msgstr "服务提供者(也称为网络元件)是指通过硬件或虚拟应用来实现网络应用。比如,防火墙应用可以安装在云端来提供防火墙服务。在独立网络中多个提供者能提供相同的网络服务。比如,可以通过思科或者Juniper的设备在同一个物理网络中提供防火墙服务。"
+
+# 8f25fd00ebd8421db4c8b732bc40daf3
+#: ../../networking.rst:141
+msgid ""
+"You can have multiple instances of the same service provider in a network "
+"(say, more than one Juniper SRX device)."
+msgstr "在一个网络中你可以多个实例使用相同的服务提供者(也可以使用多个Juniper SRX设备)"
+
+# c16afb129f964ce0b4f26b864fc15cfb
+#: ../../networking.rst:144
+msgid ""
+"If different providers are set up to provide the same service on the "
+"network, the administrator can create network offerings so users can specify"
+" which network service provider they prefer (along with the other choices "
+"offered in network offerings). Otherwise, CloudStack will choose which "
+"provider to use whenever the service is called for."
+msgstr "如果不同提供者被设置在网络中提供相同服务,管理员可以通过创建网络提供方案,因此用户能够自己制定使用哪个物理网络提供者(要遵从网络提供方案中的其他选项)。否则CloudStack会在服务被需求的时候选择使用哪个提供者。"
+
+# 54e114cc45464476b77ca5d8de1ce4bb
+#: ../../networking.rst:150
+msgid "*Supported Network Service Providers*"
+msgstr "*支持的网络服务提供者*"
+
+# 3d10447bdf2c432586a4e5610ae5ab5e
+#: ../../networking.rst:152
+msgid ""
+"CloudStack ships with an internal list of the supported service providers, "
+"and you can choose from this list when creating a network offering."
+msgstr "CloudStack已经预置了一些内置的服务提供者支持列表。你能在创建网络提供方案的时候你能从这列表中选择。"
+
+# e743e99990144f939fc3a63349774ce0
+#: ../../networking.rst:157
+msgid "Virtual Router"
+msgstr "虚拟路由"
+
+# f79fe8d0744940bfa69f362edb14c35f
+#: ../../networking.rst:157
+msgid "Citrix NetScaler"
+msgstr "Citrix NetScaler"
+
+# d86abf81c8de465b9cede26a7720dace
+#: ../../networking.rst:157
+msgid "Juniper SRX"
+msgstr "Juniper SRX"
+
+# 023e0ba83f2f413890cf4eac19ab30fc
+#: ../../networking.rst:157
+msgid "F5 BigIP"
+msgstr "F5 BigIP"
+
+# 4cc8fae5e06d4938a3d6777a1f49b7ef
+#: ../../networking.rst:157
+msgid "Host based (KVM/Xen)"
+msgstr "Host based (KVM/Xen)"
+
+# 538c6cf7488a4cf1b2790816cb3796d3
+#: ../../networking.rst:160
+msgid "Remote Access VPN"
+msgstr "远程访问VPN"
+
+# 9d3882428ce14164ae21556dd4f71980
+# 9f18b0853a44447f9f9a8c1e8f154ad5
+# e0be26ab6fad4753893deb50337a6730
+# 7aa2d2ff8735493a9a3a6b5eb8d46f1d
+# 65fb94ad60864e47837bd7097c7e950b
+# c98aa239bbbf48af9ab5709b1ce4d85f
+# 1fdc23d97e81478caf0d9a4ddc729069
+# 024d3b3a60ca47228a4cbd600dccbe1f
+# 71139b53fe904bd4a018ae8097a371d1
+# c9f2815cd2864ed9be683e676444d21e
+# f5651ed2f2a74438a882ca58fa5379c4
+# b803d31092d74127a0d71cf5ec01e6de
+# f0378ae48126424bb889176fd22f0f26
+# 5c6b625d8fd64373a5a58eb8be434d7d
+# a5a7cbf6009341a5970e96d746a90485
+# 4093e40696754637b985dac12d3c3a9d
+#: ../../networking.rst:160 ../../networking.rst:162 ../../networking.rst:164
+#: ../../networking.rst:164 ../../networking.rst:166 ../../networking.rst:166
+#: ../../networking.rst:166 ../../networking.rst:168 ../../networking.rst:170
+#: ../../networking.rst:172 ../../networking.rst:172 ../../networking.rst:174
+#: ../../networking.rst:174 ../../networking.rst:174 ../../networking.rst:176
+#: ../../networking.rst:176
+msgid "Yes"
+msgstr "支持"
+
+# cf6cd7e627894bb399d4b2a2e8935730
+# c3739de5a9764c0ab1a9eec12242ba2f
+# b9904b520f854271863c5edcd444465b
+# d6acc1800a59467cb6b4a593f7406d73
+# 47da62cd78544702b598db9bfa70aa28
+# 8b8bcaa926154fa8a8da6ebe379fecc0
+# aaffd78d2bd642cb86e191db5ed57113
+# eb30654a90c149bcb276e1dbdf484b74
+# 9e327f9dff554171807add97cd2d1086
+# b0c5b421a56f45dc914f8da460b23bbc
+# 511fe014c5594bdea7000aaf6d83bfdd
+# 78332347e8df424599c7e2ae65ffdfe5
+# d61f0398e7c64d2b938caf47076f9b33
+# 9f358aeca54544e79a112777b0be0386
+# 8dc5b57a7f834fa1897d63f2d907cca3
+# 5e6786c934114eafba47a9285f24c1a3
+# 4bc2d4a340ab4e3285bb620d3f3f7cae
+# 8afc553c7dfb446dab37feab5d539e84
+# c6d4fcc0d2e24f26993278c0224e9a2a
+# b8ce0003e3dd4d43b1f2509c03ff2456
+# 68be8c9eb09c4f56ae0a82896449d23e
+# 8a22ab4b1b144f7c81adf05c887c7d30
+# 990514caa33a45b8aa649b0f23afcccd
+# adcbfe0ed8f84271af55d6e2e9042250
+# 0f0d09b47b7742bc8039484cf91cc212
+# a5faef20128445dcbffe80d358fa2f2e
+# 3abe142c737841929ddfd4c25902d9a2
+# 3f06f8c6b0844269a865cbe05fed4dbb
+# 56624add510a4e4e96cc0fbb740e66b9
+#: ../../networking.rst:160 ../../networking.rst:160 ../../networking.rst:160
+#: ../../networking.rst:160 ../../networking.rst:162 ../../networking.rst:162
+#: ../../networking.rst:162 ../../networking.rst:162 ../../networking.rst:164
+#: ../../networking.rst:164 ../../networking.rst:164 ../../networking.rst:166
+#: ../../networking.rst:166 ../../networking.rst:168 ../../networking.rst:168
+#: ../../networking.rst:168 ../../networking.rst:168 ../../networking.rst:170
+#: ../../networking.rst:170 ../../networking.rst:170 ../../networking.rst:170
+#: ../../networking.rst:172 ../../networking.rst:172 ../../networking.rst:172
+#: ../../networking.rst:174 ../../networking.rst:174 ../../networking.rst:176
+#: ../../networking.rst:176 ../../networking.rst:176
+msgid "No"
+msgstr "不支持"
+
+# e4a4c959124946818756ed66cb87561f
+#: ../../networking.rst:162
+msgid "DNS/DHCP/User Data"
+msgstr "DNS/DHCP/User Data"
+
+# 8fa7de81857c47bf95dbb457c47ad0ee
+# 3ee09c09bfb4473d97f2902efd5a8dc2
+# 19c378b323184814a5616bd38baac90d
+#: ../../networking.rst:164 ../../networking.rst:213 ../../networking.rst:347
+msgid "Firewall"
+msgstr "防火墙"
+
+# cee9dbc5210747198f81a673f44a12f9
+# f948b5d0102c45b59800ce77524e1e61
+#: ../../networking.rst:166 ../../networking.rst:209
+msgid "Load Balancing"
+msgstr "负载均衡"
+
+# 5a07c7f449494ff6863e789adde970a6
+#: ../../networking.rst:168
+msgid "Elastic IP"
+msgstr "弹性IP"
+
+# 10fe6e755ee449b181436d52a65d114c
+#: ../../networking.rst:170
+msgid "Elastic LB"
+msgstr "弹性负载均衡"
+
+# f6ab100ea87b42e7ac418826469fbbab
+# 89757ebd8a6a4f00b3c75bf99bc10ee8
+# f84a82fdc1174b07a63be45eb129877b
+#: ../../networking.rst:172 ../../networking.rst:197 ../../networking.rst:348
+msgid "Source NAT"
+msgstr "Source NAT"
+
+# bdd8361aec614d1d88b3744f189c4415
+# ad01893a0c484fb091cf1e5d092fdc80
+# b1c7bbe203744800a2b447343c326b1a
+#: ../../networking.rst:174 ../../networking.rst:201 ../../networking.rst:351
+msgid "Static NAT"
+msgstr "静态 NAT"
+
+# 06fc70b280b249f380499674c2c4b04e
+# 8568edfad82b413fadcc6a7f88f09caa
+# 2968ac56dd7343a8aafe6eb21f1fd292
+#: ../../networking.rst:176 ../../networking.rst:205 ../../networking.rst:354
+msgid "Port Forwarding"
+msgstr "端口转发"
+
+# cbe50c4a0b834778a33a13b921dc6816
+#: ../../networking.rst:180
+msgid "Network Offerings"
+msgstr "网络方案"
+
+# 02abde9be17140019afedd547b9803b6
+#: ../../networking.rst:183
+msgid ""
+"For the most up-to-date list of supported network services, see the "
+"CloudStack UI or call listNetworkServices."
+msgstr "要查看最新的网络服务支持列表,请参见 CloudStack用户界面或者调用API listNetworkServices。"
+
+# ffb8cf5d807844839de681dda6fbac69
+#: ../../networking.rst:185
+msgid "A network offering is a named set of network services, such as:"
+msgstr "网络方案是带名称的一套网络服务,例如:"
+
+# 81bef347f73f480d99fe3b774343e95a
+# 7ac52f84225841a9b0722b7da042b868
+#: ../../networking.rst:189 ../../networking.rst:342
+msgid "DHCP"
+msgstr "DHCP"
+
+# e657c892333148a896e62c25f0270de2
+# cb2df25d008a4c8b8dc95cb508b6108d
+#: ../../networking.rst:193 ../../networking.rst:343
+msgid "DNS"
+msgstr "DNS"
+
+# 343e51150ca849f9a2fd1732bd5f57ce
+# e17fb858985f47528d2cd7bb3abb2ef2
+#: ../../networking.rst:217 ../../networking.rst:357
+msgid "VPN"
+msgstr "VPN"
+
+# 8bd55493dec640089760b46be49c832b
+#: ../../networking.rst:221
+msgid ""
+"(Optional) Name one of several available providers to use for a given "
+"service, such as Juniper for the firewall"
+msgstr "(可选)在服务的多个可选提供者中指定其一,例如Juniper作为防火墙服务"
+
+# 23bc443c0915486e927b945665f7e8e5
+#: ../../networking.rst:226
+msgid "(Optional) Network tag to specify which physical network to use"
+msgstr "(可选)用于指定使用哪个物理网络的网络标签"
+
+# a58f1c2f9e4644848265743394fedf70
+#: ../../networking.rst:228
+msgid ""
+"When creating a new VM, the user chooses one of the available network "
+"offerings, and that determines which network services the VM can use."
+msgstr "用户创建虚机时,需要选择一种可用的网络方案。该网络方案确定了虚机可使用的网络服务。"
+
+# ad1942baddc2480e88346f41b83f27ca
+#: ../../networking.rst:231
+msgid ""
+"The CloudStack administrator can create any number of custom network "
+"offerings, in addition to the default network offerings provided by "
+"CloudStack. By creating multiple custom network offerings, you can set up "
+"your cloud to offer different classes of service on a single multi-tenant "
+"physical network. For example, while the underlying physical wiring may be "
+"the same for two tenants, tenant A may only need simple firewall protection "
+"for their website, while tenant B may be running a web server farm and "
+"require a scalable firewall solution, load balancing solution, and alternate"
+" networks for accessing the database backend."
+msgstr "CloudStack ;提供了默认的网络方案,在此之外,系统管理员可以添加任意数量的自定义网络方案。通过创建多种自定义网络方案,您可以在一个多租户的物理网络基础上提供不同级别的网络服务。例如,尽管两个租户的底层物理网络是一个,租户A可能仅需要用防火墙保护他们的网站,而租户B可能运行一个Web服务器集群,要求一个可扩展的防火墙方案、负载均衡方案、和用于访问后台数据库的可替代的网络。"
+
+# a559cfad18634227802c97abe0c02a8d
+#: ../../networking.rst:243
+msgid ""
+"If you create load balancing rules while using a network service offering "
+"that includes an external load balancer device such as NetScaler, and later "
+"change the network service offering to one that uses the CloudStack virtual "
+"router, you must create a firewall rule on the virtual router for each of "
+"your existing load balancing rules so that they continue to function."
+msgstr "如果你创建了一个负载均衡规则且使用包括外部负载均衡设备的网络服务方案,如包括NetScaler,但随后将网络方案改成使用CloudStack的虚拟路由器,则你必须在虚拟路由器上创建一个防火墙规则,这些防火墙规则与已经设置的负载均衡规则一一对应,只有这样,才能使那些负载均衡规则继续起作用。"
+
+# cbc7fbcc3e6348d3908586739dbdb6f9
+#: ../../networking.rst:245
+msgid ""
+"When creating a new virtual network, the CloudStack administrator chooses "
+"which network offering to enable for that network. Each virtual network is "
+"associated with one network offering. A virtual network can be upgraded or "
+"downgraded by changing its associated network offering. If you do this, be "
+"sure to reprogram the physical network to match."
+msgstr "创建新虚拟网络时,CloudStack 管理服务器可选择该网络使用的网络方案。每个虚拟网络都关联一个网络方案。虚拟网络可以通过改变关联的网络方案来升级或降级。如果您要这样做,请确保调整物理网络以匹配网络方案。"
+
+# 8b73057c0c584686894e081c92eea81b
+#: ../../networking.rst:251
+msgid ""
+"CloudStack also has internal network offerings for use by CloudStack system "
+"VMs. These network offerings are not visible to users but can be modified by"
+" administrators."
+msgstr "CloudStack 中有给系统虚机使用的内部网络方案。内部网络方案对最终用户是不可见的,但系统管理员可以对其修改。"
+
+# 4d0b8c9601714fac8c47073432d9e949
+#: ../../networking.rst:256
+msgid "Creating a New Network Offering"
+msgstr "创建一个新的网络方案"
+
+# 0fa5ee2229ff43078785d734c21c6b05
+#: ../../networking.rst:258
+msgid "To create a network offering:"
+msgstr "创建一个新的网络方案"
+
+# 714f4a8335f74b50b2b380ea0835002c
+#: ../../networking.rst:262
+msgid "Log in with admin privileges to the CloudStack UI."
+msgstr "以管理员权限登录CloudStack用户界面。"
+
+# 64031cf3f054467b9761f61d4c992bbc
+#: ../../networking.rst:266
+msgid "In the left navigation bar, click Service Offerings."
+msgstr "在左侧导航栏中,点击 服务方案。"
+
+# 2101d4a328014f82bb6ef04a97fb0ad3
+#: ../../networking.rst:270
+msgid "In Select Offering, choose Network Offering."
+msgstr "在选择方案中,选择网络方案。"
+
+# 8bf2efa20d1c4622a49ae4a0b6dcbf05
+#: ../../networking.rst:274
+msgid "Click Add Network Offering."
+msgstr "点击添加网络方案。"
+
+# e8766f68e8ed4da6b03e3af2140b0d80
+#: ../../networking.rst:278
+msgid "In the dialog, make the following choices:"
+msgstr "在对话框中,选择如下操作:"
+
+# 75d57bbc650d443d8b718a6cff553561
+#: ../../networking.rst:282
+msgid "**Name**. Any desired name for the network offering."
+msgstr "**名称**: 任何网络方案的名称。"
+
+# 7b961fe0b52e4394b4a2a5c534a0281a
+#: ../../networking.rst:286
+msgid ""
+"**Description**. A short description of the offering that can be displayed "
+"to users."
+msgstr "**描述**: 提供一个简短的方案描述。 "
+
+# b36f9adc538b411399e9bb7eedd9ede1
+#: ../../networking.rst:291
+msgid "**Network Rate**. Allowed data transfer rate in MB per second."
+msgstr "**网络速度**: 允许的数据传输速度(MB/秒)。"
+
+# 9d644252577743f494f2701d3f95b837
+#: ../../networking.rst:295
+msgid ""
+"**Guest Type**. Choose whether the guest network is isolated or shared."
+msgstr "**来宾类型**: 选择来宾网络为隔离或共享网络。"
+
+# f952fc596b554510abfff2e7086d1b47
+#: ../../networking.rst:298
+msgid ""
+"For a description of this term, see `“About Virtual Networks” <#about-"
+"virtual-networks>`_."
+msgstr "关于此组的描述,参考 see `“关于虚拟网络” <#about-virtual-networks>`_."
+
+# 4faa7ce7f56d45a0b9b28ab153d54696
+#: ../../networking.rst:303
+msgid ""
+"**Persistent**. Indicate whether the guest network is persistent or not. The"
+" network that you can provision without having to deploy a VM on it is "
+"termed persistent network. For more information, see `“Persistent Networks” "
+"<networking2.html#persistent-networks>`_."
+msgstr "**持续性**: 表明来宾网络是否支持持续性。无需提供任何VM部署的网络,称之为持续性网络。更多信息,参考 `“持久性网络” <networking2.html#persistent-networks>`_."
+
+# e7f9363df01c4b10bca858974859c9f0
+#: ../../networking.rst:311
+msgid ""
+"**Specify VLAN**. (Isolated guest networks only) Indicate whether a VLAN "
+"could be specified when this offering is used. If you select this option and"
+" later use this network offering while creating a VPC tier or an isolated "
+"network, you will be able to specify a VLAN ID for the network you create."
+msgstr "**指定VLAN**.(只针对隔离来宾网络)这表明无论使用这个方案时是否指定了VLAN,如果你选中了这个选项,并且当你创建VPC层或隔离网络时使用了这个网络方案,那么,你都可以为你创建的网络拽定一个VLAN ID。"
+
+# 18a5a261ef97492783748484bdd7253e
+#: ../../networking.rst:319
+msgid ""
+"**VPC**. This option indicate whether the guest network is Virtual Private "
+"Cloud-enabled. A Virtual Private Cloud (VPC) is a private, isolated part of "
+"CloudStack. A VPC can have its own virtual network topology that resembles a"
+" traditional physical network. For more information on VPCs, see `“About "
+"Virtual Private Clouds” <networking2.html#about-virtual-private-clouds>`_."
+msgstr "**VPC**: 此选项表明是否在来宾网络中启用VPC。 CloudStack中的虚拟专用云(VPC)是专用、隔离的。 一个VPC可以有一个类似于传统物理网络的虚拟网络拓扑结构。有关的VPC的详细信息,请参考 see `“关于VPC” <networking2.html#about-virtual-private-clouds>`_."
+
+# 510455b8922645178e4b65ac6ea03074
+#: ../../networking.rst:328
+msgid ""
+"**Supported Services**. Select one or more of the possible network services."
+" For some services, you must also choose the service provider; for example, "
+"if you select Load Balancer, you can choose the CloudStack virtual router or"
+" any other load balancers that have been configured in the cloud. Depending "
+"on which services you choose, additional fields may appear in the rest of "
+"the dialog box."
+msgstr "**支持的服务**.选择一个或多个可能的网络服务。对于有一个服务,你还必须同时选择服务的提供者。比如,如果你选择了负载均衡服务,那你可以CLOUDSTACK虚拟路由或是云环境中其它配置了此功能的服务者。取决于你选择服务的不同,额外的选项或是对话框的填写项也会相应不同。"
+
+# 848c619314564e039dde5bb033f1e105
+#: ../../networking.rst:336
+msgid ""
+"Based on the guest network type selected, you can see the following "
+"supported services:"
+msgstr "基于你选择的来宾网络类型,可以看到如何支持的服务。"
+
+# 067698001bec491d8fc5da16e8cc4977
+#: ../../networking.rst:340
+msgid "Supported Services"
+msgstr "支持的服务"
+
+# 082297be434e4d349883eba64e1823fc
+#: ../../networking.rst:340
+msgid "Description"
+msgstr "描述"
+
+# db17d52f55764b76b8435be1ec2074b0
+#: ../../networking.rst:340
+msgid "Isolated"
+msgstr "隔离"
+
+# 4205e1ffe3b64c5693fdb740cda418af
+#: ../../networking.rst:340
+msgid "Shared"
+msgstr "共享"
+
+# df8baf4211044f108c91f3f6c0e24f20
+# 698d83cab39d406cb37e6185f6294670
+#: ../../networking.rst:342 ../../networking.rst:343
+msgid ""
+"For more information, see `“DNS and DHCP” <networking2.html#dns-and-dhcp>`_."
+msgstr "更多信息,请参考 `“DNS and DHCP” <networking2.html#dns-and-dhcp>`_."
+
+# 805e347c65e64c3487ba61961339baad
+# 23025c3016ac4b1e8a702c33cde28ea7
+# 2da3a8e5b0e2474e934d7132d1e14dd0
+# 7e3249a14ead45599a181314690d0f9c
+# 01605fd514bc4b5cb1b53970d0e3bafa
+# 38fb8a3f30b044b1bc1f17a899253152
+# 302e53129bee49f58cd18d77c82d1d7d
+# 7904ea495a294d47b5f60c1ae82b3cf9
+# e6321736963444f5a2a5a0d63dae4628
+# a6d8711696ae4c65b2ddad646846e398
+# a45176c2843d4f00b795b93389e07d23
+# 17e75d9784d74f69a498b086a3e1f610
+# f86900fd609948eba216b7a53fd99ba8
+# 2a0310279b294d7aa5fccdfdfb283c5f
+# afcb530f4be04708984c4a202cf24904
+# 7895e040465840ef880398bb1062364c
+# 78c72a0d4ef44f929d74c807f28a290a
+#: ../../networking.rst:342 ../../networking.rst:342 ../../networking.rst:343
+#: ../../networking.rst:343 ../../networking.rst:344 ../../networking.rst:344
+#: ../../networking.rst:347 ../../networking.rst:347 ../../networking.rst:348
+#: ../../networking.rst:348 ../../networking.rst:351 ../../networking.rst:351
+#: ../../networking.rst:354 ../../networking.rst:357 ../../networking.rst:359
+#: ../../networking.rst:361 ../../networking.rst:363
+msgid "Supported"
+msgstr "支持"
+
+# 2dec5922a2294cc480f3f05d1bd945c4
+#: ../../networking.rst:344
+msgid "Load Balancer"
+msgstr "负载均衡"
+
+# 388ef4db2cdc42b2ae647f16f589956e
+#: ../../networking.rst:344
+msgid ""
+"If you select Load Balancer, you can choose the CloudStack virtual router or"
+" any other load balancers that have been configured in the cloud."
+msgstr "如果选择了负载均衡功能,你就可以选择CLOUDSTACK虚拟路由或是云环境中其它配置了此服务的提供者。"
+
+# f7c3d40254e14277836751f9ec34a7f4
+#: ../../networking.rst:347
+msgid "For more information, see the Administration Guide."
+msgstr "更多信息,请参考管理指南"
+
+# 3173c380050745e6ad4b7b92d36511db
+#: ../../networking.rst:348
+msgid ""
+"If you select Source NAT, you can choose the CloudStack virtual router or "
+"any other Source NAT providers that have been configured in the cloud."
+msgstr "如果选择了 Source NAT功能,你就可以选择CLOUDSTACK虚拟路由或是云环境中其它配置了此服务的提供者。 "
+
+# 27b525b30dff4fe3916f070201dad176
+#: ../../networking.rst:351
+msgid ""
+"If you select Static NAT, you can choose the CloudStack virtual router or "
+"any other Static NAT providers that have been configured in the cloud."
+msgstr "如果选择了Static NAT功能,你就可以选择CLOUDSTACK虚拟路由或是云环境中其它配置了此服务的提供者。"
+
+# 89f8c6b4aa8847c2887fa86705dd9fc9
+#: ../../networking.rst:354
+msgid ""
+"If you select Port Forwarding, you can choose the CloudStack virtual router "
+"or any other Port Forwarding providers that have been configured in the "
+"cloud."
+msgstr "如果选择了端口转发功能,你就可以选择CLOUDSTACK虚拟路由或是云环境中其它配置了此服务的提供者。"
+
+# 39935b90efc0487db70afc5717e01d83
+# 104dd89e6b6b43eaa5334b8d5b5f5f53
+# 89b082d6787c4b188960b061c7a04a11
+# cb004398c5fd45f09a4c14efda2ba7ce
+# e196626d888c4e44adcc5559c162e76e
+#: ../../networking.rst:354 ../../networking.rst:357 ../../networking.rst:359
+#: ../../networking.rst:361 ../../networking.rst:363
+msgid "Not Supported"
+msgstr "不支持"
+
+# acae22d0beeb4a5586a1cad5230e9a16
+#: ../../networking.rst:357
+msgid ""
+"For more information, see `“Remote Access VPN” <networking2.html#remote-"
+"access-vpn>`_."
+msgstr "更多信息,请参考`“Remote Access VPN” <networking2.html#remote-access-vpn>`_."
+
+# 25d327d1ea194c4f9fad29644ad234cf
+#: ../../networking.rst:359
+msgid "User Data"
+msgstr "用户数据"
+
+# a86728de7e1b4f4aa18f8f727e9ec771
+#: ../../networking.rst:359
+msgid ""
+"For more information, see `“User Data and Meta Data” <api.html#user-data-"
+"and-meta-data>`_."
+msgstr "更多信息,请参考 `“用户数据和元数据” <api.html#user-data-and-meta-data>`_."
+
+# 24ec41e6903441df91985a2b8263e940
+#: ../../networking.rst:361
+msgid "Network ACL"
+msgstr "网络 ACL"
+
+# 3cbcb6d20c0340c289ccf8ee0816ded6
+#: ../../networking.rst:361
+msgid ""
+"For more information, see `“Configuring Network Access Control List” "
+"<networking2.html#configuring-network-access-control-list>`_."
+msgstr "更多信息,参考 `“配置网络ACL” <networking2.html#configuring-network-access-control-list>`_."
+
+# 7cb17996648848c898d5952be68b74cf
+#: ../../networking.rst:363
+msgid "Security Groups"
+msgstr "安全组"
+
+# b2e84782193f4cbbadbe57ee0930d0fa
+#: ../../networking.rst:363
+msgid ""
+"For more information, see `“Adding a Security Group” "
+"<networking2.html#adding-a-security-group>`_."
+msgstr "更多信息,请参考 `“添加一个安全组” <networking2.html#adding-a-security-group>`_."
+
+# e70f833484e94ba689ce3ba1a4b96c13
+#: ../../networking.rst:370
+msgid ""
+"**System Offering**. If the service provider for any of the services "
+"selected in Supported Services is a virtual router, the System Offering "
+"field appears. Choose the system service offering that you want virtual "
+"routers to use in this network. For example, if you selected Load Balancer "
+"in Supported Services and selected a virtual router to provide load "
+"balancing, the System Offering field appears so you can choose between the "
+"CloudStack default system service offering and any custom system service "
+"offerings that have been defined by the CloudStack root administrator."
+msgstr "**系统方案**.如果你在任务服务提供者中选择了虚拟路由,那就会出现系统方案的填写项。选择你希望虚拟路由在此网络中提供的服务。比如,如果你选择了虚拟路由提供负载均衡服务,系统方案填写项就会出现,你可以选择CLOUDSTACK管理员定义的所有系统服务及默认服务。 "
+
+# 43b34d0af71d489ca3e2b5cf1b16c934
+#: ../../networking.rst:380
+msgid ""
+"For more information, see `“System Service Offerings” "
+"<service_offerings.html#system-service-offerings>`_."
+msgstr "更多信息,参考 `“系统服务方案” <service_offerings.html#system-service-offerings>`_."
+
+# 2752b779a38b4d959c80d66f531a23d3
+#: ../../networking.rst:384
+msgid ""
+"**LB Isolation**: Specify what type of load balancer isolation you want for "
+"the network: Shared or Dedicated."
+msgstr "**负载均衡隔离**:指定一种你希望的网络里的负载均衡隔离类型:共享的或单独的。"
+
+# 46399957be6d41b2979acc5bb8a854e2
+#: ../../networking.rst:387
+msgid ""
+"**Dedicated**: If you select dedicated LB isolation, a dedicated load "
+"balancer device is assigned for the network from the pool of dedicated load "
+"balancer devices provisioned in the zone. If no sufficient dedicated load "
+"balancer devices are available in the zone, network creation fails. "
+"Dedicated device is a good choice for the high-traffic networks that make "
+"full use of the device's resources."
+msgstr "**单独的**:如果你选择了单独的负载均衡隔离类型,这个区域内的单独负载均衡设备资源池里就会分出一个设备来供使用。如果没有足够的设备,网络创建就会失败。如果要在高流量环境充分利用设备,单独的负载均衡设备是一个很好的选择。"
+
+# 955c3d93a3eb49dfbf4aa835ab91ddb6
+#: ../../networking.rst:395
+msgid ""
+"**Shared**: If you select shared LB isolation, a shared load balancer device"
+" is assigned for the network from the pool of shared load balancer devices "
+"provisioned in the zone. While provisioning CloudStack picks the shared load"
+" balancer device that is used by the least number of accounts. Once the "
+"device reaches its maximum capacity, the device will not be allocated to a "
+"new account."
+msgstr "**共享的**:如果你选择了共享的负载均衡设备, 这个区域内的共享负载均衡设备资源池里就会分出一个设备来供使用。CloudStack会将共享设备分配给不少于一定量的帐号共用,如果共享设备到达了最大数量,则这个设备不会再分配给新的帐号使用。"
+
+# ef915a99816543cdb9ec79a04b12edb7
+#: ../../networking.rst:405
+msgid "**Mode**: You can select either Inline mode or Side by Side mode:"
+msgstr "**模式**: 你可以选择 Inline mode 或 Side by Side 模式:"
+
+# 55d2e7b518ca4905b53e95f5e33620f0
+#: ../../networking.rst:407
+msgid ""
+"**Inline mode**: Supported only for Juniper SRX firewall and BigF5 load "
+"balancer devices. In inline mode, a firewall device is placed in front of a "
+"load balancing device. The firewall acts as the gateway for all the incoming"
+" traffic, then redirect the load balancing traffic to the load balancer "
+"behind it. The load balancer in this case will not have the direct access to"
+" the public network."
+msgstr "**Inline mode**: 这种模式只被Juniper SRX 和BigF5负载均衡设备支持。在Inline mode模式下,防火墙设备放在负载均衡设置的前端,这个防火墙作为进入流量的网关,所有的流量会被转发到后端的负载均衡设备上。在这种情况下,负载均衡不是直接连接到公网网络的。"
+
+# 39292129cf2a4209ba5f76220fa6f8f3
+#: ../../networking.rst:415
+msgid ""
+"**Side by Side**: In side by side mode, a firewall device is deployed in "
+"parallel with the load balancer device. So the traffic to the load balancer "
+"public IP is not routed through the firewall, and therefore, is exposed to "
+"the public network."
+msgstr "*Side by Side**:在Side by Side模式下,防火墙设备和负载均衡设备是并列的。所以所有的流量都是直接到负载均衡设备而不经过防火墙。因此,负载均衡设备是直接暴露在公网中的。"
+
+# 5b49b6db7f9248748b051cd86bbeb3e6
+#: ../../networking.rst:422
+msgid ""
+"**Associate Public IP**: Select this option if you want to assign a public "
+"IP address to the VMs deployed in the guest network. This option is "
+"available only if"
+msgstr "**关联的公网IP**:如果你想给来宾网络中的虚拟机直接分配公网IP,选择这个选项。这个选择只有在以下情况都满足时才有效:"
+
+# c93e0c1cc09645c8af8abc86082a8cfb
+#: ../../networking.rst:428
+msgid "Guest network is shared."
+msgstr "来宾网络被共享"
+
+# 854f813bb8dd41f6a6c9758906509b86
+#: ../../networking.rst:432
+msgid "StaticNAT is enabled."
+msgstr "启用StaticNAT "
+
+# d14fd96be5f346aa9321354e32489e9b
+#: ../../networking.rst:436
+msgid "Elastic IP is enabled."
+msgstr "启用弹性IP"
+
+# dfaca3652ee64df0a3bac4e699a494fb
+#: ../../networking.rst:438
+msgid ""
+"For information on Elastic IP, see `“About Elastic IP” <networking2.html"
+"#about-elastic-ip>`_."
+msgstr "更多信息,参考`“关于弹性IP” <networking2.html#about-elastic-ip>`_."
+
+# d5a841361fe14001a46d6a5310aca5bf
+#: ../../networking.rst:442
+msgid ""
+"**Redundant router capability**: Available only when Virtual Router is "
+"selected as the Source NAT provider. Select this option if you want to use "
+"two virtual routers in the network for uninterrupted connection: one "
+"operating as the master virtual router and the other as the backup. The "
+"master virtual router receives requests from and sends responses to the "
+"user’s VM. The backup virtual router is activated only when the master is "
+"down. After the failover, the backup becomes the master virtual router. "
+"CloudStack deploys the routers on different hosts to ensure reliability if "
+"one host is down."
+msgstr "**冗余路由性能**:这个选项只有在虚拟路由作为Source NAT提供者时才是可选的。如果你希望提供不间断的网络连接,选中这个选项,则系统会提供两个虚拟路由:一个主的,一个辅的。主虚拟路由负载收发用户虚拟机器的相关请深圳市。如主的路由DOWN掉时,由辅助路由升级为主路由接替工作。CloudStack 会将两个邪气路由分别部署在不同的主机上,以保证可用性。"
+
+# 580303d29adc4bbc97763c93dba3acc0
+#: ../../networking.rst:455
+msgid ""
+"**Conserve mode**: Indicate whether to use conserve 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 "
+"StaticNAT or load balancing. When the conserve mode is on, you can define "
+"more than one service on the same public IP."
+msgstr "**Conserve mode**: 这个选项表明是滞要使用Conserve模式。在这种模式下,网络资源只会分配给网络里第一个启动的虚拟机。当Conserve模式被关闭时,公网IP只能用于一个设备。比如,一个用于端口转发规则的公网IP不会被用于其它StaticNAT或是负载均衡服务。当Conserve模式启用时,你可以在同一个公网IP上定义多个服务。"
+
+# c521afbaf7ff46ac97fd58fbc5b6b357
+#: ../../networking.rst:465
+msgid ""
+"If StaticNAT is enabled, irrespective of the status of the conserve mode, no"
+" port forwarding or load balancing rule can be created for the IP. However, "
+"you can add the firewall rules by using the createFirewallRule command."
+msgstr "如果StaticNAT启用后,不考虑conseve模式的状态,则此IP不会创建端口转发或是负载均衡规则。然而,你可以通过 createFirewallRule命令添加防火墙规则。"
+
+# 398b07e9909440cb9af01eda7c190c87
+#: ../../networking.rst:469
+msgid "**Tags**: Network tag to specify which physical network to use."
+msgstr "**标签**:网络标签用于指定所要使用的物理网络。 "
+
+# 228ba6bcfa4e47429f666a1da30b31a6
+#: ../../networking.rst:473
+msgid ""
+"**Default egress policy**: Configure the default policy for firewall egress "
+"rules. Options are Allow and Deny. Default is Allow if no egress policy is "
+"specified, which indicates that all the egress traffic is accepted when a "
+"guest network is created from this offering."
+msgstr "**默认外出策略**: 为防火墙配置默认的外出流量规则。选项有阻止和允许。如果没有特别制定策略的话,所有外出流量都是允许的。这表明,从这个方案创建的客户网络是允许所有外出流量的。"
+
+# 10673613d31446f89ee73ede461ae140
+#: ../../networking.rst:479
+msgid ""
+"To block the egress traffic for a guest network, select Deny. In this case, "
+"when you configure an egress rules for an isolated guest network, rules are "
+"added to allow the specified traffic."
+msgstr "为了阻止客户网络的外出流量,选择阻止选项。在这种情况下,当你从一个隔离的客户网络配置一个外出规则时,添加一些特殊的规则以允许外出流量。"
+
+# 0878f452756346e9b614df490e386e84
+#: ../../networking.rst:485
+msgid "Click Add."
+msgstr "点击 添加"


[33/40] git commit: CLOUDSTACK-5879: Updated rabbitmq eventbus path

Posted by ra...@apache.org.
CLOUDSTACK-5879: Updated rabbitmq eventbus path

Signed-off-by: Pierre-Luc Dion <pd...@apache.org>


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

Branch: refs/heads/4.4
Commit: e0bbecbec09357577ae3395f65d28e8148405138
Parents: 1732dae
Author: Erik Weber <te...@gmail.com>
Authored: Tue Aug 19 19:57:13 2014 +0200
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Aug 19 20:20:48 2014 -0400

----------------------------------------------------------------------
 source/events.rst | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e0bbecbe/source/events.rst
----------------------------------------------------------------------
diff --git a/source/events.rst b/source/events.rst
index cbba93b..d500a5c 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -95,7 +95,9 @@ As a CloudStack administrator, perform the following one-time
 configuration to enable event notification framework. At run time no
 changes can control the behaviour.
 
-#. Open ``'componentContext.xml``.
+#. Create the folder ``/etc/cloudstack/management/META-INF/cloudstack/core``
+
+#. Inside that folder, open ``spring-event-bus-context.xml``.
 
 #. Define a bean named ``eventNotificationBus`` as follows:
 
@@ -118,14 +120,24 @@ changes can control the behaviour.
 
       .. code:: bash
 
-         <bean id="eventNotificationBus" class="org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus">
-           <property name="name" value="eventNotificationBus"/>
-           <property name="server" value="127.0.0.1"/>
-           <property name="port" value="5672"/>
-           <property name="username" value="guest"/>
-           <property name="password" value="guest"/>
-           <property name="exchange" value="cloudstack-events"/>
-         </bean>
+         <beans xmlns="http://www.springframework.org/schema/beans"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:context="http://www.springframework.org/schema/context"
+         xmlns:aop="http://www.springframework.org/schema/aop"
+         xsi:schemaLocation="http://www.springframework.org/schema/beans
+         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+         http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+         http://www.springframework.org/schema/context
+         http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+            <bean id="eventNotificationBus" class="org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus">
+               <property name="name" value="eventNotificationBus"/>
+               <property name="server" value="127.0.0.1"/>
+               <property name="port" value="5672"/>
+               <property name="username" value="guest"/>
+               <property name="password" value="guest"/>
+               <property name="exchange" value="cloudstack-events"/>
+            </bean>
+         </beans>
 
       The ``eventNotificationBus`` bean represents the
       ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.


[08/40] git commit: split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

Posted by ra...@apache.org.
split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/72a3a7c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/72a3a7c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/72a3a7c1

Branch: refs/heads/4.4
Commit: 72a3a7c109c7ef198dc1fe99d91a4dd2ff6791a7
Parents: 5a4a44d
Author: Will Stevens <ws...@cloudops.com>
Authored: Fri May 16 17:35:52 2014 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Sat May 17 09:35:01 2014 +0200

----------------------------------------------------------------------
 source/index.rst                                |    2 +-
 source/networking/acquiring_an_ip_address.rst   |   42 +
 source/networking/advanced_zone_config.rst      |  152 +
 source/networking/basic_zone_config.rst         |   24 +
 source/networking/dns_and_dhcp.rst              |   22 +
 source/networking/elastic_ips.rst               |  104 +
 .../external_firewalls_and_load_balancers.rst   |  661 ++
 .../networking/global_server_load_balancing.rst |  453 ++
 source/networking/guest_ip_ranges.rst           |   29 +
 source/networking/guest_traffic.rst             |   50 +
 source/networking/inter_vlan_routing.rst        |   96 +
 .../ip_forwarding_and_firewalling.rst           |  280 +
 source/networking/ip_load_balancing.rst         |   31 +
 .../ip_reservation_in_guest_networks.rst        |  125 +
 .../isolation_in_advanced_zone_with_vlan.rst    |  202 +
 source/networking/multiple_guest_networks.rst   |  207 +
 source/networking/multiple_ip_ranges.rst        |   43 +
 .../networking/multiple_ips_on_single_nic.rst   |   98 +
 .../multiple_subnets_in_shared_network.rst      |   99 +
 source/networking/networking_in_pod.rst         |   45 +
 source/networking/networking_in_zone.rst        |   34 +
 source/networking/palo_alto_config.rst          |  475 ++
 source/networking/persistent_networks.rst       |   94 +
 source/networking/portable_ips.rst              |  131 +
 .../public_ips_and_vlans_for_accounts.rst       |  154 +
 source/networking/releasing_an_ip_address.rst   |   38 +
 source/networking/remote_access_vpn.rst         |  696 ++
 source/networking/security_groups.rst           |  214 +
 source/networking/static_nat.rst                |   56 +
 .../networking/virtual_private_cloud_config.rst | 1438 ++++
 source/networking2.rst                          | 7033 ------------------
 source/networking_and_traffic.rst               |   82 +
 source/palo_alto_config.rst                     |  282 -
 source/systemvm.rst                             |    8 +-
 34 files changed, 6180 insertions(+), 7320 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/index.rst
----------------------------------------------------------------------
diff --git a/source/index.rst b/source/index.rst
index ddfa3bb..cc25dd4 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -114,7 +114,7 @@ Managing Networks and Traffic
 .. toctree::
    :maxdepth: 2
 
-   networking2
+   networking_and_traffic
 
 Managing the Cloud
 ------------------

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/acquiring_an_ip_address.rst
----------------------------------------------------------------------
diff --git a/source/networking/acquiring_an_ip_address.rst b/source/networking/acquiring_an_ip_address.rst
new file mode 100644
index 0000000..b6556db
--- /dev/null
+++ b/source/networking/acquiring_an_ip_address.rst
@@ -0,0 +1,42 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Acquiring a New IP Address
+--------------------------
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click Acquire New IP.
+
+   The Acquire New IP window is displayed.
+
+#. Specify whether you want cross-zone IP or not.
+
+   If you want Portable IP click Yes in the confirmation dialog. If you
+   want a normal Public IP click No.
+
+   For more information on Portable IP, see `"Portable
+   IPs" <#portable-ips>`_.
+
+   Within a few moments, the new IP address should appear with the state
+   Allocated. You can now use the IP address in port forwarding or
+   static NAT rules.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/advanced_zone_config.rst
----------------------------------------------------------------------
diff --git a/source/networking/advanced_zone_config.rst b/source/networking/advanced_zone_config.rst
new file mode 100644
index 0000000..63027b3
--- /dev/null
+++ b/source/networking/advanced_zone_config.rst
@@ -0,0 +1,152 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+
+Advanced Zone Physical Network Configuration
+--------------------------------------------
+
+Within a zone that uses advanced networking, you need to tell the
+Management Server how the physical network is set up to carry different
+kinds of traffic in isolation.
+
+
+Configure Guest Traffic in an Advanced Zone
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These steps assume you have already logged in to the CloudStack UI. To
+configure the base guest network:
+
+#. In the left navigation, choose Infrastructure. On Zones, click View
+   More, then click the zone to which you want to add a network.
+
+#. Click the Network tab.
+
+#. Click Add guest network.
+
+   The Add guest network window is displayed:
+
+   |addguestnetwork.png|
+
+#. Provide the following information:
+
+   -  **Name**: The name of the network. This will be user-visible
+ 
+   -  **Display Text**: The description of the network. This will be
+      user-visible
+ 
+   -  **Zone**: The zone in which you are configuring the guest network.
+ 
+   -  **Network offering**: If the administrator has configured multiple
+      network offerings, select the one you want to use for this network
+ 
+   -  **Guest Gateway**: The gateway that the guests should use
+ 
+   -  **Guest Netmask**: The netmask in use on the subnet the guests
+      will use
+
+#. Click OK.
+
+
+Configure Public Traffic in an Advanced Zone
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In a zone that uses advanced networking, you need to configure at least
+one range of IP addresses for Internet traffic.
+
+
+Configuring a Shared Guest Network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as administrator.
+
+#. In the left navigation, choose Infrastructure.
+
+#. On Zones, click View More.
+
+#. Click the zone to which you want to add a guest network.
+
+#. Click the Physical Network tab.
+
+#. Click the physical network you want to work with.
+
+#. On the Guest node of the diagram, click Configure.
+
+#. Click the Network tab.
+
+#. Click Add guest network.
+
+   The Add guest network window is displayed.
+
+#. Specify the following:
+
+   -  **Name**: The name of the network. This will be visible to the user.
+
+   -  **Description**: The short description of the network that can be
+      displayed to users.
+
+   -  **VLAN ID**: The unique ID of the VLAN.
+
+   -  **Isolated VLAN ID**: The unique ID of the Secondary Isolated
+      VLAN.
+
+   -  **Scope**: The available scopes are Domain, Account, Project, and
+      All.
+
+      -  **Domain**: Selecting Domain limits the scope of this guest
+         network to the domain you specify. The network will not be
+         available for other domains. If you select Subdomain Access,
+         the guest network is available to all the sub domains within
+         the selected domain.
+
+      -  **Account**: The account for which the guest network is being
+         created for. You must specify the domain the account belongs
+         to.
+
+      -  **Project**: The project for which the guest network is being
+         created for. You must specify the domain the project belongs
+         to.
+
+      -  **All**: The guest network is available for all the domains,
+         account, projects within the selected zone.
+
+   -  **Network Offering**: If the administrator has configured multiple
+      network offerings, select the one you want to use for this
+      network.
+
+   -  **Gateway**: The gateway that the guests should use.
+
+   -  **Netmask**: The netmask in use on the subnet the guests will use.
+
+   -  **IP Range**: A range of IP addresses that are accessible from the
+      Internet and are assigned to the guest VMs.
+
+      If one NIC is used, these IPs should be in the same CIDR in the
+      case of IPv6.
+
+   -  **IPv6 CIDR**: The network prefix that defines the guest network
+      subnet. This is the CIDR that describes the IPv6 addresses in use
+      in the guest networks in this zone. To allot IP addresses from
+      within a particular address block, enter a CIDR.
+
+   -  **Network Domain**: A custom DNS suffix at the level of a network.
+      If you want to assign a special domain name to the guest VM
+      network, specify a DNS suffix.
+
+#. Click OK to confirm.
+
+
+.. |addguestnetwork.png| image:: /_static/images/add-guest-network.png
+   :alt: Add Guest network setup in a single zone.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/basic_zone_config.rst
----------------------------------------------------------------------
diff --git a/source/networking/basic_zone_config.rst b/source/networking/basic_zone_config.rst
new file mode 100644
index 0000000..a1ba26c
--- /dev/null
+++ b/source/networking/basic_zone_config.rst
@@ -0,0 +1,24 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+
+Basic Zone Physical Network Configuration
+-----------------------------------------
+
+In a basic network, configuring the physical network is fairly
+straightforward. You only need to configure one guest network to carry
+traffic that is generated by guest VMs. When you first add a zone to
+CloudStack, you set up the guest network through the Add Zone screens.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/dns_and_dhcp.rst
----------------------------------------------------------------------
diff --git a/source/networking/dns_and_dhcp.rst b/source/networking/dns_and_dhcp.rst
new file mode 100644
index 0000000..c84cffa
--- /dev/null
+++ b/source/networking/dns_and_dhcp.rst
@@ -0,0 +1,22 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+DNS and DHCP
+------------
+
+The Virtual Router provides DNS and DHCP services to the guests. It
+proxies DNS requests to the DNS server configured on the Availability
+Zone.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/elastic_ips.rst
----------------------------------------------------------------------
diff --git a/source/networking/elastic_ips.rst b/source/networking/elastic_ips.rst
new file mode 100644
index 0000000..fe83a3b
--- /dev/null
+++ b/source/networking/elastic_ips.rst
@@ -0,0 +1,104 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+About Elastic IPs
+-----------------
+
+Elastic IP (EIP) addresses are the IP addresses that are associated with
+an account, and act as static IP addresses. The account owner has the
+complete control over the Elastic IP addresses that belong to the
+account. As an account owner, you can allocate an Elastic IP to a VM of
+your choice from the EIP pool of your account. Later if required you can
+reassign the IP address to a different VM. This feature is extremely
+helpful during VM failure. Instead of replacing the VM which is down,
+the IP address can be reassigned to a new VM in your account.
+
+Similar to the public IP address, Elastic IP addresses are mapped to
+their associated private IP addresses by using StaticNAT. The EIP
+service is equipped with StaticNAT (1:1) service in an EIP-enabled basic
+zone. The default network offering,
+DefaultSharedNetscalerEIPandELBNetworkOffering, provides your network
+with EIP and ELB network services if a NetScaler device is deployed in
+your zone. Consider the following illustration for more details.
+
+|eip-ns-basiczone.png|
+
+In the illustration, a NetScaler appliance is the default entry or exit
+point for the CloudStack instances, and firewall is the default entry or
+exit point for the rest of the data center. Netscaler provides LB
+services and staticNAT service to the guest networks. The guest traffic
+in the pods and the Management Server are on different subnets / VLANs.
+The policy-based routing in the data center core switch sends the public
+traffic through the NetScaler, whereas the rest of the data center goes
+through the firewall.
+
+The EIP work flow is as follows:
+
+-  When a user VM is deployed, a public IP is automatically acquired
+   from the pool of public IPs configured in the zone. This IP is owned
+   by the VM's account.
+
+-  Each VM will have its own private IP. When the user VM starts, Static
+   NAT is provisioned on the NetScaler device by using the Inbound
+   Network Address Translation (INAT) and Reverse NAT (RNAT) rules
+   between the public IP and the private IP.
+
+   .. note:: 
+      Inbound NAT (INAT) is a type of NAT supported by NetScaler, in which
+      the destination IP address is replaced in the packets from the public
+      network, such as the Internet, with the private IP address of a VM in
+      the private network. Reverse NAT (RNAT) is a type of NAT supported by
+      NetScaler, in which the source IP address is replaced in the packets
+      generated by a VM in the private network with the public IP address.
+
+-  This default public IP will be released in two cases:
+
+   -  When the VM is stopped. When the VM starts, it again receives a
+      new public IP, not necessarily the same one allocated initially,
+      from the pool of Public IPs.
+
+   -  The user acquires a public IP (Elastic IP). This public IP is
+      associated with the account, but will not be mapped to any private
+      IP. However, the user can enable Static NAT to associate this IP
+      to the private IP of a VM in the account. The Static NAT rule for
+      the public IP can be disabled at any time. When Static NAT is
+      disabled, a new public IP is allocated from the pool, which is not
+      necessarily be the same one allocated initially.
+
+For the deployments where public IPs are limited resources, you have the
+flexibility to choose not to allocate a public IP by default. You can
+use the Associate Public IP option to turn on or off the automatic
+public IP assignment in the EIP-enabled Basic zones. If you turn off the
+automatic public IP assignment while creating a network offering, only a
+private IP is assigned to a VM when the VM is deployed with that network
+offering. Later, the user can acquire an IP for the VM and enable static
+NAT.
+
+For more information on the Associate Public IP option, see
+`"Creating a New Network Offering" <networking.html#creating-a-new-network-offering>`_.
+
+.. note:: 
+   The Associate Public IP feature is designed only for use with user VMs.
+   The System VMs continue to get both public IP and private by default,
+   irrespective of the network offering configuration.
+
+New deployments which use the default shared network offering with EIP
+and ELB services to create a shared network in the Basic zone will
+continue allocating public IPs to each user VM.
+
+
+.. |eip-ns-basiczone.png| image:: /_static/images/eip-ns-basiczone.png
+   :alt: Elastic IP in a NetScaler-enabled Basic Zone.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/external_firewalls_and_load_balancers.rst
----------------------------------------------------------------------
diff --git a/source/networking/external_firewalls_and_load_balancers.rst b/source/networking/external_firewalls_and_load_balancers.rst
new file mode 100644
index 0000000..1652b77
--- /dev/null
+++ b/source/networking/external_firewalls_and_load_balancers.rst
@@ -0,0 +1,661 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+External Firewalls and Load Balancers
+-------------------------------------
+
+CloudStack is capable of replacing its Virtual Router with an external
+Juniper SRX device and an optional external NetScaler or F5 load
+balancer for gateway and load balancing services. In this case, the VMs
+use the SRX as their gateway.
+
+
+About Using a NetScaler Load Balancer
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Citrix NetScaler is supported as an external network element for load
+balancing in zones that use isolated networking in advanced zones. Set
+up an external load balancer when you want to provide load balancing
+through means other than CloudStack's provided virtual router.
+
+.. note:: 
+   In a Basic zone, load balancing service is supported only if 
+   Elastic IP or Elastic LB services are enabled.
+
+When NetScaler load balancer is used to provide EIP or ELB services in a
+Basic zone, ensure that all guest VM traffic must enter and exit through
+the NetScaler device. When inbound traffic goes through the NetScaler
+device, traffic is routed by using the NAT protocol depending on the
+EIP/ELB configured on the public IP to the private IP. The traffic that
+is originated from the guest VMs usually goes through the layer 3
+router. To ensure that outbound traffic goes through NetScaler device
+providing EIP/ELB, layer 3 router must have a policy-based routing. A
+policy-based route must be set up so that all traffic originated from
+the guest VM's are directed to NetScaler device. This is required to
+ensure that the outbound traffic from the guest VM's is routed to a
+public IP by using NAT.For more information on Elastic IP, see
+`"About Elastic IP" <#about-elastic-ip>`_.
+
+The NetScaler can be set up in direct (outside the firewall) mode. It
+must be added before any load balancing rules are deployed on guest VMs
+in the zone.
+
+The functional behavior of the NetScaler with CloudStack is the same as
+described in the CloudStack documentation for using an F5 external load
+balancer. The only exception is that the F5 supports routing domains,
+and NetScaler does not. NetScaler can not yet be used as a firewall.
+
+To install and enable an external load balancer for CloudStack
+management, see External Guest Load Balancer Integration in the
+Installation Guide.
+
+The Citrix NetScaler comes in three varieties. The following
+summarizes how these variants are treated in CloudStack.
+
+**MPX**
+
+-  Physical appliance. Capable of deep packet inspection. Can act as
+   application firewall and load balancer
+
+-  In advanced zones, load balancer functionality fully supported without
+   limitation. In basic zones, static NAT, elastic IP (EIP), and elastic
+   load balancing (ELB) are also provided.
+
+**VPX**
+
+-  Virtual appliance. Can run as VM on XenServer, ESXi, and Hyper-V
+   hypervisors. Same functionality as MPX
+
+-  Supported on ESXi and XenServer. Same functional support as for MPX.
+   CloudStack will treat VPX and MPX as the same device type.
+
+**SDX**
+
+-  Physical appliance. Can create multiple fully isolated VPX instances on
+   a single appliance to support multi-tenant usage
+
+-  CloudStack will dynamically provision, configure, and manage the life
+   cycle of VPX instances on the SDX. Provisioned instances are added into
+   CloudStack automatically - no manual configuration by the administrator
+   is required. Once a VPX instance is added into CloudStack, it is treated
+   the same as a VPX on an ESXi host.
+
+
+Configuring SNMP Community String on a RHEL Server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The SNMP Community string is similar to a user id or password that
+provides access to a network device, such as router. This string is sent
+along with all SNMP requests. If the community string is correct, the
+device responds with the requested information. If the community string
+is incorrect, the device discards the request and does not respond.
+
+The NetScaler device uses SNMP to communicate with the VMs. You must
+install SNMP and configure SNMP Community string for a secure
+communication between the NetScaler device and the RHEL machine.
+
+#. Ensure that you installed SNMP on RedHat. If not, run the following
+   command:
+
+   .. code:: bash
+
+      yum install net-snmp-utils
+
+#. Edit the /etc/snmp/snmpd.conf file to allow the SNMP polling from the
+   NetScaler device.
+
+   #. Map the community name into a security name (local and mynetwork,
+      depending on where the request is coming from):
+
+      .. note::
+         Use a strong password instead of public when you edit the
+         following table.
+
+      .. code:: bash
+
+         #         sec.name   source        community
+         com2sec   local      localhost     public
+         com2sec   mynetwork  0.0.0.0       public
+
+      .. note:: Setting to 0.0.0.0 allows all IPs to poll the NetScaler server.
+
+   #. Map the security names into group names:
+
+      .. code:: bash
+
+         #       group.name    sec.model  sec.name
+         group   MyRWGroup     v1         local
+         group   MyRWGroup     v2c        local
+         group   MyROGroup     v1         mynetwork
+         group   MyROGroup     v2c        mynetwork
+
+   #. Create a view to allow the groups to have the permission to:
+
+      .. code:: bash
+
+         incl/excl subtree mask view all included .1
+
+   #. Grant access with different write permissions to the two groups to
+      the view you created.
+
+      .. code:: bash
+
+         # context     sec.model     sec.level      prefix     read     write    notif
+           access      MyROGroup ""  any noauth     exact      all      none     none
+           access      MyRWGroup ""  any noauth     exact      all      all      all
+
+#. Unblock SNMP in iptables.
+
+   .. code:: bash
+
+      iptables -A INPUT -p udp --dport 161 -j ACCEPT
+
+#. Start the SNMP service:
+
+   .. code:: bash
+
+      service snmpd start
+
+#. Ensure that the SNMP service is started automatically during the
+   system startup:
+
+   .. code:: bash
+   
+      chkconfig snmpd on
+
+
+Initial Setup of External Firewalls and Load Balancers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When the first VM is created for a new account, CloudStack programs the
+external firewall and load balancer to work with the VM. The following
+objects are created on the firewall:
+
+-  A new logical interface to connect to the account's private VLAN. The
+   interface IP is always the first IP of the account's private subnet
+   (e.g. 10.1.1.1).
+
+-  A source NAT rule that forwards all outgoing traffic from the
+   account's private VLAN to the public Internet, using the account's
+   public IP address as the source address
+
+-  A firewall filter counter that measures the number of bytes of
+   outgoing traffic for the account
+
+The following objects are created on the load balancer:
+
+-  A new VLAN that matches the account's provisioned Zone VLAN
+
+-  A self IP for the VLAN. This is always the second IP of the account's
+   private subnet (e.g. 10.1.1.2).
+
+
+Ongoing Configuration of External Firewalls and Load Balancers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Additional user actions (e.g. setting a port forward) will cause further
+programming of the firewall and load balancer. A user may request
+additional public IP addresses and forward traffic received at these IPs
+to specific VMs. This is accomplished by enabling static NAT for a
+public IP address, assigning the IP to a VM, and specifying a set of
+protocols and port ranges to open. When a static NAT rule is created,
+CloudStack programs the zone's external firewall with the following
+objects:
+
+-  A static NAT rule that maps the public IP address to the private IP
+   address of a VM.
+
+-  A security policy that allows traffic within the set of protocols and
+   port ranges that are specified.
+
+-  A firewall filter counter that measures the number of bytes of
+   incoming traffic to the public IP.
+
+The number of incoming and outgoing bytes through source NAT, static
+NAT, and load balancing rules is measured and saved on each external
+element. This data is collected on a regular basis and stored in the
+CloudStack database.
+
+
+Load Balancer Rules
+~~~~~~~~~~~~~~~~~~~
+
+A CloudStack user or administrator may create load balancing rules that
+balance traffic received at a public IP to one or more VMs. A user
+creates a rule, specifies an algorithm, and assigns the rule to a set of
+VMs.
+
+.. note:: 
+   If you create load balancing rules while using a network service
+   offering that includes an external load balancer device such as
+   NetScaler, and later change the network service offering to one that
+   uses the CloudStack virtual router, you must create a firewall rule on
+   the virtual router for each of your existing load balancing rules so
+   that they continue to function.
+
+
+.. _adding-lb-rule:
+
+Adding a Load Balancer Rule
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to load balance the
+   traffic.
+
+#. Click View IP Addresses.
+
+#. Click the IP address for which you want to create the rule, then
+   click the Configuration tab.
+
+#. In the Load Balancing node of the diagram, click View All.
+
+   In a Basic zone, you can also create a load balancing rule without
+   acquiring or selecting an IP address. CloudStack internally assign an
+   IP when you create the load balancing rule, which is listed in the IP
+   Addresses page when the rule is created.
+
+   To do that, select the name of the network, then click Add Load
+   Balancer tab. Continue with #7.
+
+#. Fill in the following:
+
+   -  **Name**: A name for the load balancer rule.
+
+   -  **Public Port**: The port receiving incoming traffic to be
+      balanced.
+
+   -  **Private Port**: The port that the VMs will use to receive the
+      traffic.
+
+   -  **Algorithm**: Choose the load balancing algorithm you want
+      CloudStack to use. CloudStack supports a variety of well-known
+      algorithms. If you are not familiar with these choices, you will
+      find plenty of information about them on the Internet.
+
+   -  **Stickiness**: (Optional) Click Configure and choose the
+      algorithm for the stickiness policy. See Sticky Session Policies
+      for Load Balancer Rules.
+
+   -  **AutoScale**: Click Configure and complete the AutoScale
+      configuration as explained in :ref:`conf-autoscale`.
+
+   -  **Health Check**: (Optional; NetScaler load balancers only) Click
+      Configure and fill in the characteristics of the health check
+      policy. See :ref:`health-check`.
+
+      -  **Ping path (Optional)**: Sequence of destinations to which to
+         send health check queries. Default: / (all).
+
+      -  **Response time (Optional)**: How long to wait for a response
+         from the health check (2 - 60 seconds). Default: 5 seconds.
+
+      -  **Interval time (Optional)**: Amount of time between health
+         checks (1 second - 5 minutes). Default value is set in the
+         global configuration parameter lbrule\_health
+         check\_time\_interval.
+
+      -  **Healthy threshold (Optional)**: Number of consecutive health
+         check successes that are required before declaring an instance
+         healthy. Default: 2.
+
+      -  **Unhealthy threshold (Optional)**: Number of consecutive
+         health check failures that are required before declaring an
+         instance unhealthy. Default: 10.
+
+#. Click Add VMs, then select two or more VMs that will divide the load
+   of incoming traffic, and click Apply.
+
+   The new load balancer rule appears in the list. You can repeat these
+   steps to add more load balancer rules for this IP address.
+
+
+Sticky Session Policies for Load Balancer Rules
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Sticky sessions are used in Web-based applications to ensure continued
+availability of information across the multiple requests in a user's
+session. For example, if a shopper is filling a cart, you need to
+remember what has been purchased so far. The concept of "stickiness" is
+also referred to as persistence or maintaining state.
+
+Any load balancer rule defined in CloudStack can have a stickiness
+policy. The policy consists of a name, stickiness method, and
+parameters. The parameters are name-value pairs or flags, which are
+defined by the load balancer vendor. The stickiness method could be load
+balancer-generated cookie, application-generated cookie, or
+source-based. In the source-based method, the source IP address is used
+to identify the user and locate the user's stored data. In the other
+methods, cookies are used. The cookie generated by the load balancer or
+application is included in request and response URLs to create
+persistence. The cookie name can be specified by the administrator or
+automatically generated. A variety of options are provided to control
+the exact behavior of cookies, such as how they are generated and
+whether they are cached.
+
+For the most up to date list of available stickiness methods, see the
+CloudStack UI or call listNetworks and check the
+SupportedStickinessMethods capability.
+
+
+.. _health-check:
+
+Health Checks for Load Balancer Rules
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+(NetScaler load balancer only; requires NetScaler version 10.0)
+
+Health checks are used in load-balanced applications to ensure that
+requests are forwarded only to running, available services. When
+creating a load balancer rule, you can specify a health check policy.
+This is in addition to specifying the stickiness policy, algorithm, and
+other load balancer rule options. You can configure one health check
+policy per load balancer rule.
+
+Any load balancer rule defined on a NetScaler load balancer in
+CloudStack can have a health check policy. The policy consists of a ping
+path, thresholds to define "healthy" and "unhealthy" states, health
+check frequency, and timeout wait interval.
+
+When a health check policy is in effect, the load balancer will stop
+forwarding requests to any resources that are found to be unhealthy. If
+the resource later becomes available again, the periodic health check
+will discover it, and the resource will once again be added to the pool
+of resources that can receive requests from the load balancer. At any
+given time, the most recent result of the health check is displayed in
+the UI. For any VM that is attached to a load balancer rule with a
+health check configured, the state will be shown as UP or DOWN in the UI
+depending on the result of the most recent health check.
+
+You can delete or modify existing health check policies.
+
+To configure how often the health check is performed by default, use the
+global configuration setting healthcheck.update.interval (default value
+is 600 seconds). You can override this value for an individual health
+check policy.
+
+For details on how to set a health check policy using the UI, see
+:ref:`adding-lb-rule`.
+
+
+.. _conf-autoscale:
+
+Configuring AutoScale
+~~~~~~~~~~~~~~~~~~~~~
+
+AutoScaling allows you to scale your back-end services or application
+VMs up or down seamlessly and automatically according to the conditions
+you define. With AutoScaling enabled, you can ensure that the number of
+VMs you are using seamlessly scale up when demand increases, and
+automatically decreases when demand subsides. Thus it helps you save
+compute costs by terminating underused VMs automatically and launching
+new VMs when you need them, without the need for manual intervention.
+
+NetScaler AutoScaling is designed to seamlessly launch or terminate VMs
+based on user-defined conditions. Conditions for triggering a scaleup or
+scaledown action can vary from a simple use case like monitoring the CPU
+usage of a server to a complex use case of monitoring a combination of
+server's responsiveness and its CPU usage. For example, you can
+configure AutoScaling to launch an additional VM whenever CPU usage
+exceeds 80 percent for 15 minutes, or to remove a VM whenever CPU usage
+is less than 20 percent for 30 minutes.
+
+CloudStack uses the NetScaler load balancer to monitor all aspects of a
+system's health and work in unison with CloudStack to initiate scale-up
+or scale-down actions.
+
+.. note:: 
+   AutoScale is supported on NetScaler Release 10 Build 74.4006.e and beyond.
+
+
+Prerequisites
+^^^^^^^^^^^^^
+
+Before you configure an AutoScale rule, consider the following:
+
+-  Ensure that the necessary template is prepared before configuring
+   AutoScale. When a VM is deployed by using a template and when it
+   comes up, the application should be up and running.
+
+   .. note:: 
+      If the application is not running, the NetScaler device considers the 
+      VM as ineffective and continues provisioning the VMs unconditionally
+      until the resource limit is exhausted.
+
+-  Deploy the templates you prepared. Ensure that the applications come
+   up on the first boot and is ready to take the traffic. Observe the
+   time requires to deploy the template. Consider this time when you
+   specify the quiet time while configuring AutoScale.
+
+-  The AutoScale feature supports the SNMP counters that can be used to
+   define conditions for taking scale up or scale down actions. To
+   monitor the SNMP-based counter, ensure that the SNMP agent is
+   installed in the template used for creating the AutoScale VMs, and
+   the SNMP operations work with the configured SNMP community and port
+   by using standard SNMP managers. For example, see 
+   `"Configuring SNMP Community String on a RHELServer" 
+   <#configuring-snmp-community-string-on-a-rhel-server>`_ 
+   to configure SNMP on a RHEL machine.
+
+-  Ensure that the endpointe.url parameter present in the Global
+   Settings is set to the Management Server API URL. For example,
+   ``http://10.102.102.22:8080/client/api``. In a multi-node Management
+   Server deployment, use the virtual IP address configured in the load
+   balancer for the management server's cluster. Additionally, ensure
+   that the NetScaler device has access to this IP address to provide
+   AutoScale support.
+
+   If you update the endpointe.url, disable the AutoScale functionality
+   of the load balancer rules in the system, then enable them back to
+   reflect the changes. For more information see :ref:`update-autoscale`.
+
+-  If the API Key and Secret Key are regenerated for an AutoScale user,
+   ensure that the AutoScale functionality of the load balancers that
+   the user participates in are disabled and then enabled to reflect the
+   configuration changes in the NetScaler.
+
+-  In an advanced Zone, ensure that at least one VM should be present
+   before configuring a load balancer rule with AutoScale. Having one VM
+   in the network ensures that the network is in implemented state for
+   configuring AutoScale.
+
+
+Configuration
+^^^^^^^^^^^^^
+
+Specify the following:
+
+|autoscaleateconfig.png|
+
+-  **Template**: A template consists of a base OS image and application.
+   A template is used to provision the new instance of an application on
+   a scaleup action. When a VM is deployed from a template, the VM can
+   start taking the traffic from the load balancer without any admin
+   intervention. For example, if the VM is deployed for a Web service,
+   it should have the Web server running, the database connected, and so
+   on.
+
+-  **Compute offering**: A predefined set of virtual hardware
+   attributes, including CPU speed, number of CPUs, and RAM size, that
+   the user can select when creating a new virtual machine instance.
+   Choose one of the compute offerings to be used while provisioning a
+   VM instance as part of scaleup action.
+
+-  **Min Instance**: The minimum number of active VM instances that is
+   assigned to a load balancing rule. The active VM instances are the
+   application instances that are up and serving the traffic, and are
+   being load balanced. This parameter ensures that a load balancing
+   rule has at least the configured number of active VM instances are
+   available to serve the traffic.
+
+   .. note:: 
+      If an application, such as SAP, running on a VM instance is down for
+      some reason, the VM is then not counted as part of Min Instance
+      parameter, and the AutoScale feature initiates a scaleup action if
+      the number of active VM instances is below the configured value.
+      Similarly, when an application instance comes up from its earlier
+      down state, this application instance is counted as part of the
+      active instance count and the AutoScale process initiates a scaledown
+      action when the active instance count breaches the Max instance
+      value.
+
+-  **Max Instance**: Maximum number of active VM instances that **should
+   be assigned to**\ a load balancing rule. This parameter defines the
+   upper limit of active VM instances that can be assigned to a load
+   balancing rule.
+
+   Specifying a large value for the maximum instance parameter might
+   result in provisioning large number of VM instances, which in turn
+   leads to a single load balancing rule exhausting the VM instances
+   limit specified at the account or domain level.
+
+   .. note:: 
+      If an application, such as SAP, running on a VM instance is down for
+      some reason, the VM is not counted as part of Max Instance parameter.
+      So there may be scenarios where the number of VMs provisioned for a
+      scaleup action might be more than the configured Max Instance value.
+      Once the application instances in the VMs are up from an earlier down
+      state, the AutoScale feature starts aligning to the configured Max
+      Instance value.
+
+Specify the following scale-up and scale-down policies:
+
+-  **Duration**: The duration, in seconds, for which the conditions you
+   specify must be true to trigger a scaleup action. The conditions
+   defined should hold true for the entire duration you specify for an
+   AutoScale action to be invoked.
+
+-  **Counter**: The performance counters expose the state of the
+   monitored instances. By default, CloudStack offers four performance
+   counters: Three SNMP counters and one NetScaler counter. The SNMP
+   counters are Linux User CPU, Linux System CPU, and Linux CPU Idle.
+   The NetScaler counter is ResponseTime. The root administrator can add
+   additional counters into CloudStack by using the CloudStack API.
+
+-  **Operator**: The following five relational operators are supported
+   in AutoScale feature: Greater than, Less than, Less than or equal to,
+   Greater than or equal to, and Equal to.
+
+-  **Threshold**: Threshold value to be used for the counter. Once the
+   counter defined above breaches the threshold value, the AutoScale
+   feature initiates a scaleup or scaledown action.
+
+-  **Add**: Click Add to add the condition.
+
+Additionally, if you want to configure the advanced settings, click Show
+advanced settings, and specify the following:
+
+-  **Polling interval**: Frequency in which the conditions, combination
+   of counter, operator and threshold, are to be evaluated before taking
+   a scale up or down action. The default polling interval is 30
+   seconds.
+
+-  **Quiet Time**: This is the cool down period after an AutoScale
+   action is initiated. The time includes the time taken to complete
+   provisioning a VM instance from its template and the time taken by an
+   application to be ready to serve traffic. This quiet time allows the
+   fleet to come up to a stable state before any action can take place.
+   The default is 300 seconds.
+
+-  **Destroy VM Grace Period**: The duration in seconds, after a
+   scaledown action is initiated, to wait before the VM is destroyed as
+   part of scaledown action. This is to ensure graceful close of any
+   pending sessions or transactions being served by the VM marked for
+   destroy. The default is 120 seconds.
+
+-  **Security Groups**: Security groups provide a way to isolate traffic
+   to the VM instances. A security group is a group of VMs that filter
+   their incoming and outgoing traffic according to a set of rules,
+   called ingress and egress rules. These rules filter network traffic
+   according to the IP address that is attempting to communicate with
+   the VM.
+
+-  **Disk Offerings**: A predefined set of disk size for primary data
+   storage.
+
+-  **SNMP Community**: The SNMP community string to be used by the
+   NetScaler device to query the configured counter value from the
+   provisioned VM instances. Default is public.
+
+-  **SNMP Port**: The port number on which the SNMP agent that run on
+   the provisioned VMs is listening. Default port is 161.
+
+-  **User**: This is the user that the NetScaler device use to invoke
+   scaleup and scaledown API calls to the cloud. If no option is
+   specified, the user who configures AutoScaling is applied. Specify
+   another user name to override.
+
+-  **Apply**: Click Apply to create the AutoScale configuration.
+
+
+Disabling and Enabling an AutoScale Configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you want to perform any maintenance operation on the AutoScale VM
+instances, disable the AutoScale configuration. When the AutoScale
+configuration is disabled, no scaleup or scaledown action is performed.
+You can use this downtime for the maintenance activities. To disable the
+AutoScale configuration, click the Disable AutoScale |EnableDisable.png| button.
+
+The button toggles between enable and disable, depending on whether
+AutoScale is currently enabled or not. After the maintenance operations
+are done, you can enable the AutoScale configuration back. To enable,
+open the AutoScale configuration page again, then click the Enable
+AutoScale |EnableDisable.png| button.
+
+
+.. _update-autoscale:
+
+Updating an AutoScale Configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can update the various parameters and add or delete the conditions
+in a scaleup or scaledown rule. Before you update an AutoScale
+configuration, ensure that you disable the AutoScale load balancer rule
+by clicking the Disable AutoScale button.
+
+After you modify the required AutoScale parameters, click Apply. To
+apply the new AutoScale policies, open the AutoScale configuration page
+again, then click the Enable AutoScale button.
+
+
+Runtime Considerations
+^^^^^^^^^^^^^^^^^^^^^^
+
+-  An administrator should not assign a VM to a load balancing rule
+   which is configured for AutoScale.
+
+-  Before a VM provisioning is completed if NetScaler is shutdown or
+   restarted, the provisioned VM cannot be a part of the load balancing
+   rule though the intent was to assign it to a load balancing rule. To
+   workaround, rename the AutoScale provisioned VMs based on the rule
+   name or ID so at any point of time the VMs can be reconciled to its
+   load balancing rule.
+
+-  Making API calls outside the context of AutoScale, such as destroyVM,
+   on an autoscaled VM leaves the load balancing configuration in an
+   inconsistent state. Though VM is destroyed from the load balancer
+   rule, NetScaler continues to show the VM as a service assigned to a
+   rule.
+
+
+.. |autoscaleateconfig.png| image:: /_static/images/autoscale-config.png
+   :alt: Configuring AutoScale.
+.. |EnableDisable.png| image:: /_static/images/enable-disable-autoscale.png
+   :alt: button to enable or disable AutoScale.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/global_server_load_balancing.rst
----------------------------------------------------------------------
diff --git a/source/networking/global_server_load_balancing.rst b/source/networking/global_server_load_balancing.rst
new file mode 100644
index 0000000..3d88f4d
--- /dev/null
+++ b/source/networking/global_server_load_balancing.rst
@@ -0,0 +1,453 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Global Server Load Balancing Support
+------------------------------------
+
+CloudStack supports Global Server Load Balancing (GSLB) functionalities
+to provide business continuity, and enable seamless resource movement
+within a CloudStack environment. CloudStack achieve this by extending
+its functionality of integrating with NetScaler Application Delivery
+Controller (ADC), which also provides various GSLB capabilities, such as
+disaster recovery and load balancing. The DNS redirection technique is
+used to achieve GSLB in CloudStack.
+
+In order to support this functionality, region level services and
+service provider are introduced. A new service 'GSLB' is introduced as a
+region level service. The GSLB service provider is introduced that will
+provider the GSLB service. Currently, NetScaler is the supported GSLB
+provider in CloudStack. GSLB functionality works in an Active-Active
+data center environment.
+
+
+About Global Server Load Balancing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Global Server Load Balancing (GSLB) is an extension of load balancing
+functionality, which is highly efficient in avoiding downtime. Based on
+the nature of deployment, GSLB represents a set of technologies that is
+used for various purposes, such as load sharing, disaster recovery,
+performance, and legal obligations. With GSLB, workloads can be
+distributed across multiple data centers situated at geographically
+separated locations. GSLB can also provide an alternate location for
+accessing a resource in the event of a failure, or to provide a means of
+shifting traffic easily to simplify maintenance, or both.
+
+
+Components of GSLB
+^^^^^^^^^^^^^^^^^^
+
+A typical GSLB environment is comprised of the following components:
+
+-  **GSLB Site**: In CloudStack terminology, GSLB sites are represented
+   by zones that are mapped to data centers, each of which has various
+   network appliances. Each GSLB site is managed by a NetScaler
+   appliance that is local to that site. Each of these appliances treats
+   its own site as the local site and all other sites, managed by other
+   appliances, as remote sites. It is the central entity in a GSLB
+   deployment, and is represented by a name and an IP address.
+
+-  **GSLB Services**: A GSLB service is typically represented by a load
+   balancing or content switching virtual server. In a GSLB environment,
+   you can have a local as well as remote GSLB services. A local GSLB
+   service represents a local load balancing or content switching
+   virtual server. A remote GSLB service is the one configured at one of
+   the other sites in the GSLB setup. At each site in the GSLB setup,
+   you can create one local GSLB service and any number of remote GSLB
+   services.
+
+-  **GSLB Virtual Servers**: A GSLB virtual server refers to one or more
+   GSLB services and balances traffic between traffic across the VMs in
+   multiple zones by using the CloudStack functionality. It evaluates
+   the configured GSLB methods or algorithms to select a GSLB service to
+   which to send the client requests. One or more virtual servers from
+   different zones are bound to the GSLB virtual server. GSLB virtual
+   server does not have a public IP associated with it, instead it will
+   have a FQDN DNS name.
+
+-  **Load Balancing or Content Switching Virtual Servers**: According to
+   Citrix NetScaler terminology, a load balancing or content switching
+   virtual server represents one or many servers on the local network.
+   Clients send their requests to the load balancing or content
+   switching virtual server's virtual IP (VIP) address, and the virtual
+   server balances the load across the local servers. After a GSLB
+   virtual server selects a GSLB service representing either a local or
+   a remote load balancing or content switching virtual server, the
+   client sends the request to that virtual server's VIP address.
+
+-  **DNS VIPs**: DNS virtual IP represents a load balancing DNS virtual
+   server on the GSLB service provider. The DNS requests for domains for
+   which the GSLB service provider is authoritative can be sent to a DNS
+   VIP.
+
+-  **Authoritative DNS**: ADNS (Authoritative Domain Name Server) is a
+   service that provides actual answer to DNS queries, such as web site
+   IP address. In a GSLB environment, an ADNS service responds only to
+   DNS requests for domains for which the GSLB service provider is
+   authoritative. When an ADNS service is configured, the service
+   provider owns that IP address and advertises it. When you create an
+   ADNS service, the NetScaler responds to DNS queries on the configured
+   ADNS service IP and port.
+
+
+How Does GSLB Works in CloudStack?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Global server load balancing is used to manage the traffic flow to a web
+site hosted on two separate zones that ideally are in different
+geographic locations. The following is an illustration of how GLSB
+functionality is provided in CloudStack: An organization, xyztelco, has
+set up a public cloud that spans two zones, Zone-1 and Zone-2, across
+geographically separated data centers that are managed by CloudStack.
+Tenant-A of the cloud launches a highly available solution by using
+xyztelco cloud. For that purpose, they launch two instances each in both
+the zones: VM1 and VM2 in Zone-1 and VM5 and VM6 in Zone-2. Tenant-A
+acquires a public IP, IP-1 in Zone-1, and configures a load balancer
+rule to load balance the traffic between VM1 and VM2 instances.
+CloudStack orchestrates setting up a virtual server on the LB service
+provider in Zone-1. Virtual server 1 that is set up on the LB service
+provider in Zone-1 represents a publicly accessible virtual server that
+client reaches at IP-1. The client traffic to virtual server 1 at IP-1
+will be load balanced across VM1 and VM2 instances.
+
+Tenant-A acquires another public IP, IP-2 in Zone-2 and sets up a load
+balancer rule to load balance the traffic between VM5 and VM6 instances.
+Similarly in Zone-2, CloudStack orchestrates setting up a virtual server
+on the LB service provider. Virtual server 2 that is setup on the LB
+service provider in Zone-2 represents a publicly accessible virtual
+server that client reaches at IP-2. The client traffic that reaches
+virtual server 2 at IP-2 is load balanced across VM5 and VM6 instances.
+At this point Tenant-A has the service enabled in both the zones, but
+has no means to set up a disaster recovery plan if one of the zone
+fails. Additionally, there is no way for Tenant-A to load balance the
+traffic intelligently to one of the zones based on load, proximity and
+so on. The cloud administrator of xyztelco provisions a GSLB service
+provider to both the zones. A GSLB provider is typically an ADC that has
+the ability to act as an ADNS (Authoritative Domain Name Server) and has
+the mechanism to monitor health of virtual servers both at local and
+remote sites. The cloud admin enables GSLB as a service to the tenants
+that use zones 1 and 2.
+
+|gslb.png|
+
+Tenant-A wishes to leverage the GSLB service provided by the xyztelco
+cloud. Tenant-A configures a GSLB rule to load balance traffic across
+virtual server 1 at Zone-1 and virtual server 2 at Zone-2. The domain
+name is provided as A.xyztelco.com. CloudStack orchestrates setting up
+GSLB virtual server 1 on the GSLB service provider at Zone-1. CloudStack
+binds virtual server 1 of Zone-1 and virtual server 2 of Zone-2 to GLSB
+virtual server 1. GSLB virtual server 1 is configured to start
+monitoring the health of virtual server 1 and 2 in Zone-1. CloudStack
+will also orchestrate setting up GSLB virtual server 2 on GSLB service
+provider at Zone-2. CloudStack will bind virtual server 1 of Zone-1 and
+virtual server 2 of Zone-2 to GLSB virtual server 2. GSLB virtual server
+2 is configured to start monitoring the health of virtual server 1 and
+2. CloudStack will bind the domain A.xyztelco.com to both the GSLB
+virtual server 1 and 2. At this point, Tenant-A service will be globally
+reachable at A.xyztelco.com. The private DNS server for the domain
+xyztelcom.com is configured by the admin out-of-band to resolve the
+domain A.xyztelco.com to the GSLB providers at both the zones, which are
+configured as ADNS for the domain A.xyztelco.com. A client when sends a
+DNS request to resolve A.xyztelcom.com, will eventually get DNS
+delegation to the address of GSLB providers at zone 1 and 2. A client
+DNS request will be received by the GSLB provider. The GSLB provider,
+depending on the domain for which it needs to resolve, will pick up the
+GSLB virtual server associated with the domain. Depending on the health
+of the virtual servers being load balanced, DNS request for the domain
+will be resolved to the public IP associated with the selected virtual
+server.
+
+
+Configuring GSLB
+~~~~~~~~~~~~~~~~
+
+To configure a GSLB deployment, you must first configure a standard load
+balancing setup for each zone. This enables you to balance load across
+the different servers in each zone in the region. Then on the NetScaler
+side, configure both NetScaler appliances that you plan to add to each
+zone as authoritative DNS (ADNS) servers. Next, create a GSLB site for
+each zone, configure GSLB virtual servers for each site, create GLSB
+services, and bind the GSLB services to the GSLB virtual servers.
+Finally, bind the domain to the GSLB virtual servers. The GSLB
+configurations on the two appliances at the two different zones are
+identical, although each sites load-balancing configuration is specific
+to that site.
+
+Perform the following as a cloud administrator. As per the example given
+above, the administrator of xyztelco is the one who sets up GSLB:
+
+#. In the cloud.dns.name global parameter, specify the DNS name of your
+   tenant's cloud that make use of the GSLB service.
+
+#. On the NetScaler side, configure GSLB as given in `Configuring Global
+   Server Load Balancing
+   (GSLB) <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-con.html>`_:
+
+   #. Configuring a standard load balancing setup.
+
+   #. Configure Authoritative DNS, as explained in `Configuring an
+      Authoritative DNS
+      Service <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-adns-svc-tsk.html>`_.
+
+   #. Configure a GSLB site with site name formed from the domain name
+      details.
+
+      Configure a GSLB site with the site name formed from the domain
+      name.
+
+      As per the example given above, the site names are A.xyztelco.com
+      and B.xyztelco.com.
+
+      For more information, see `Configuring a Basic GSLB
+      Site <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-basic-site-tsk.html>`_.
+
+   #. Configure a GSLB virtual server.
+
+      For more information, see `Configuring a GSLB Virtual
+      Server <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-vsvr-tsk.html>`_.
+
+   #. Configure a GSLB service for each virtual server.
+
+      For more information, see `Configuring a GSLB
+      Service <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-svc-tsk.html>`_.
+
+   #. Bind the GSLB services to the GSLB virtual server.
+
+      For more information, see `Binding GSLB Services to a GSLB Virtual
+      Server <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-bind-svc-vsvr-tsk.html>`_.
+
+   #. Bind domain name to GSLB virtual server. Domain name is obtained
+      from the domain details.
+
+      For more information, see `Binding a Domain to a GSLB Virtual
+      Server <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-bind-dom-vsvr-tsk.html>`_.
+
+#. In each zone that are participating in GSLB, add GSLB-enabled
+   NetScaler device.
+
+   For more information, see :ref:`enabling-gslb-in-ns`.
+
+As a domain administrator/ user perform the following:
+
+#. Add a GSLB rule on both the sites.
+
+   See ":ref:`adding-gslb-rule`".
+
+#. Assign load balancer rules.
+
+   See ":ref:`assigning-lb-rule-gslb`".
+
+
+Prerequisites and Guidelines
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+-  The GSLB functionality is supported both Basic and Advanced zones.
+
+-  GSLB is added as a new network service.
+
+-  GSLB service provider can be added to a physical network in a zone.
+
+-  The admin is allowed to enable or disable GSLB functionality at
+   region level.
+
+-  The admin is allowed to configure a zone as GSLB capable or enabled.
+
+   A zone shall be considered as GSLB capable only if a GSLB service
+   provider is provisioned in the zone.
+
+-  When users have VMs deployed in multiple availability zones which are
+   GSLB enabled, they can use the GSLB functionality to load balance
+   traffic across the VMs in multiple zones.
+
+-  The users can use GSLB to load balance across the VMs across zones in
+   a region only if the admin has enabled GSLB in that region.
+
+-  The users can load balance traffic across the availability zones in
+   the same region or different regions.
+
+-  The admin can configure DNS name for the entire cloud.
+
+-  The users can specify an unique name across the cloud for a globally
+   load balanced service. The provided name is used as the domain name
+   under the DNS name associated with the cloud.
+
+   The user-provided name along with the admin-provided DNS name is used
+   to produce a globally resolvable FQDN for the globally load balanced
+   service of the user. For example, if the admin has configured
+   xyztelco.com as the DNS name for the cloud, and user specifies 'foo'
+   for the GSLB virtual service, then the FQDN name of the GSLB virtual
+   service is foo.xyztelco.com.
+
+-  While setting up GSLB, users can select a load balancing method, such
+   as round robin, for using across the zones that are part of GSLB.
+
+-  The user shall be able to set weight to zone-level virtual server.
+   Weight shall be considered by the load balancing method for
+   distributing the traffic.
+
+-  The GSLB functionality shall support session persistence, where
+   series of client requests for particular domain name is sent to a
+   virtual server on the same zone.
+
+   Statistics is collected from each GSLB virtual server.
+
+
+.. _enabling-gslb-in-ns:
+
+Enabling GSLB in NetScaler
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In each zone, add GSLB-enabled NetScaler device for load balancing.
+
+#. Log in as administrator to the CloudStack UI.
+
+#. In the left navigation bar, click Infrastructure.
+
+#. In Zones, click View More.
+
+#. Choose the zone you want to work with.
+
+#. Click the Physical Network tab, then click the name of the physical
+   network.
+
+#. In the Network Service Providers node of the diagram, click
+   Configure.
+
+   You might have to scroll down to see this.
+
+#. Click NetScaler.
+
+#. Click Add NetScaler device and provide the following:
+
+   For NetScaler:
+
+   -  **IP Address**: The IP address of the SDX.
+
+   -  **Username/Password**: The authentication credentials to access
+      the device. CloudStack uses these credentials to access the
+      device.
+
+   -  **Type**: The type of device that is being added. It could be F5
+      Big Ip Load Balancer, NetScaler VPX, NetScaler MPX, or NetScaler
+      SDX. For a comparison of the NetScaler types, see the CloudStack
+      Administration Guide.
+
+   -  **Public interface**: Interface of device that is configured to be
+      part of the public network.
+
+   -  **Private interface**: Interface of device that is configured to
+      be part of the private network.
+
+   -  **GSLB service**: Select this option.
+
+   -  **GSLB service Public IP**: The public IP address of the NAT
+      translator for a GSLB service that is on a private network.
+
+   -  **GSLB service Private IP**: The private IP of the GSLB service.
+
+   -  **Number of Retries**. Number of times to attempt a command on the
+      device before considering the operation failed. Default is 2.
+
+   -  **Capacity**: The number of networks the device can handle.
+
+   -  **Dedicated**: When marked as dedicated, this device will be
+      dedicated to a single account. When Dedicated is checked, the
+      value in the Capacity field has no significance implicitly, its
+      value is 1.
+
+#. Click OK.
+
+
+.. _adding-gslb-rule:
+
+Adding a GSLB Rule
+^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as a domain administrator or user.
+
+#. In the left navigation pane, click Region.
+
+#. Select the region for which you want to create a GSLB rule.
+
+#. In the Details tab, click View GSLB.
+
+#. Click Add GSLB.
+
+   The Add GSLB page is displayed as follows:
+
+   |gslb-add.png|
+
+#. Specify the following:
+
+   -  **Name**: Name for the GSLB rule.
+
+   -  **Description**: (Optional) A short description of the GSLB rule
+      that can be displayed to users.
+
+   -  **GSLB Domain Name**: A preferred domain name for the service.
+
+   -  **Algorithm**: (Optional) The algorithm to use to load balance the
+      traffic across the zones. The options are Round Robin, Least
+      Connection, and Proximity.
+
+   -  **Service Type**: The transport protocol to use for GSLB. The
+      options are TCP and UDP.
+
+   -  **Domain**: (Optional) The domain for which you want to create the
+      GSLB rule.
+
+   -  **Account**: (Optional) The account on which you want to apply the
+      GSLB rule.
+
+#. Click OK to confirm.
+
+
+.. _assigning-lb-rule-gslb:
+
+Assigning Load Balancing Rules to GSLB
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as a domain administrator or user.
+
+#. In the left navigation pane, click Region.
+
+#. Select the region for which you want to create a GSLB rule.
+
+#. In the Details tab, click View GSLB.
+
+#. Select the desired GSLB.
+
+#. Click view assigned load balancing.
+
+#. Click assign more load balancing.
+
+#. Select the load balancing rule you have created for the zone.
+
+#. Click OK to confirm.
+
+
+Known Limitation
+~~~~~~~~~~~~~~~~
+
+Currently, CloudStack does not support orchestration of services across
+the zones. The notion of services and service providers in region are to
+be introduced.
+
+
+.. |gslb.png| image:: /_static/images/gslb.png
+   :alt: GSLB architecture
+.. |gslb-add.png| image:: /_static/images/add-gslb.png
+   :alt: adding a gslb rule.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/guest_ip_ranges.rst
----------------------------------------------------------------------
diff --git a/source/networking/guest_ip_ranges.rst b/source/networking/guest_ip_ranges.rst
new file mode 100644
index 0000000..d0edf78
--- /dev/null
+++ b/source/networking/guest_ip_ranges.rst
@@ -0,0 +1,29 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Guest IP Ranges
+---------------
+
+The IP ranges for guest network traffic are set on a per-account basis
+by the user. This allows the users to configure their network in a
+fashion that will enable VPN linking between their guest network and
+their clients.
+
+In shared networks in Basic zone and Security Group-enabled Advanced
+networks, you will have the flexibility to add multiple guest IP ranges
+from different subnets. You can add or remove one IP range at a time.
+For more information, see `"About Multiple IP
+Ranges" <#about-multiple-ip-ranges>`_.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/guest_traffic.rst
----------------------------------------------------------------------
diff --git a/source/networking/guest_traffic.rst b/source/networking/guest_traffic.rst
new file mode 100644
index 0000000..51374d1
--- /dev/null
+++ b/source/networking/guest_traffic.rst
@@ -0,0 +1,50 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Guest Traffic
+-------------
+
+A network can carry guest traffic only between VMs within one zone.
+Virtual machines in different zones cannot communicate with each other
+using their IP addresses; they must communicate with each other by
+routing through a public IP address.
+
+See a typical guest traffic setup given below:
+
+|guest-traffic-setup.png| 
+
+Typically, the Management Server automatically creates a virtual router
+for each network. A virtual router is a special virtual machine that
+runs on the hosts. Each virtual router in an isolated network has three
+network interfaces. If multiple public VLAN is used, the router will
+have multiple public interfaces. Its eth0 interface serves as the
+gateway for the guest traffic and has the IP address of 10.1.1.1. Its
+eth1 interface is used by the system to configure the virtual router.
+Its eth2 interface is assigned a public IP address for public traffic.
+If multiple public VLAN is used, the router will have multiple public
+interfaces.
+
+The virtual router provides DHCP and will automatically assign an IP
+address for each guest VM within the IP range assigned for the network.
+The user can manually reconfigure guest VMs to assume different IP
+addresses.
+
+Source NAT is automatically configured in the virtual router to forward
+outbound traffic for all guest VMs
+
+
+.. |guest-traffic-setup.png| image:: /_static/images/guest-traffic-setup.png
+   :alt: Depicts a guest traffic setup

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/inter_vlan_routing.rst
----------------------------------------------------------------------
diff --git a/source/networking/inter_vlan_routing.rst b/source/networking/inter_vlan_routing.rst
new file mode 100644
index 0000000..fd651a8
--- /dev/null
+++ b/source/networking/inter_vlan_routing.rst
@@ -0,0 +1,96 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+About Inter-VLAN Routing (nTier Apps)
+-------------------------------------
+
+Inter-VLAN Routing (nTier Apps) is the capability to route network
+traffic between VLANs. This feature enables you to build Virtual Private
+Clouds (VPC), an isolated segment of your cloud, that can hold
+multi-tier applications. These tiers are deployed on different VLANs
+that can communicate with each other. You provision VLANs to the tiers
+your create, and VMs can be deployed on different tiers. The VLANs are
+connected to a virtual router, which facilitates communication between
+the VMs. In effect, you can segment VMs by means of VLANs into different
+networks that can host multi-tier applications, such as Web,
+Application, or Database. Such segmentation by means of VLANs logically
+separate application VMs for higher security and lower broadcasts, while
+remaining physically connected to the same device.
+
+This feature is supported on XenServer, KVM, and VMware hypervisors.
+
+The major advantages are:
+
+-  The administrator can deploy a set of VLANs and allow users to deploy
+   VMs on these VLANs. A guest VLAN is randomly alloted to an account
+   from a pre-specified set of guest VLANs. All the VMs of a certain
+   tier of an account reside on the guest VLAN allotted to that account.
+
+   .. note:: 
+      A VLAN allocated for an account cannot be shared between multiple accounts.
+
+-  The administrator can allow users create their own VPC and deploy the
+   application. In this scenario, the VMs that belong to the account are
+   deployed on the VLANs allotted to that account.
+
+-  Both administrators and users can create multiple VPCs. The guest
+   network NIC is plugged to the VPC virtual router when the first VM is
+   deployed in a tier.
+
+-  The administrator can create the following gateways to send to or
+   receive traffic from the VMs:
+
+   -  **VPN Gateway**: For more information, see `"Creating a VPN gateway for the
+      VPC" <#creating-a-vpn-gateway-for-the-vpc>`_.
+
+   -  **Public Gateway**: The public gateway for a VPC is added to the
+      virtual router when the virtual router is created for VPC. The
+      public gateway is not exposed to the end users. You are not
+      allowed to list it, nor allowed to create any static routes.
+
+   -  **Private Gateway**: For more information, see ":ref:`adding-priv-gw-vpc`".
+
+-  Both administrators and users can create various possible
+   destinations-gateway combinations. However, only one gateway of each
+   type can be used in a deployment.
+
+   For example:
+
+   -  **VLANs and Public Gateway**: For example, an application is
+      deployed in the cloud, and the Web application VMs communicate
+      with the Internet.
+
+   -  **VLANs, VPN Gateway, and Public Gateway**: For example, an
+      application is deployed in the cloud; the Web application VMs
+      communicate with the Internet; and the database VMs communicate
+      with the on-premise devices.
+
+-  The administrator can define Network Access Control List (ACL) on the
+   virtual router to filter the traffic among the VLANs or between the
+   Internet and a VLAN. You can define ACL based on CIDR, port range,
+   protocol, type code (if ICMP protocol is selected) and Ingress/Egress
+   type.
+
+The following figure shows the possible deployment scenarios of a
+Inter-VLAN setup:
+
+|mutltier.png|
+
+To set up a multi-tier Inter-VLAN deployment, see ":ref:`configuring-vpc`".
+
+
+.. |mutltier.png| image:: /_static/images/multi-tier-app.png
+   :alt: a multi-tier setup.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_forwarding_and_firewalling.rst
----------------------------------------------------------------------
diff --git a/source/networking/ip_forwarding_and_firewalling.rst b/source/networking/ip_forwarding_and_firewalling.rst
new file mode 100644
index 0000000..0999eb7
--- /dev/null
+++ b/source/networking/ip_forwarding_and_firewalling.rst
@@ -0,0 +1,280 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+IP Forwarding and Firewalling
+-----------------------------
+
+By default, all incoming traffic to the public IP address is rejected.
+All outgoing traffic from the guests is also blocked by default.
+
+To allow outgoing traffic, follow the procedure in :ref:`egress-fw-rules`.
+
+To allow incoming traffic, users may set up firewall rules and/or port
+forwarding rules. For example, you can use a firewall rule to open a
+range of ports on the public IP address, such as 33 through 44. Then use
+port forwarding rules to direct traffic from individual ports within
+that range to specific ports on user VMs. For example, one port
+forwarding rule could route incoming traffic on the public IP's port 33
+to port 100 on one user VM's private IP.
+
+
+Firewall Rules
+~~~~~~~~~~~~~~
+
+By default, all incoming traffic to the public IP address is rejected by
+the firewall. To allow external traffic, you can open firewall ports by
+specifying firewall rules. You can optionally specify one or more CIDRs
+to filter the source IPs. This is useful when you want to allow only
+incoming requests from certain IP addresses.
+
+You cannot use firewall rules to open ports for an elastic IP address.
+When elastic IP is used, outside access is instead controlled through
+the use of security groups. See `"Adding a Security
+Group" <#adding-a-security-group>`_.
+
+In an advanced zone, you can also create egress firewall rules by using
+the virtual router. For more information, see ":ref:`egress-fw-rules`".
+
+Firewall rules can be created using the Firewall tab in the Management
+Server UI. This tab is not displayed by default when CloudStack is
+installed. To display the Firewall tab, the CloudStack administrator
+must set the global configuration parameter firewall.rule.ui.enabled to
+"true."
+
+To create a firewall rule:
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click the IP address you want to work with.
+
+#. Click the Configuration tab and fill in the following values.
+
+   -  **Source CIDR**: (Optional) To accept only traffic from IP
+      addresses within a particular address block, enter a CIDR or a
+      comma-separated list of CIDRs. Example: 192.168.0.0/22. Leave
+      empty to allow all CIDRs.
+
+   -  **Protocol**: The communication protocol in use on the opened
+      port(s).
+
+   -  **Start Port and End Port**: The port(s) you want to open on the
+      firewall. If you are opening a single port, use the same number in
+      both fields
+
+   -  **ICMP Type and ICMP Code**: Used only if Protocol is set to ICMP.
+      Provide the type and code required by the ICMP protocol to fill
+      out the ICMP header. Refer to ICMP documentation for more details
+      if you are not sure what to enter
+
+#. Click Add.
+
+
+.. _egress-fw-rules:
+
+Egress Firewall Rules in an Advanced Zone
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The egress traffic originates from a private network to a public
+network, such as the Internet. By default, the egress traffic is blocked
+in default network offerings, so no outgoing traffic is allowed from a
+guest network to the Internet. However, you can control the egress
+traffic in an Advanced zone by creating egress firewall rules. When an
+egress firewall rule is applied, the traffic specific to the rule is
+allowed and the remaining traffic is blocked. When all the firewall
+rules are removed the default policy, Block, is applied.
+
+
+Prerequisites and Guidelines
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Consider the following scenarios to apply egress firewall rules:
+
+-  Egress firewall rules are supported on Juniper SRX and virtual
+   router.
+
+-  The egress firewall rules are not supported on shared networks.
+
+-  Allow the egress traffic from specified source CIDR. The Source CIDR
+   is part of guest network CIDR.
+
+-  Allow the egress traffic with protocol TCP,UDP,ICMP, or ALL.
+
+-  Allow the egress traffic with protocol and destination port range.
+   The port range is specified for TCP, UDP or for ICMP type and code.
+
+-  The default policy is Allow for the new network offerings, whereas on
+   upgrade existing network offerings with firewall service providers
+   will have the default egress policy Deny.
+
+
+Configuring an Egress Firewall Rule
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In Select view, choose Guest networks, then click the Guest network
+   you want.
+
+#. To add an egress rule, click the Egress rules tab and fill out the
+   following fields to specify what type of traffic is allowed to be
+   sent out of VM instances in this guest network:
+
+   |egress-firewall-rule.png|
+
+   -  **CIDR**: (Add by CIDR only) To send traffic only to the IP
+      addresses within a particular address block, enter a CIDR or a
+      comma-separated list of CIDRs. The CIDR is the base IP address of
+      the destination. For example, 192.168.0.0/22. To allow all CIDRs,
+      set to 0.0.0.0/0.
+
+   -  **Protocol**: The networking protocol that VMs uses to send
+      outgoing traffic. The TCP and UDP protocols are typically used for
+      data exchange and end-user communications. The ICMP protocol is
+      typically used to send error messages or network monitoring data.
+
+   -  **Start Port, End Port**: (TCP, UDP only) A range of listening
+      ports that are the destination for the outgoing traffic. If you
+      are opening a single port, use the same number in both fields.
+
+   -  **ICMP Type, ICMP Code**: (ICMP only) The type of message and
+      error code that are sent.
+
+#. Click Add.
+
+
+Configuring the Default Egress Policy
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The default egress policy for Isolated guest network is configured by
+using Network offering. Use the create network offering option to
+determine whether the default policy should be block or allow all the
+traffic to the public network from a guest network. Use this network
+offering to create the network. If no policy is specified, by default
+all the traffic is allowed from the guest network that you create by
+using this network offering.
+
+You have two options: Allow and Deny.
+
+Allow
+'''''
+
+If you select Allow for a network offering, by default egress traffic is
+allowed. However, when an egress rule is configured for a guest network,
+rules are applied to block the specified traffic and rest are allowed.
+If no egress rules are configured for the network, egress traffic is
+accepted.
+
+Deny
+''''
+
+If you select Deny for a network offering, by default egress traffic for
+the guest network is blocked. However, when an egress rules is
+configured for a guest network, rules are applied to allow the specified
+traffic. While implementing a guest network, CloudStack adds the
+firewall egress rule specific to the default egress policy for the guest
+network.
+
+This feature is supported only on virtual router and Juniper SRX.
+
+#. Create a network offering with your desirable default egress policy:
+
+   #. Log in with admin privileges to the CloudStack UI.
+
+   #. In the left navigation bar, click Service Offerings.
+
+   #. In Select Offering, choose Network Offering.
+
+   #. Click Add Network Offering.
+
+   #. In the dialog, make necessary choices, including firewall
+      provider.
+
+   #. In the Default egress policy field, specify the behaviour.
+
+   #. Click OK.
+
+#. Create an isolated network by using this network offering.
+
+   Based on your selection, the network will have the egress public
+   traffic blocked or allowed.
+
+
+Port Forwarding
+~~~~~~~~~~~~~~~
+
+A port forward service is a set of port forwarding rules that define a
+policy. A port forward service is then applied to one or more guest VMs.
+The guest VM then has its inbound network access managed according to
+the policy defined by the port forwarding service. You can optionally
+specify one or more CIDRs to filter the source IPs. This is useful when
+you want to allow only incoming requests from certain IP addresses to be
+forwarded.
+
+A guest VM can be in any number of port forward services. Port forward
+services can be defined but have no members. If a guest VM is part of
+more than one network, port forwarding rules will function only if they
+are defined on the default network
+
+You cannot use port forwarding to open ports for an elastic IP address.
+When elastic IP is used, outside access is instead controlled through
+the use of security groups. See Security Groups.
+
+To set up port forwarding:
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. If you have not already done so, add a public IP address range to a
+   zone in CloudStack. See Adding a Zone and Pod in the Installation
+   Guide.
+
+#. Add one or more VM instances to CloudStack.
+
+#. In the left navigation bar, click Network.
+
+#. Click the name of the guest network where the VMs are running.
+
+#. Choose an existing IP address or acquire a new IP address. See
+   `"Acquiring a New IP Address" <#acquiring-a-new-ip-address>`_. 
+   Click the name of the IP address in the list.
+
+#. Click the Configuration tab.
+
+#. In the Port Forwarding node of the diagram, click View All.
+
+#. Fill in the following:
+
+   -  **Public Port**: The port to which public traffic will be
+      addressed on the IP address you acquired in the previous step.
+
+   -  **Private Port**: The port on which the instance is listening for
+      forwarded public traffic.
+
+   -  **Protocol**: The communication protocol in use between the two
+      ports
+
+#. Click Add.
+
+
+.. |egress-firewall-rule.png| image:: /_static/images/egress-firewall-rule.png
+   :alt: adding an egress firewall rule.


[40/40] git commit: Merge branch '4.3' into 4.4

Posted by ra...@apache.org.
Merge branch '4.3' into 4.4

Conflicts:
	source/accounts.rst
	source/service_offerings.rst


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/6507638e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/6507638e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/6507638e

Branch: refs/heads/4.4
Commit: 6507638eccd62faa27846031cda9948fff8899b4
Parents: 00c90ec 5d59a37
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Wed Sep 10 12:08:26 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Wed Sep 10 12:08:26 2014 +0530

----------------------------------------------------------------------
 .gitattributes                                 |    2 +
 source/accounts.rst                            |   10 +-
 source/locale/zh_CN/LC_MESSAGES/networking2.mo |  Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.po | 8448 +++++++++++++++++++
 4 files changed, 8457 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[21/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/projects.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/projects.po b/source/locale/zh_CN/LC_MESSAGES/projects.po
new file mode 100644
index 0000000..63db2ef
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/projects.po
@@ -0,0 +1,756 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# mushroom_rain <mu...@163.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-16 07:45+0000\n"
+"Last-Translator: mushroom_rain <mu...@163.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 67b9f51612cb496d9701fcd2c24d9cb5
+#: ../../projects.rst:18
+msgid "Using Projects to Organize Users and Resources"
+msgstr "使用项目来管理用户和资源。"
+
+# 1cb3a4ccdca349788ea29a615f989e93
+#: ../../projects.rst:21
+msgid "Overview of Projects"
+msgstr "项目概览"
+
+# f06b8f1572294f1c9e8567167df9a4c5
+#: ../../projects.rst:23
+msgid ""
+"Projects are used to organize people and resources. CloudStack users within "
+"a single domain can group themselves into project teams so they can "
+"collaborate and share virtual resources such as VMs, snapshots, templates, "
+"data disks, and IP addresses. CloudStack tracks resource usage per project "
+"as well as per user, so the usage can be billed to either a user account or "
+"a project. For example, a private cloud within a software company might have"
+" all members of the QA department assigned to one project, so the company "
+"can track the resources used in testing while the project members can more "
+"easily isolate their efforts from other users of the same cloud"
+msgstr "项目用来管理用户和资源。处于单独域中的CloudStack用户可以自组,他们可以集中并分享虚拟资源,如VM、快照、模板、磁盘、IP地址等。CloudStack可以像跟踪每个用户一样跟踪每个项目的资源,所以可以按照用户或者项目对资源使用收费。例如,一个软件公司的私有云可能将所有QA部门的员工分配到一个项目,当需要在测试中区分同一云中该项目组员工的贡献时,测试中的资源跟踪将变的容易。"
+
+# 467cabcfe9c448b784ab2c2c52560838
+#: ../../projects.rst:34
+msgid ""
+"You can configure CloudStack to allow any user to create a new project, or "
+"you can restrict that ability to just CloudStack administrators. Once you "
+"have created a project, you become that project’s administrator, and you can"
+" add others within your domain to the project. CloudStack can be set up "
+"either so that you can add people directly to a project, or so that you have"
+" to send an invitation which the recipient must accept. Project members can "
+"view and manage all virtual resources created by anyone in the project (for "
+"example, share VMs). A user can be a member of any number of projects and "
+"can switch views in the CloudStack UI to show only project-related "
+"information, such as project VMs, fellow project members, project-related "
+"alerts, and so on."
+msgstr "你可以配置 CloudStack允许任何用户创建项目,或者你也可以只允许CloudStack管理员进行此项操作。一旦你创建了项目,你就成为项目管理员,你可以将域中的其他用户加入到项目。CloudStack可以设置成将用户直接加入项目或者向接受者发送邀请。项目组成员可以浏览和管理项目中的所有虚拟资源(例如,共享VM)。一个用户可以属于任何项目组,并可在CloudStack界面中切换只与项目相关的信息,如项目VM,项目成员,项目相关警告等。"
+
+# 084d2df113554d86bc84fabe4777c76c
+#: ../../projects.rst:46
+msgid ""
+"The project administrator can pass on the role to another project member. "
+"The project administrator can also add more members, remove members from the"
+" project, set new resource limits (as long as they are below the global "
+"defaults set by the CloudStack administrator), and delete the project. When "
+"the administrator removes a member from the project, resources created by "
+"that user, such as VM instances, remain with the project. This brings us to "
+"the subject of resource ownership and which resources can be used by a "
+"project."
+msgstr "项目管理员可以将角色传递给项目另外的成员。项目管理员也可以添加、删除项目成员,设置新的资源限制(只要在CloudStack管理员默认的全局设置范围之内),删除项目。当管理员将成员移出项目,那个成员所创建的资源,如VM实例,仍旧在项目中。这将我们带到了资源归属以及项目可用资源的课题下."
+
+# 3c0e437493cc47a7ae950a51d94f7b72
+#: ../../projects.rst:55
+msgid ""
+"Resources created within a project are owned by the project, not by any "
+"particular CloudStack account, and they can be used only within the project."
+" A user who belongs to one or more projects can still create resources "
+"outside of those projects, and those resources belong to the user’s account;"
+" they will not be counted against the project’s usage or resource limits. "
+"You can create project-level networks to isolate traffic within the project "
+"and provide network services such as port forwarding, load balancing, VPN, "
+"and static NAT. A project can also make use of certain types of resources "
+"from outside the project, if those resources are shared. For example, a "
+"shared network or public template is available to any project in the domain."
+" A project can get access to a private template if the template’s owner will"
+" grant permission. A project can use any service offering or disk offering "
+"available in its domain; however, you can not create private service and "
+"disk offerings at the project level.."
+msgstr "项目内创建的资源为项目所有,不属于任何特殊的CloudStack帐户,仅能在项目内使用。属于一个或多个项目的用户扔可在这些项目之外创建资源,这些资源属于这个用户帐户;与项目使用和资源限制并不冲突。你可以在项目内创建项目级的网络来隔离流量,并提供网络服务,如端口转发,负载均衡,VPN,静态NAT。项目也可以在项目之外使用特定资源,只要这些资源是共享的。例如,域中的共享网络,公用模板对任何项目都是可用的。模板所有者如果赋予权限,项目也可以使用私有模板。项目可以使用域中设置的服务方案或磁盘方案;然后,你无法在项目层级创建私有服务和磁盘方案。"
+
+# a53649cfbfa54d2faadb804f7b60dc42
+#: ../../projects.rst:72
+msgid "Configuring Projects"
+msgstr "配置项目"
+
+# 409cbc0e07374aa2bb946e59f01aa5e0
+#: ../../projects.rst:74
+msgid ""
+"Before CloudStack users start using projects, the CloudStack administrator "
+"must set up various systems to support them, including membership "
+"invitations, limits on project resources, and controls on who can create "
+"projects."
+msgstr "在CloudStack用户使用项目前,CloudStack管理员必须设置不同的系统以支持它们,包括成员身份邀请,项目资源的限制,以及对谁可以创建项目的控制。"
+
+# 88c44194d06549edb39e6d7cdf57783c
+#: ../../projects.rst:80
+msgid "Setting Up Invitations"
+msgstr "设置邀请"
+
+# 2d0fcd00386f4b86abf09bd4a3cf2c88
+#: ../../projects.rst:82
+msgid ""
+"CloudStack can be set up either so that project administrators can add "
+"people directly to a project, or so that it is necessary to send an "
+"invitation which the recipient must accept. The invitation can be sent by "
+"email or through the user’s CloudStack account. If you want administrators "
+"to use invitations to add members to projects, turn on and set up the "
+"invitations feature in CloudStack."
+msgstr "CloudStack可以设置成项目管理员直接添加用户或者向接受者发送邀请。邀请可以通过邮件或者用户的CloudStack帐户。如果你希望管理员使用邀请来添加项目成员,那么打开并设置CloudStack中的邀请属性。"
+
+# 59ed72e622cb4d1995d33e948a358c8b
+# e6ba70a14d374e0db36684000897aa1d
+# d93d49c7c1024e178d8b9181bb31e7da
+# 1758c4678559493894aaa229ebea9e45
+# bbb433d475704c568dc75532dd96138a
+#: ../../projects.rst:91 ../../projects.rst:168 ../../projects.rst:200
+#: ../../projects.rst:247 ../../projects.rst:284
+msgid "Log in as administrator to the CloudStack UI."
+msgstr "使用管理员登录到CloudStack管理界面。"
+
+# 4f972f509e204e46b3a2d3e9a5582942
+# 431e2eead6c4499db65445f004e8c998
+# f8db5cdebb8c4434b988c467a33b770d
+#: ../../projects.rst:95 ../../projects.rst:204 ../../projects.rst:251
+msgid "In the left navigation, click Global Settings."
+msgstr "在左侧导航栏,点击 全局设置"
+
+# bae913de91674043a1cca535165318ae
+#: ../../projects.rst:99
+msgid ""
+"In the search box, type project and click the search button. |Searches "
+"projects|"
+msgstr "在搜索栏中,输入项目,点击搜索按钮。 |搜索项目|"
+
+# 37a9fac5bb5c473b93f335d10ff3b848
+#: ../../projects.rst:104
+msgid ""
+"In the search results, you can see a few other parameters you need to set to"
+" control how invitations behave. The table below shows global configuration "
+"parameters related to project invitations. Click the edit button to set each"
+" parameter."
+msgstr "在搜索结果中,你还需要设置一些其他的参数来控制邀请行为。下表所示的是全局配置参数中与项目邀请相关的部分,点击编辑按钮设置每个参数。"
+
+# 1708bd1229214fcabbf8ecdeef8a1cfc
+#: ../../projects.rst:110
+msgid "Configuration Parameters"
+msgstr "配置参数"
+
+# ca3b2c6c430b46d0aae519d2e68e6bfb
+#: ../../projects.rst:110
+msgid "Description"
+msgstr "描述"
+
+# a246e157a45f4200983ec1ea49c90ebb
+#: ../../projects.rst:112
+msgid "project.invite.required"
+msgstr "project.invite.required"
+
+# 086f42e092d14d8a8203ab0f759b9ece
+#: ../../projects.rst:112
+msgid "Set to true to turn on the invitations feature."
+msgstr "将值设置为 true以打开邀请特性。"
+
+# 03762abea2bf4ae0af7415c5e7b30029
+#: ../../projects.rst:114
+msgid "project.email.sender"
+msgstr "project.email.sender"
+
+# 48141d344bd9434b994abcd3c6054e64
+#: ../../projects.rst:114
+msgid "The email address to show in the From field of invitation emails."
+msgstr "邀请邮件中填入发送区域的邮件地址。"
+
+# 52a79b2f401a4edba2d3daf78fee2deb
+#: ../../projects.rst:116
+msgid "project.invite.timeout"
+msgstr "project.invite.timeout"
+
+# da33a2acf3d3417584722eeaf6f71216
+#: ../../projects.rst:116
+msgid "Amount of time to allow for a new member to respond to the invitation."
+msgstr "新成员对于邀请的允许响应时间。"
+
+# 6aea4b8ae5044c118ef90cf9b3b850ed
+#: ../../projects.rst:118
+msgid "project.smtp.host"
+msgstr "project.smtp.host"
+
+# 61fd32c7879f4d4c9172f1853e4aa116
+#: ../../projects.rst:118
+msgid "Name of the host that acts as an email server to handle invitations."
+msgstr "作为处理邀请的邮件服务器的主机名。"
+
+# 7694735f91b74bf2bf17595676e496fe
+#: ../../projects.rst:120
+msgid "project.smtp.password"
+msgstr "project.smtp.password"
+
+# ea9112506e1d485db75be150ba24c122
+#: ../../projects.rst:120
+msgid ""
+"(Optional) Password required by the SMTP server. You must also set "
+"project.smtp.username and set project.smtp.useAuth to true."
+msgstr "(可选)SMTP服务器要求的密码。你必须将project.smtp.username和project.smtp.useAuth也设置为true。"
+
+# 521e92a91a0f492ea611ed184e57514c
+#: ../../projects.rst:122
+msgid "project.smtp.port"
+msgstr "project.smtp.port"
+
+# 87c311479de94ea88ea3af5902889bf6
+#: ../../projects.rst:122
+msgid "SMTP server’s listening port."
+msgstr "SMTP服务器的监听端口。"
+
+# bd090dd563074164900c1d2dfbcb17ed
+#: ../../projects.rst:124
+msgid "project.smtp.useAuth"
+msgstr "project.smtp.useAuth"
+
+# 561e7c0ae0c543a39846104161567074
+#: ../../projects.rst:124
+msgid "Set to true if the SMTP server requires a username and password."
+msgstr "如果SMTP服务器需要用户名和密码,则设置为true"
+
+# 65279b768d8e4c28b2b9a44138b68fcb
+#: ../../projects.rst:126
+msgid "project.smtp.username"
+msgstr "project.smtp.username"
+
+# 97c3e819133a437eac8012da0470ae5c
+#: ../../projects.rst:126
+msgid ""
+"(Optional) User name required by the SMTP server for authentication. You "
+"must also set project.smtp.password and set project.smtp.useAuth to true.."
+msgstr "(可选) 用于SMTPU认证的用户名。必须将project.smtp.password 和project.smtp.useAuth也设置为true。"
+
+# fae690fdd7ee41709620845c82bd6285
+#: ../../projects.rst:131
+msgid "Restart the Management Server:"
+msgstr "重启管理服务器:"
+
+# 722a9bbe1a974df38f687dace1f5632b
+#: ../../projects.rst:138
+msgid "Setting Resource Limits for Projects"
+msgstr "设置项目的资源限制"
+
+# 273ccdcf6f124c10a4a90e705b70030b
+#: ../../projects.rst:140
+msgid ""
+"The CloudStack administrator can set global default limits to control the "
+"amount of resources that can be owned by each project in the cloud. This "
+"serves to prevent uncontrolled usage of resources such as snapshots, IP "
+"addresses, and virtual machine instances. Domain administrators can override"
+" these resource limits for individual projects with their domains, as long "
+"as the new limits are below the global defaults set by the CloudStack root "
+"administrator. The root administrator can also set lower resource limits for"
+" any project in the cloud"
+msgstr "CloudStack管理员可以设置全局默认限制来控制云中每个项目可拥有的资源量。该服务用来限制不可控的资源使用,如快照,IP地址,虚拟机实例。域管理员在域中可以覆盖个人项目中的这些资源限制,只要这些限制在CloudStack根管理员的全局默认限制范围内。CloudStack根管理员可以为云中的任何项目设置更低的资源限制。"
+
+# bd79e43b15154578b3b73965c8de8a24
+#: ../../projects.rst:151
+msgid "Setting Per-Project Resource Limits"
+msgstr "按项目设置资源限制"
+
+# 35bf817bb33142f88ac5ef8dd26b9214
+#: ../../projects.rst:153
+msgid ""
+"The CloudStack root administrator or the domain administrator of the domain "
+"where the project resides can set new resource limits for an individual "
+"project. The project owner can set resource limits only if the owner is also"
+" a domain or root administrator."
+msgstr " CloudStack系统管理员和项目所在域的域管理员可以设置单个项目的资源限制。项目所有者只有在其同时为域或系统管理员的情况下才能设置资源限制。"
+
+# 3fb3e20139094b9ab734eca835527188
+#: ../../projects.rst:158
+msgid ""
+"The new limits must be below the global default limits set by the CloudStack"
+" administrator (as described in `“Setting Resource Limits for Projects” "
+"<#setting-resource-limits-for-projects>`_). If the project already owns more"
+" of a given type of resource than the new maximum, the resources are not "
+"affected; however, the project can not add any new resources of that type "
+"until the total drops below the new limit."
+msgstr "新限制值必须小于 CloudStack系统管理员设置的全局限制值(参见`“设置项目的资源限制” <#setting-resource-limits-for-projects>`_)。如果项目中的某种资源数量已经超过了新限制值,现有资源不受影响。然而,该项目将不能再添加该类型的新资源,直到资源数低于新限制值。"
+
+# 3fcbacd6ccea43a2b8ecc0cdff1cdbdd
+# 19e2f08a56b0442a8522e9cad855930f
+# d9594aa91e5347768c79dd0113a197d3
+# 3cf6663e5c6341559a649fa3a285cd89
+# bc73035e033c43c2ab844ac37b640e04
+# f1b162b83e964649b8bee3908fed1890
+#: ../../projects.rst:172 ../../projects.rst:288 ../../projects.rst:344
+#: ../../projects.rst:407 ../../projects.rst:440 ../../projects.rst:479
+msgid "In the left navigation, click Projects."
+msgstr "在左侧导航栏点击项目。"
+
+# 90fa632519674015b7099f8dbeb8e44c
+# c71535c66cba4b0bb6623c722ce0d171
+# ae8e17566ee14ccba9d97a07a50107f8
+# 4b40011760b84031aa730741c109b402
+#: ../../projects.rst:176 ../../projects.rst:348 ../../projects.rst:411
+#: ../../projects.rst:483
+msgid "In Select View, choose Projects."
+msgstr "在选择视图选择项目。"
+
+# 53db713c99504c5985dac8e64571dab0
+# 018eb9a76ca342ad9cb27c1e2cf1490b
+# a2f3bfa283984936a6967a5dee596fa7
+#: ../../projects.rst:180 ../../projects.rst:352 ../../projects.rst:415
+msgid "Click the name of the project you want to work with."
+msgstr "点击您要操作的项目名称。"
+
+# d5f4e26bc5d04420a7b1d08edeb5d7fc
+#: ../../projects.rst:184
+msgid ""
+"Click the Resources tab. This tab lists the current maximum amount that the "
+"project is allowed to own for each type of resource."
+msgstr "点击资源页。该页列出了项目当前可拥有的各类资源的最大数量。"
+
+# 377294f3a42a43a999012d03f8a8b597
+#: ../../projects.rst:189
+msgid "Type new values for one or more resources."
+msgstr "为一种或几种资源输入新值。"
+
+# f06ce2b89f93487fa0db0d0e2ed73010
+#: ../../projects.rst:193
+msgid "Click Apply."
+msgstr "点击应用"
+
+# fc06488e3bd144ca8880e6ba61597186
+#: ../../projects.rst:196
+msgid "Setting the Global Project Resource Limits"
+msgstr "设置全局项目资源限制"
+
+# eea9b416069044c3becc63d3cf1c0ec8
+#: ../../projects.rst:208
+msgid "In the search box, type max.projects and click the search button."
+msgstr "在搜索栏输入“max.projects”,点击搜索按钮。"
+
+# e79a2857cdc6415ba97f2f86f7bd6554
+#: ../../projects.rst:212
+msgid ""
+"In the search results, you will see the parameters you can use to set per-"
+"project maximum resource amounts that apply to all projects in the cloud. No"
+" project can have more resources, but an individual project can have lower "
+"limits. Click the edit button to set each parameter. |Edits parameters|"
+msgstr "在搜索结果中,你可以看到应用于云中所有项目的参数,你可以使用它们设置每个项目的最大资源量。没有项目能拥有更多资源,但个人项目能拥有更低的限制。点击编辑按钮设置每个参数。|编辑参数|"
+
+# 6e812cacf6d14e8e807f46917624f35f
+#: ../../projects.rst:219
+msgid "max.project.public.ips"
+msgstr "max.project.public.ips"
+
+# da5c017dd916441d9d3b2792817c5613
+#: ../../projects.rst:219
+msgid ""
+"Maximum number of public IP addresses that can be owned by any project in "
+"the cloud. See About Public IP Addresses."
+msgstr "项目拥有的公共IP最大值,参看公共IP地址。"
+
+# 8a932c5b2bd34eba920c199d51470ec8
+#: ../../projects.rst:221
+msgid "max.project.snapshots"
+msgstr "max.project.snapshots"
+
+# e0f8e4a312f84a2f8542b47a377dd24f
+#: ../../projects.rst:221
+msgid ""
+"Maximum number of snapshots that can be owned by any project in the cloud. "
+"See Working with Snapshots."
+msgstr "项目可拥有的最大快照数。参看工作相关快照。"
+
+# 431c5b5e8e264582892facf6880e9951
+#: ../../projects.rst:223
+msgid "max.project.templates"
+msgstr "max.project.templates"
+
+# 45cde451730948709fd14e0b55fb40e7
+#: ../../projects.rst:223
+msgid ""
+"Maximum number of templates that can be owned by any project in the cloud. "
+"See Working with Templates."
+msgstr "项目可拥有的最大模板数。参看工作相关模板。"
+
+# 17a84045548846f9a724dbd78157ebfc
+#: ../../projects.rst:225
+msgid "max.project.uservms"
+msgstr "max.project.uservms"
+
+# 79b0c584853c4ecabdd05360221386b1
+#: ../../projects.rst:225
+msgid ""
+"Maximum number of guest virtual machines that can be owned by any project in"
+" the cloud. See Working With Virtual Machines."
+msgstr "项目中的虚拟客户机最大数目。参看工作相关虚拟机。"
+
+# 2fc2b4f5105c478aa53ee2ceac77ed2d
+#: ../../projects.rst:227
+msgid "max.project.volumes"
+msgstr "max.project.volumes"
+
+# dbbaa5b0e13f433daa843baa8ba11ef0
+#: ../../projects.rst:227
+msgid ""
+"Maximum number of data volumes that can be owned by any project in the "
+"cloud. See Working with Volumes."
+msgstr "项目中所拥有的最大数据卷数,参看工作相关卷。"
+
+# ded6bd843e2d4da3b3cbea4b6e6e67b9
+# 66cc93245d2245048ac8307dc1a301a7
+#: ../../projects.rst:233 ../../projects.rst:269
+msgid "Restart the Management Server."
+msgstr "重启管理服务器。"
+
+# 5b42647462274807a1965dc0029da27a
+#: ../../projects.rst:240
+msgid "Setting Project Creator Permissions"
+msgstr "设置项目创建许可"
+
+# c765613d284d4a0082d7160251dd41be
+#: ../../projects.rst:242
+msgid ""
+"You can configure CloudStack to allow any user to create a new project, or "
+"you can restrict that ability to just CloudStack administrators."
+msgstr "你可以配置 CloudStack允许所有用户创建新项目,或限制只有 CloudStack管理员具备此项能力。"
+
+# f6602a33555b433a830a6b097b1ff61b
+#: ../../projects.rst:255
+msgid "In the search box, type allow.user.create.projects."
+msgstr "在搜索框中,输入allow.user.create.projects。"
+
+# 4dc7f063937846acbbc2bac848eea8e7
+#: ../../projects.rst:259
+msgid "Click the edit button to set the parameter. |Edits parameters|"
+msgstr "点击编辑按钮设置参数。|编辑参数|"
+
+# c9261ba2ed0b4744ab1243277e32403d
+#: ../../projects.rst:261
+msgid "``allow.user.create.projects``"
+msgstr "``allow.user.create.projects``"
+
+# d73414f42c874e149977ebf7c3b11c03
+#: ../../projects.rst:263
+msgid ""
+"Set to true to allow end users to create projects. Set to false if you want "
+"only the CloudStack root administrator and domain administrators to create "
+"projects."
+msgstr "设置为true以允许端用户创建项目。设置为false如果你仅希望CloudStack根管理员和域管理员创建项目。"
+
+# 4f31fe2326b349c4a4a0c41ec1f748ca
+#: ../../projects.rst:276
+msgid "Creating a New Project"
+msgstr "创建新项目"
+
+# dbbe4802a063414a8f3778e4576f48fa
+#: ../../projects.rst:278
+msgid ""
+"CloudStack administrators and domain administrators can create projects. If "
+"the global configuration parameter allow.user.create.projects is set to "
+"true, end users can also create projects."
+msgstr "CloudStack系统管理员和域管理员能创建项目。如果全局变量allow.user.create.projects设置为true,终端用户也能创建项目。"
+
+# 47b3864aa6d54f7fae412da1457ede31
+#: ../../projects.rst:292
+msgid "In Select view, click Projects."
+msgstr "在选择视图点击项目。"
+
+# 06db7f55a8214e2aafc54a6e3a929f7e
+#: ../../projects.rst:296
+msgid "Click New Project."
+msgstr "点击新建项目。"
+
+# 5a92979634d04809b092a53588a2832c
+#: ../../projects.rst:300
+msgid ""
+"Give the project a name and description for display to users, then click "
+"Create Project."
+msgstr "为项目命名并添加描述,然后点击创建项目。"
+
+# be4b535a0eeb4adeb755ba434174363e
+#: ../../projects.rst:305
+msgid ""
+"A screen appears where you can immediately add more members to the project. "
+"This is optional. Click Next when you are ready to move on."
+msgstr "会出现一个界面,你可以很快的添加更多成员到项目中,此步可选。当你准备好继续,点击下一步。"
+
+# 1e1be88b7c5f4a09b90d20bfca41edef
+#: ../../projects.rst:310
+msgid "Click Save."
+msgstr "点击保存。"
+
+# f82e929271254a2098fe664b6ff55d7e
+#: ../../projects.rst:313
+msgid "Adding Members to a Project"
+msgstr "添加成员到一个项目"
+
+# a679fdf88f23474d8afc7b0e89bd8a51
+#: ../../projects.rst:315
+msgid ""
+"New members can be added to a project by the project’s administrator, the "
+"domain administrator of the domain where the project resides or any parent "
+"domain, or the CloudStack root administrator. There are two ways to add "
+"members in CloudStack, but only one way is enabled at a time:"
+msgstr "项目管理员、项目所属域的域及其父域的管理员,CloudStack根管理员均可以添加新成员。CloudStack有两种方法可以添加成员,但每次只能使能一种:"
+
+# 74aecd6a087a48be839f6622b7f3892c
+#: ../../projects.rst:322
+msgid ""
+"If invitations have been enabled, you can send invitations to new members."
+msgstr "如果邀请已被使能,你可以向新成员发送邀请。"
+
+# 603f27d1e5c8405c9efe510b46ab7b7f
+#: ../../projects.rst:327
+msgid ""
+"If invitations are not enabled, you can add members directly through the UI."
+msgstr "如果邀请未被使能,你可以直接通过界面添加成员。"
+
+# 0e892bc8a32b43db88e038ec91657312
+#: ../../projects.rst:331
+msgid "Sending Project Membership Invitations"
+msgstr "发送项目成员关系邀请"
+
+# 7fd41724933444dfa0a953c08adef46f
+#: ../../projects.rst:333
+msgid ""
+"Use these steps to add a new member to a project if the invitations feature "
+"is enabled in the cloud as described in `“Setting Up Invitations” <#setting-"
+"up-invitations>`_. If the invitations feature is not turned on, use the "
+"procedure in Adding Project Members From the UI."
+msgstr "如果邀请特性按照 `“设置邀请” <#设置邀请>`_中描述的方式被打开,使用这些步骤添加项目成员。如果邀请特性没有被打开,使用在界面中添加项目成员的步骤。"
+
+# ab8eab012c1c46558116b894236d4acd
+# d17de13b68524c69844a16c4ec2ef3dc
+# f937e69d5f634f2b96d6b69d791209f1
+# e58a8b357c2440d59cc5b79658819db2
+# fd54a0c1ae01474399367ebad870a931
+#: ../../projects.rst:340 ../../projects.rst:403 ../../projects.rst:436
+#: ../../projects.rst:475 ../../projects.rst:508
+msgid "Log in to the CloudStack UI."
+msgstr "登录到CloudStack的界面"
+
+# 1c6df4d955aa45b0a8eeccfc609dbe5e
+#: ../../projects.rst:356
+msgid "Click the Invitations tab."
+msgstr "点击邀请标签。"
+
+# 04a835998d1744649bbcc446b137cc60
+#: ../../projects.rst:360
+msgid "In Add by, select one of the following:"
+msgstr "在添加中,选择以下其中一个:"
+
+# f0869811271a46ad85946e7171508993
+#: ../../projects.rst:364
+msgid ""
+"Account – The invitation will appear in the user’s Invitations tab in the "
+"Project View. See Using the Project View."
+msgstr "帐户 – 邀请将出现在用户项目概览的邀请标签中。参见使用项目概览。"
+
+# 4ff28b50b45840dfbcf018e083b596dd
+#: ../../projects.rst:369
+msgid ""
+"Email – The invitation will be sent to the user’s email address. Each "
+"emailed invitation includes a unique code called a token which the recipient"
+" will provide back to CloudStack when accepting the invitation. Email "
+"invitations will work only if the global parameters related to the SMTP "
+"server have been set. See `“Setting Up Invitations” <#setting-up-"
+"invitations>`_."
+msgstr "邮件 – 邀请将发送到用户的邮箱地址。每个被发送的邀请中包含一个唯一的编码,称为令牌,当接收者接受邀请时需要向 CloudStack提供此令牌。只有当SMTP服务器相关的参数设置完毕后,邮件邀请才能工作。参见`“设置邀请” <#setting-up-invitations>`_。"
+
+# 63d8234ccb564cb8b2ae520c348847a3
+#: ../../projects.rst:378
+msgid ""
+"Type the user name or email address of the new member you want to add, and "
+"click Invite. Type the CloudStack user name if you chose Account in the "
+"previous step. If you chose Email, type the email address. You can invite "
+"only people who have an account in this cloud within the same domain as the "
+"project. However, you can send the invitation to any email address."
+msgstr "输入想要添加的新用户的用户名称或邮件地址,点击邀请。如果你在前述步骤中选择了帐户那么输入CloudStack用户名。如果你选择了邮箱,那么输入邮箱地址,你只能邀请在云中拥有帐户并在与项目组同一域中的用户。然而,你可以向任何邮箱发送邀请。"
+
+# 19f5e2f979fe4a5383fc1f1c74c80de5
+#: ../../projects.rst:387
+msgid ""
+"To view and manage the invitations you have sent, return to this tab. When "
+"an invitation is accepted, the new member will appear in the project’s "
+"Accounts tab."
+msgstr "为了浏览和管理你所发送的邀请,返回到这个标签。当邀请被接受,新成员将显示在项目帐户标签中。"
+
+# 1fa9fdb999824b16a8885fa6f2bf6991
+#: ../../projects.rst:392
+msgid "Adding Project Members From the UI"
+msgstr "在界面中添加项目成员"
+
+# 634e76a61668495986d87f58b48cde1d
+#: ../../projects.rst:394
+msgid ""
+"The steps below tell how to add a new member to a project if the invitations"
+" feature is not enabled in the cloud. If the invitations feature is enabled "
+"cloud,as described in `“Setting Up Invitations” <#setting-up-invitations>`_,"
+" use the procedure in `“Sending Project Membership Invitations” <#sending-"
+"project-membership-invitations>`_."
+msgstr "下面的步骤介绍在邀请特性未使能的情况下如何添加项目新成员。如果邀请特性已按照 `“设置邀请” <#设置邀请>`_在云中被使能,那么使用 `“发送项目成员关系邀请” <#发送项目成员关系邀请>`_中的步骤。"
+
+# d44716d4ee4e46fa9f638bdba1e07897
+#: ../../projects.rst:419
+msgid "Click the Accounts tab. The current members of the project are listed."
+msgstr "点击项目按钮,项目目前的成员将被列表显示。"
+
+# 22d34b290b0c4607ac5e2221ebac3bbc
+#: ../../projects.rst:424
+msgid ""
+"Type the account name of the new member you want to add, and click Add "
+"Account. You can add only people who have an account in this cloud and "
+"within the same domain as the project."
+msgstr "输入你想添加的新成员帐户名称,点击添加帐户。你只能添加云中已有并与项目存在于相同域中的帐户。"
+
+# ab0d3f71202f43279a22b257c03087ae
+#: ../../projects.rst:429
+msgid "Accepting a Membership Invitation"
+msgstr "接受成员关系邀请"
+
+# 8309e8995eed453fb95cf80c4cea509f
+#: ../../projects.rst:431
+msgid ""
+"If you have received an invitation to join a CloudStack project, and you "
+"want to accept the invitation, follow these steps:"
+msgstr "如果你收到了一个加入CloudStack项目的邀请,并希望接受邀请,请按照以下步骤:"
+
+# dfd6ae68c1d44dfabcd5ae024c877dc2
+#: ../../projects.rst:444
+msgid "In Select View, choose Invitations."
+msgstr "在选择概览,选择邀请。"
+
+# 46164e28428f49768e3cd8860f3cb439
+#: ../../projects.rst:448
+msgid "If you see the invitation listed onscreen, click the Accept button."
+msgstr "如果你看到有邀请列表显示,点击接受按钮。"
+
+# baf85cb1c1ff401cb2a3841fe19a942d
+#: ../../projects.rst:450
+msgid ""
+"Invitations listed on screen were sent to you using your CloudStack account "
+"name."
+msgstr "屏幕上所显示的邀请是通过你的CloudStack帐户发送的。"
+
+# 8d5865ebea1549d59a145350dc2b3952
+#: ../../projects.rst:455
+msgid ""
+"If you received an email invitation, click the Enter Token button, and "
+"provide the project ID and unique ID code (token) from the email."
+msgstr "如果你收到的是邮件邀请,点击输入令牌按钮,提供邮件中的项目ID和唯一的ID编码(令牌)。"
+
+# 4a85d989928541aab9af1ccc90a5794b
+#: ../../projects.rst:459
+msgid "Suspending or Deleting a Project"
+msgstr "挂起或删除项目"
+
+# 4e16261095b34918ba0f7facf7d49929
+#: ../../projects.rst:461
+msgid ""
+"When a project is suspended, it retains the resources it owns, but they can "
+"no longer be used. No new resources or members can be added to a suspended "
+"project."
+msgstr "当项目被挂起,它仍保有资源,但这些资源不能被使用。新资源及用户不能被加入到挂起的项目。"
+
+# dc1c27af896441cdaff303fd1de7ce72
+#: ../../projects.rst:465
+msgid ""
+"When a project is deleted, its resources are destroyed, and member accounts "
+"are removed from the project. The project’s status is shown as Disabled "
+"pending final deletion."
+msgstr "当项目被删除,资源将被销毁,成员帐户也从项目中移除。项目状态被显示为禁止有待最后删除。"
+
+# 3e9689a8c42d43bea8d3b9f43e864c27
+#: ../../projects.rst:469
+msgid ""
+"A project can be suspended or deleted by the project administrator, the "
+"domain administrator of the domain the project belongs to or of its parent "
+"domain, or the CloudStack root administrator."
+msgstr "项目可以被管理员,项目所属的域及其父域管理员, CloudStack根管理员挂起或删除,"
+
+# e8fcc307b2884e06b36d29645a62c82e
+#: ../../projects.rst:487
+msgid "Click the name of the project."
+msgstr "点击项目名称。"
+
+# 3965fce7975340e7aab2ac78894779e7
+#: ../../projects.rst:491
+msgid "Click one of the buttons:"
+msgstr "点击以下按钮:"
+
+# 938e8e59daac4c85b9e048a0e4e99cae
+#: ../../projects.rst:493
+msgid "To delete, use |Removes a project|"
+msgstr "使用 |移除项目|进行删除"
+
+# ad49c8cc9be44347b55fd52a48faa40e
+#: ../../projects.rst:495
+msgid "To suspend, use |Suspends a project|"
+msgstr "使用 |挂起项目|进行挂起"
+
+# e6bc94fded454cffa079596ee3bb9de3
+#: ../../projects.rst:498
+msgid "Using the Project View"
+msgstr "使用项目概览"
+
+# 5c0b41ab2f25497fa3c7d8885e2f8cbe
+#: ../../projects.rst:500
+msgid ""
+"If you are a member of a project, you can use CloudStack’s project view to "
+"see project members, resources consumed, and more. The project view shows "
+"only information related to one project. It is a useful way to filter out "
+"other information so you can concentrate on a project status and resources."
+msgstr "如果你是项目成员,你可以通过CloudStack项目概览查看项目成员,资源消耗等。项目概览仅显示与一个项目相关的信息,从众多信息中筛选出项目状态及资源,这是种有效的方法。"
+
+# 15a80877953d4c038b0f23ac0009926f
+#: ../../projects.rst:512
+msgid "Click Project View."
+msgstr "点击项目概览。"
+
+# 4f00f96f109c4bd599ef4857858b521a
+#: ../../projects.rst:516
+msgid ""
+"The project dashboard appears, showing the project’s VMs, volumes, users, "
+"events, network settings, and more. From the dashboard, you can:"
+msgstr "出现项目控制板,显示项目VM,卷,用户,事件,网络设置等,在控制板中,你可以:"
+
+# 42a09e087518479a95c5a4fc8d19644c
+#: ../../projects.rst:522
+msgid ""
+"Click the Accounts tab to view and manage project members. If you are the "
+"project administrator, you can add new members, remove members, or change "
+"the role of a member from user to admin. Only one member at a time can have "
+"the admin role, so if you set another user’s role to admin, your role will "
+"change to regular user."
+msgstr "点击帐户按钮浏览和管理项目成员。如果你是项目管理员,你可以添加新成员,或者将成员从用户改为管理员。每次只有一名成员能成为管理员,如果你将另外的用户设置为管理员,你将成为普通用户。"
+
+# 78a58c1149b14d5db4cc9f586ef7ec59
+#: ../../projects.rst:531
+msgid ""
+"(If invitations are enabled) Click the Invitations tab to view and manage "
+"invitations that have been sent to new project members but not yet accepted."
+" Pending invitations will remain in this list until the new member accepts, "
+"the invitation timeout is reached, or you cancel the invitation."
+msgstr "(如果邀请已被使能)点击邀请按钮来浏览或管理已经想新项目成员发出未被接受的邀请。有待确认的邀请将一直在列表中知道被新成员接受,或邀请时间超时,或你取消了邀请。"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/reliability.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/reliability.po b/source/locale/zh_CN/LC_MESSAGES/reliability.po
new file mode 100644
index 0000000..f0c8643
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/reliability.po
@@ -0,0 +1,486 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# renoshen <sh...@sinosig.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-26 08:46+0000\n"
+"Last-Translator: renoshen <sh...@sinosig.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 42f93e7b838b4f629ef21f938464dbc1
+#: ../../reliability.rst:18
+msgid "System Reliability and High Availability"
+msgstr "系统可靠性与高可用性"
+
+# d4f935885bde4f5fa5bd434efc73f99d
+#: ../../reliability.rst:21
+msgid "HA for Management Server"
+msgstr "管理服务器的HA"
+
+# e5b86e788b984534a8773e9b0e137860
+#: ../../reliability.rst:23
+msgid ""
+"The CloudStack Management Server should be deployed in a multi-node "
+"configuration such that it is not susceptible to individual server failures."
+" The Management Server itself (as distinct from the MySQL database) is "
+"stateless and may be placed behind a load balancer."
+msgstr "CloudStack管理服务器可以部署为多节点的配置,使得它不容易受到单个服务器故障影响。管理服务器(不同于MySQL数据库)本身是无状态的,可以被部署在负载均衡设备后面。"
+
+# 931b292dc1f74dbd9e98310a33755f2e
+#: ../../reliability.rst:28
+msgid ""
+"Normal operation of Hosts is not impacted by an outage of all Management "
+"Serves. All guest VMs will continue to work."
+msgstr "停止的所有管理服务不会影响主机的正常操作。所有来宾VM将继续工作。"
+
+# 53c840831c6a4a97abe49f13dd6971fe
+#: ../../reliability.rst:31
+msgid ""
+"When the Management Server is down, no new VMs can be created, and the end "
+"user and admin UI, API, dynamic load distribution, and HA will cease to "
+"work."
+msgstr "当管理主机下线后,不能创建新的VMs、最终用户,管理UI、API、动态负载以及HA都将停止工作。"
+
+# e2cde8cb07bc44a6910e13f99d712af1
+#: ../../reliability.rst:36
+msgid "Management Server Load Balancing"
+msgstr "管理服务器负载均衡"
+
+# 40b039f7bb73453883a04bd362d24d0f
+#: ../../reliability.rst:38
+msgid ""
+"CloudStack can use a load balancer to provide a virtual IP for multiple "
+"Management Servers. The administrator is responsible for creating the load "
+"balancer rules for the Management Servers. The application requires "
+"persistence or stickiness across multiple sessions. The following chart "
+"lists the ports that should be load balanced and whether or not persistence "
+"is required."
+msgstr "CloudStack可以使用负载均衡器为多管理服务器提供一个虚拟IP。管理员负责创建管理服务器的负载均衡规则。应用程序需要跨多个持久性或stickiness的会话。下表列出了需要进行负载平衡的端口和是否有持久性要求。"
+
+# 8245b999edf543b8b855b4b82d1265b2
+#: ../../reliability.rst:45
+msgid "Even if persistence is not required, enabling it is permitted."
+msgstr "即使不需要持久性,也使它是允许的。"
+
+# b04bd18b0d6a453da2ac167e9125242a
+#: ../../reliability.rst:48
+msgid "Source Port"
+msgstr "源端口"
+
+# ebb2d9d219f340f4b0093d48ed13ae6a
+#: ../../reliability.rst:48
+msgid "Destination Port"
+msgstr "目标端口"
+
+# 31d3c75bdca44069961fd1d368c585ce
+#: ../../reliability.rst:48
+msgid "Protocol"
+msgstr "协议"
+
+# 39f21fee6f9a4961bb1505eeb987cb10
+#: ../../reliability.rst:48
+msgid "Persistence Required?"
+msgstr "持续请求"
+
+# 8d5dca5870cd499b8c812aaec487689f
+#: ../../reliability.rst:50
+msgid "80 or 443"
+msgstr "80或者443"
+
+# 288469eaaf774c19a13c8fe7c98b96f9
+#: ../../reliability.rst:50
+msgid "8080 (or 20400 with AJP)"
+msgstr "8080 (或者 20400 with AJP)"
+
+# dbee0ed7df2d4c69966a3470fcda672d
+#: ../../reliability.rst:50
+msgid "HTTP (or AJP)"
+msgstr "HTTP (或者AJP)"
+
+# 93f39d72b22a47079b7592a8cae8c45f
+# f3f32f1a6d394b3fa117251394a644fb
+#: ../../reliability.rst:50 ../../reliability.rst:51
+msgid "Yes"
+msgstr "支持"
+
+# c0aabddc4c074140b57cb568da9e53b3
+# 8fd23a1c5df9479d9afd5712e0002a06
+#: ../../reliability.rst:51 ../../reliability.rst:51
+msgid "8250"
+msgstr "8250"
+
+# 85c5e2e6a7fd4b50bd15b6abcaa54b68
+#: ../../reliability.rst:51
+msgid "TCP"
+msgstr "TCP"
+
+# af8641ff7dea44debac63cb552e1eba2
+# 0400986df3d04ae68ba993a8b0e52af9
+#: ../../reliability.rst:52 ../../reliability.rst:52
+msgid "8096"
+msgstr "8096"
+
+# 163b9f4609284288aa510edc22883546
+#: ../../reliability.rst:52
+msgid "HTTP"
+msgstr "HTTP"
+
+# 0e1c03c950fe4e3e858d6bb9a5fc20d2
+#: ../../reliability.rst:52
+msgid "No"
+msgstr "不支持"
+
+# c0703d8275f042169efecb8f1c34e24e
+#: ../../reliability.rst:55
+msgid ""
+"In addition to above settings, the administrator is responsible for setting "
+"the 'host' global config value from the management server IP to load "
+"balancer virtual IP address. If the 'host' value is not set to the VIP for "
+"Port 8250 and one of your management servers crashes, the UI is still "
+"available but the system VMs will not be able to contact the management "
+"server."
+msgstr "除了上面的设置,管理员还负责设置‘host’全局配置值,由管理服务器IP地址更改为负载均衡虚拟IP地址。如果‘host’值未设置为VIP的8250端口并且一台管理服务器崩溃时,用户界面依旧可用,但系统虚拟机将无法与管理服务器联系。"
+
+# 1d47e0a3a4304c5688d0eab5f738a7d1
+#: ../../reliability.rst:63
+msgid "HA-Enabled Virtual Machines"
+msgstr "启用了HA的虚拟机"
+
+# 988f2b0a1cee49ad8e2adff19be0e125
+# 949f6e66114f428586d4157ff19ae45f
+#: ../../reliability.rst:65 ../../reliability.rst:81
+msgid ""
+"The user can specify a virtual machine as HA-enabled. By default, all "
+"virtual router VMs and Elastic Load Balancing VMs are automatically "
+"configured as HA-enabled. When an HA-enabled VM crashes, CloudStack detects "
+"the crash and restarts the VM automatically within the same Availability "
+"Zone. HA is never performed across different Availability Zones. CloudStack "
+"has a conservative policy towards restarting VMs and ensures that there will"
+" never be two instances of the same VM running at the same time. The "
+"Management Server attempts to start the VM on another Host in the same "
+"cluster."
+msgstr "用户可以给指定的虚拟机开启高可用特性。默认情况下所有的虚拟路由虚拟机和弹性负载均衡虚拟机自动开启了高可用特性。当CloudStack检测到开启了高可用特性的虚拟机崩溃时将会在相同的可用资源与中自动重新启动该虚拟机。高可用特性不会跨资源域执行。CloudStack采用比较保守的方式重启虚拟机,以确使不会同时运行两个相同的实例。管理服务器会尝试在本集群的另一台主机上开启该虚拟机。"
+
+# 6dfc9dedb8e8424cb2e303f598a5b0ef
+# ceb436b58de14beba4dd06668804afaa
+#: ../../reliability.rst:75 ../../reliability.rst:91
+msgid ""
+"HA features work with iSCSI or NFS primary storage. HA with local storage is"
+" not supported."
+msgstr "高可用特性只在使用iSCSI和NFS做主存储的时候才可以使用。不支持使用本地存储作为主存储的高可用。"
+
+# da466f3482fa41629f951ec50aa2631e
+#: ../../reliability.rst:79
+msgid "HA for Hosts"
+msgstr "主机的HA"
+
+# df16c2c0607a4c61b64c304e0777c42c
+#: ../../reliability.rst:95
+msgid "Dedicated HA Hosts"
+msgstr "专用的HA主机"
+
+# ac98a112bb4a41d6a10c2e9fd2af8886
+#: ../../reliability.rst:97
+msgid ""
+"One or more hosts can be designated for use only by HA-enabled VMs that are "
+"restarting due to a host failure. Setting up a pool of such dedicated HA "
+"hosts as the recovery destination for all HA-enabled VMs is useful to:"
+msgstr "一台或更多台主机可以被设计为只有启用HA的VMs才能使用,这些VMs在主机出现问题的时候会重启。出于灾难恢复目的为所有启用了HA的VMs设置一个像专用HA主机这样的池是有用的:"
+
+# 1d9c1f1284e849da8df6aef8c6b79917
+#: ../../reliability.rst:104
+msgid ""
+"Make it easier to determine which VMs have been restarted as part of the "
+"CloudStack high-availability function. If a VM is running on a dedicated HA "
+"host, then it must be an HA-enabled VM whose original host failed. (With one"
+" exception: It is possible for an administrator to manually migrate any VM "
+"to a dedicated HA host.)."
+msgstr "确定哪些VMs作为CloudStack高可用功能的一部分而重启是比较容易的。如果一个VM正运行在专用的HA主机上,那么它必须是一个启用了HA的,从失败的主机上迁移过来的VM。(有一个例外:它可能是管理员手工迁移过来的任何VM。)。"
+
+# c54e253d01d046bca426de20270f3f89
+#: ../../reliability.rst:112
+msgid ""
+"Keep HA-enabled VMs from restarting on hosts which may be reserved for other"
+" purposes."
+msgstr "出于其他目的,可能保留一些启用了HA的VMs在主机上不要重启。"
+
+# 203f11cbe6f5426c9cbb6c8e066737b4
+#: ../../reliability.rst:115
+msgid ""
+"The dedicated HA option is set through a special host tag when the host is "
+"created. To allow the administrator to dedicate hosts to only HA-enabled "
+"VMs, set the global configuration variable ha.tag to the desired tag (for "
+"example, \"ha\\_host\"), and restart the Management Server. Enter the value "
+"in the Host Tags field when adding the host(s) that you want to dedicate to "
+"HA-enabled VMs."
+msgstr "当创建了主机之后,通过指定一个主机标签来设置专用HA选项。要允许管理员只给启用了HA的VMs制定专用主机,请设置全局配置变量ha.tag为想要的tag(比如, \"ha\\_host\"),并且重启管理服务器。当添加你想给启用HA的VMs配置专用主机(s\n)时,在主机标签区域中输入值。"
+
+# ad8a1db8b7c54f3fbedd9f2ead6994d8
+#: ../../reliability.rst:123
+msgid ""
+"If you set ha.tag, be sure to actually use that tag on at least one host in "
+"your cloud. If the tag specified in ha.tag is not set for any host in the "
+"cloud, the HA-enabled VMs will fail to restart after a crash."
+msgstr "如果你设置ha.tag,请确认在你的云中至少有一台主机真的在使用该标签。如果在ha.tag中没有为云中的任何主机设置指定的标签,那么启用了HA的VMs在崩溃之后不会重启。"
+
+# d286858984534e66a45c79482130eb8a
+#: ../../reliability.rst:126
+msgid "Primary Storage Outage and Data Loss"
+msgstr "主存储故障和数据丢失"
+
+# aa482325b164497797fcc8925e319b83
+#: ../../reliability.rst:128
+msgid ""
+"When a primary storage outage occurs the hypervisor immediately stops all "
+"VMs stored on that storage device. Guests that are marked for HA will be "
+"restarted as soon as practical when the primary storage comes back on line. "
+"With NFS, the hypervisor may allow the virtual machines to continue running "
+"depending on the nature of the issue. For example, an NFS hang will cause "
+"the guest VMs to be suspended until storage connectivity is restored.Primary"
+" storage is not designed to be backed up. Individual volumes in primary "
+"storage can be backed up using snapshots."
+msgstr "当主存储发生故障,hypervisor 立即停止该存储设备上存储的所有虚拟机。客户机被标记为当主存储重新上线时,HA根据实际情况尽快将重新启动。使用NFS时,hypervisor 可以允许虚拟机继续运行,这取决于问题的性质。例如,NFS挂起将导致客户虚拟机暂停,直至恢复存储连接。主存储没有被设计进行备份。在主存储中的单个卷,可以使用快照备份。"
+
+# 33fbc63d82cb4eafb2178c004fb912a1
+#: ../../reliability.rst:139
+msgid "Secondary Storage Outage and Data Loss"
+msgstr "二级存储的故障和数据丢失"
+
+# 2a93ea5d2f0e4da6939e8f13391dad91
+#: ../../reliability.rst:141
+msgid ""
+"For a Zone that has only one secondary storage server, a secondary storage "
+"outage will have feature level impact to the system but will not impact "
+"running guest VMs. It may become impossible to create a VM with the selected"
+" template for a user. A user may also not be able to save snapshots or "
+"examine/restore saved snapshots. These features will automatically be "
+"available when the secondary storage comes back online."
+msgstr "由于一个资源域只有一个二级存储服务器,二级存储的中断将会对系统的一些功能产生影响,但不影响正在运行的客户虚拟机。可能会让用户无法选择模版来创建虚拟机。用户也可能无法保存快照,检查或恢复已保存的快照。当二级存储恢复连接后,这些功能也就可以自动恢复。"
+
+# 0131fdfdae154752be6146df6032f176
+#: ../../reliability.rst:148
+msgid ""
+"Secondary storage data loss will impact recently added user data including "
+"templates, snapshots, and ISO images. Secondary storage should be backed up "
+"periodically. Multiple secondary storage servers can be provisioned within "
+"each zone to increase the scalability of the system."
+msgstr "二级存储的数据丢失将会影响最近添加的用户数据,包括模版、快照、和ISO镜像。二级存储应该进行定期备份。为每个资源域提供多个二级存储服务器能够增强系统的可扩展性。"
+
+# 32e946f31bec452b97aee852fdedbfb3
+#: ../../reliability.rst:154
+msgid "Database High Availability"
+msgstr "数据库的高可用"
+
+# 24f4f434b1ce4281b25606d418fccc6a
+#: ../../reliability.rst:156
+msgid ""
+"To help ensure high availability of the databases that store the internal "
+"data for CloudStack, you can set up database replication. This covers both "
+"the main CloudStack database and the Usage database. Replication is achieved"
+" using the MySQL connector parameters and two-way replication. Tested with "
+"MySQL 5.1 and 5.5."
+msgstr "为了确保存储CloudStack内部数据的数据库的高可用性,你可以设置数据库复制。这涉及到所有CloudStack主数据库和用量数据库。复制是指完全使用MySQL连接参数和双向复制。MySQL 5.1和5.5已测试通过。"
+
+# efec316eee4b461987bf261d0d56a86c
+#: ../../reliability.rst:163
+msgid "How to Set Up Database Replication"
+msgstr "如何设置数据库复制"
+
+# 0817e84d25fd413cbd639d20eba36e91
+#: ../../reliability.rst:165
+msgid ""
+"Database replication in CloudStack is provided using the MySQL replication "
+"capabilities. The steps to set up replication can be found in the MySQL "
+"documentation (links are provided below). It is suggested that you set up "
+"two-way replication, which involves two database nodes. In this case, for "
+"example, you might have node1 and node2."
+msgstr "CloudStack中的数据库复制是由MySQL复制功能提供的。设置复制的步骤可在MySQL的文档中找到(链接在下面提供)。它建议你设置双向复制,涉及两个数据库节点。在这个情形下,比如,你可能有node1和node2。"
+
+# fe0744bc687148038eea8aeed5de6c19
+#: ../../reliability.rst:171
+msgid ""
+"You can also set up chain replication, which involves more than two nodes. "
+"In this case, you would first set up two-way replication with node1 and "
+"node2. Next, set up one-way replication from node2 to node3. Then set up "
+"one-way replication from node3 to node4, and so on for all the additional "
+"nodes."
+msgstr "你同样可以设置链式复制,这涉及到多于两个节点。在这个情况下,你可以先设置node1和node2的双向复制。然后,设置node2和node3的单向复制。在设置node3和node4的单向复制,其他所有的节点依次类推。"
+
+# 0384ce5c101a4318a81921b85dd616fb
+#: ../../reliability.rst:177
+msgid "References:"
+msgstr "参考文献:"
+
+# c14908b4a0ea4700ab13002919e09120
+#: ../../reliability.rst:181
+msgid ""
+"`http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html "
+"<http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html>`_"
+msgstr "`http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html <http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html>`_"
+
+# 10b1becde5ca4283b66ab4115c633fcd
+#: ../../reliability.rst:185
+msgid ""
+"`https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server"
+" "
+"<https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server>`_"
+msgstr "`https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server <https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server>`_"
+
+# a1a34eb9cd884a308f39baf29410a2d7
+#: ../../reliability.rst:188
+msgid "Configuring Database High Availability"
+msgstr "配置数据库高可用"
+
+# 037e1ed319cb45afa95431f629bb98f6
+#: ../../reliability.rst:190
+msgid ""
+"To control the database high availability behavior, use the following "
+"configuration settings in the file /etc/cloudstack/management/db.properties."
+msgstr "要控制数据库高可用特性,在/etc/cloudstack/management/db.properties文件中使用以下配置设置。"
+
+# 65be31716ae147b190ef26c95d3f20a7
+#: ../../reliability.rst:194
+msgid "**Required Settings**"
+msgstr "**需求设置**"
+
+# 983f7044f00b474b9377e8715f91f5d6
+#: ../../reliability.rst:196
+msgid "Be sure you have set the following in db.properties:"
+msgstr "确定你在 db.properties中使用了以下设置:"
+
+# 7fcf4985b7104c20b8363c6d5f1b2c5c
+#: ../../reliability.rst:200
+msgid ""
+"``db.ha.enabled``: set to true if you want to use the replication feature."
+msgstr "``db.ha.enabled``:如果你想使用复制功能,请设置为true。"
+
+# e4167706f93b47dc856a1acf6a26bd1b
+#: ../../reliability.rst:203
+msgid "Example: ``db.ha.enabled=true``"
+msgstr "例如:``db.ha.enabled=true``"
+
+# d4ae850e4ab24d3d988e5c2f04454c0f
+#: ../../reliability.rst:207
+msgid ""
+"``db.cloud.slaves``: set to a comma-delimited set of slave hosts for the "
+"cloud database. This is the list of nodes set up with replication. The "
+"master node is not in the list, since it is already mentioned elsewhere in "
+"the properties file."
+msgstr "``db.cloud.slaves``:为云数据库设置多台slave主机,用逗号隔开。这是用于复制的节点清单。主节点不在列表中,因为在属性文件中的别处已经使用了它。"
+
+# 4964061ca5f747aab4d1a379ad79e066
+#: ../../reliability.rst:212
+msgid "Example: ``db.cloud.slaves=node2,node3,node4``"
+msgstr "例如:``db.cloud.slaves=node2,node3,node4``"
+
+# b9de2539c2864fd28ae3e261f396f19f
+#: ../../reliability.rst:216
+msgid ""
+"``db.usage.slaves``: set to a comma-delimited set of slave hosts for the "
+"usage database. This is the list of nodes set up with replication. The "
+"master node is not in the list, since it is already mentioned elsewhere in "
+"the properties file."
+msgstr "``db.usage.slaves``:为用量数据库设置多台slave主机,用逗号隔开。这是用于复制的节点清单。主节点不在列表中,因为在属性文件中的别处已经使用了它。"
+
+# 2a099840b3e046b8b70eb0874e152f0c
+#: ../../reliability.rst:221
+msgid "Example: ``db.usage.slaves=node2,node3,node4``"
+msgstr "例如:``db.usage.slaves=node2,node3,node4``"
+
+# ecbb9cad4a2f4f6b851ab724105cf548
+#: ../../reliability.rst:223
+msgid "**Optional Settings**"
+msgstr "**可选的设置**"
+
+# beb50c0c502942fc93950ab5d64e62e1
+#: ../../reliability.rst:225
+msgid ""
+"The following settings must be present in db.properties, but you are not "
+"required to change the default values unless you wish to do so for tuning "
+"purposes:"
+msgstr "必须在db.properties中提供以下设置,但是你不用改变默认值除非你希望做一些优化:"
+
+# 88199ce67b78476db5890126b9fa443e
+#: ../../reliability.rst:231
+msgid ""
+"``db.cloud.secondsBeforeRetryMaster``: The number of seconds the MySQL "
+"connector should wait before trying again to connect to the master after the"
+" master went down. Default is 1 hour. The retry might happen sooner if "
+"db.cloud.queriesBeforeRetryMaster is reached first."
+msgstr "``db.cloud.secondsBeforeRetryMaster``:在master宕机之后,MySQL连接器重试连接到master之前所等待的秒数。默认是1小时。如果首先达到了db.cloud.queriesBeforeRetryMaster 的限制,重试可能更早发生。"
+
+# a6a0d838e7734aec9c8e8a441d61f582
+#: ../../reliability.rst:236
+msgid "Example: ``db.cloud.secondsBeforeRetryMaster=3600``"
+msgstr "例如:``db.cloud.secondsBeforeRetryMaster=3600``"
+
+# c87ff2e5eef14dc098a850ea37ab8641
+#: ../../reliability.rst:240
+msgid ""
+"``db.cloud.queriesBeforeRetryMaster``: The minimum number of queries to be "
+"sent to the database before trying again to connect to the master after the "
+"master went down. Default is 5000. The retry might happen sooner if "
+"db.cloud.secondsBeforeRetryMaster is reached first."
+msgstr "``db.cloud.queriesBeforeRetryMaster``:在master宕机之后,重新尝试连接到master之前向数据库查询的最小次数。默认值是5000。如果首先达到了db.cloud.secondsBeforeRetryMaster的限制,重试可能更早发生。"
+
+# 3219915768bf4a108afabb00a195ecda
+#: ../../reliability.rst:245
+msgid "Example: ``db.cloud.queriesBeforeRetryMaster=5000``"
+msgstr "例如:``db.cloud.queriesBeforeRetryMaster=5000``"
+
+# b67a476758de4af7b0154ae8360f24cb
+#: ../../reliability.rst:249
+msgid ""
+"``db.cloud.initialTimeout``: Initial time the MySQL connector should wait "
+"before trying again to connect to the master. Default is 3600."
+msgstr "``db.cloud.initialTimeout``:在重新尝试连接至master之前,MySQL连接器等待的初始时间。默认是3600。"
+
+# bfdaf629f4eb48c0ac92eee0b8757ccd
+#: ../../reliability.rst:252
+msgid "Example: ``db.cloud.initialTimeout=3600``"
+msgstr "例如:``db.cloud.initialTimeout=3600``"
+
+# 909b81bf9974499e9cc66b8a3210b542
+#: ../../reliability.rst:255
+msgid "Limitations on Database High Availability"
+msgstr "数据库高可用性的限制"
+
+# d4d81b0c77f7473cbef77ab8ade71f76
+#: ../../reliability.rst:257
+msgid ""
+"The following limitations exist in the current implementation of this "
+"feature."
+msgstr "目前此功能的实现还存在下列限制。"
+
+# d3fd890ab3da46e798aa4e47b67e394f
+#: ../../reliability.rst:262
+msgid ""
+"Slave hosts can not be monitored through CloudStack. You will need to have a"
+" separate means of monitoring."
+msgstr "Slave主机不能被CloudStack监控。你必须有单独的监控手段。"
+
+# 80173b87cb9e44a38c93854d4adcfa19
+#: ../../reliability.rst:267
+msgid ""
+"Events from the database side are not integrated with the CloudStack "
+"Management Server events system."
+msgstr "数据库端的事件没有集成到CloudStack管理服务器事件系统。"
+
+# 2cc19c99cbfa4e3796e358a8b8ea6365
+#: ../../reliability.rst:272
+msgid ""
+"You must periodically perform manual clean-up of bin log files generated by "
+"replication on database nodes. If you do not clean up the log files, the "
+"disk can become full."
+msgstr "你必须定期的执行手动清除由数据库节点复制产生的二进制log文件。如果你不清理log文件,磁盘就会被占满。"


[19/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/storage.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/storage.po b/source/locale/zh_CN/LC_MESSAGES/storage.po
new file mode 100644
index 0000000..dfc19da
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/storage.po
@@ -0,0 +1,1461 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# renoshen <sh...@sinosig.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-15 02:30+0000\n"
+"Last-Translator: renoshen <sh...@sinosig.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 6a202e4741994470b627a504dfaa0ec4
+#: ../../storage.rst:18
+msgid "Working with Storage"
+msgstr "使用存储"
+
+# 162dc01704434bf39297420664b52155
+#: ../../storage.rst:21
+msgid "Storage Overview"
+msgstr "存储概述"
+
+# fb6cf279ed414191933888a05da50e30
+#: ../../storage.rst:23
+msgid ""
+"CloudStack defines two types of storage: primary and secondary. Primary "
+"storage can be accessed by either iSCSI or NFS. Additionally, direct "
+"attached storage may be used for primary storage. Secondary storage is "
+"always accessed using NFS."
+msgstr "CloudStack定义了两种存储:主存储和辅助存储。主存储可以使用iSCSI或NFS协议。另外,直接附加存储可被用于主存储。辅助存储通常使用NFS协议。"
+
+# 3e1682b1378e44d1b6277de404cef6c9
+#: ../../storage.rst:28
+msgid ""
+"There is no ephemeral storage in CloudStack. All volumes on all nodes are "
+"persistent."
+msgstr "CloudStack不支持临时存储。所有节点上的所有卷都是持久存储。"
+
+# 3b158cf365224a128dce4c9bf414bc05
+#: ../../storage.rst:32
+msgid "Primary Storage"
+msgstr "主存储"
+
+# 0182a2b8079342b0b3ceb0b29b179646
+#: ../../storage.rst:34
+msgid ""
+"This section gives concepts and technical details about CloudStack primary "
+"storage. For information about how to install and configure primary storage "
+"through the CloudStack UI, see the Installation Guide."
+msgstr "本章节讲述的是关于CloudStack的主存储概念和技术细节。更多关于如何通过CloudStack UI安装和配置主存储的信息,请参阅安装向导。"
+
+# 6050cb5647774b9191d87c9ac4c7db00
+#: ../../storage.rst:38
+msgid ""
+"`“About Primary Storage” "
+"<http://docs.cloudstack.apache.org/en/latest/concepts.html#about-primary-"
+"storage>`_"
+msgstr "`“关于主存储” <http://docs.cloudstack.apache.org/en/latest/concepts.html#关于主存储>`_"
+
+# 2d5f67decc454f279ad544d95f3a200c
+#: ../../storage.rst:41
+msgid "Best Practices for Primary Storage"
+msgstr "主存储的最佳实践"
+
+# a8e6b6ee46a0407d89434124df4e5829
+#: ../../storage.rst:45
+msgid ""
+"The speed of primary storage will impact guest performance. If possible, "
+"choose smaller, higher RPM drives or SSDs for primary storage."
+msgstr "主存储的速度会直接影响来宾虚机的性能。如果可能,为主存储选择选择容量小,转速高的硬盘或SSDs。"
+
+# 25a499cd8ec24c99bfc6f0391d203d7b
+#: ../../storage.rst:51
+msgid "There are two ways CloudStack can leverage primary storage:"
+msgstr "CloudStack用两种方式使用主存储:"
+
+# 8c344e1829c64653b8c2a3f7fd4340c6
+#: ../../storage.rst:53
+msgid ""
+"Static: This is CloudStack's traditional way of handling storage. In this "
+"model, a preallocated amount of storage (ex. a volume from a SAN) is given "
+"to CloudStack. CloudStack then permits many of its volumes to be created on "
+"this storage (can be root and/or data disks). If using this technique, "
+"ensure that nothing is stored on the storage. Adding the storage to "
+"CloudStack will destroy any existing data."
+msgstr "静态:CloudStack管理存储的传统方式。在这个模式下,要给CloudStack预先分配几个存储(比如一个SAN上的卷)。然后CloudStack在上面创建若干个卷(可以是root和/或者数据盘)。如果使用这种技术,确保存储上没有数据。给CloudStack添加存储会销毁已存在的所有数据。"
+
+# 72b1dbe1653c4bfbb6de406140cd47d5
+#: ../../storage.rst:61
+msgid ""
+"Dynamic: This is a newer way for CloudStack to manage storage. In this "
+"model, a storage system (rather than a preallocated amount of storage) is "
+"given to CloudStack. CloudStack, working in concert with a storage plug-in, "
+"dynamically creates volumes on the storage system and each volume on the "
+"storage system maps to a single CloudStack volume. This is highly useful for"
+" features such as storage Quality of Service. Currently this feature is "
+"supported for data disks (Disk Offerings)."
+msgstr "动态:这是一个比较新的CloudStack管理存储的方式。在这个模式中,给CloudStack使用的是一个存储系统(但不是预分配的存储)。CloudStack配合存储一起工作,动态的在存储系统上创建卷并且存储系统上的每个卷都映射到一个CloudStack卷。这样做非常有利于存储的QoS。目前数据磁盘(磁盘方案)支持这个特性。"
+
+# 0a9a0545d65d499e9e87855b3f653046
+#: ../../storage.rst:71
+msgid "Runtime Behavior of Primary Storage"
+msgstr "主存储的运行时行为"
+
+# c1b7c1df534f487d9b282f9cba881b25
+#: ../../storage.rst:73
+msgid ""
+"Root volumes are created automatically when a virtual machine is created. "
+"Root volumes are deleted when the VM is destroyed. Data volumes can be "
+"created and dynamically attached to VMs. Data volumes are not deleted when "
+"VMs are destroyed."
+msgstr "当创建虚拟机的时候,root卷也会自动的创建。在VM被销毁的时候root卷也会被删除。数据卷可以被创建并动态的挂载到VMs上。VMs销毁时并不会删除数据卷。"
+
+# b55c6963f6704ca899a39303709603e6
+#: ../../storage.rst:78
+msgid ""
+"Administrators should monitor the capacity of primary storage devices and "
+"add additional primary storage as needed. See the Advanced Installation "
+"Guide."
+msgstr "管理员可以监控主存储设备的容量和在需要时添加其他的主存储。强参阅高级安装指导。"
+
+# 0e941196770047709eb7afb942ef3189
+#: ../../storage.rst:82
+msgid ""
+"Administrators add primary storage to the system by creating a CloudStack "
+"storage pool. Each storage pool is associated with a cluster or a zone."
+msgstr "管理员通过CloudStack创建存储池来给系统添加主存储。每个存储池对应一个群集或者区域。"
+
+# 0be8863a4d5c46b1bfa11b79c1a1b407
+#: ../../storage.rst:86
+msgid ""
+"With regards to data disks, when a user executes a Disk Offering to create a"
+" data disk, the information is initially written to the CloudStack database "
+"only. Upon the first request that the data disk be attached to a VM, "
+"CloudStack determines what storage to place the volume on and space is taken"
+" from that storage (either from preallocated storage or from a storage "
+"system (ex. a SAN), depending on how the primary storage was added to "
+"CloudStack)."
+msgstr "对于数据磁盘,当一个用户执行一个磁盘方案来创建数据磁盘的时候,初始化信息就被写到了CloudStack的数据库中。根据第一次给VM附加数据磁盘的请求,CloudStack决定这个卷的位置和空间占用在哪个存储(预分配存储和存储系统(比如SAN)中的任意一种,这取决于CloudStack使用的哪种主存储)。"
+
+# 35ce9d0c83744d748be1f1449258f36c
+#: ../../storage.rst:95
+msgid "Hypervisor Support for Primary Storage"
+msgstr "Hypervisor支持的主存储"
+
+# 31019aa248e34fc6b8039761b2720e7f
+#: ../../storage.rst:97
+msgid ""
+"The following table shows storage options and parameters for different "
+"hypervisors."
+msgstr "下面的表格展示了不同hypervisors所支持的存储类型。"
+
+# 9b771149e496473c92a454c33198c403
+#: ../../storage.rst:101
+msgid "Storage media \\\\ hypervisor"
+msgstr "存储媒介 \\\\ hypervisor"
+
+# e97686c28c974dbf92162b6b0fa942b8
+# bfae9331e42b4e998bdae8c62e3765eb
+#: ../../storage.rst:101 ../../storage.rst:805
+msgid "VMware vSphere"
+msgstr "VMware vSphere"
+
+# 0058e135219d4613a2d541b1870917de
+# 3b343f7b559749a29a430c1a553b3526
+#: ../../storage.rst:101 ../../storage.rst:805
+msgid "Citrix XenServer"
+msgstr "Citrix XenServer"
+
+# 367bf4f20f1c4984924962ff00d6df89
+# 52a52afa13aa4117b06c90af23419b9d
+# edc2d21234584f6a99ca592df4540bbe
+#: ../../storage.rst:101 ../../storage.rst:354 ../../storage.rst:805
+msgid "KVM"
+msgstr "KVM"
+
+# b5679e3e7ee44ad081663d53a59df3e5
+#: ../../storage.rst:101
+msgid "Hyper-V"
+msgstr "Hyper-V"
+
+# 8c6b23cd30df4e11a24b05d287672f22
+#: ../../storage.rst:103
+msgid "**Format for Disks, Templates, and Snapshots**"
+msgstr "**磁盘、模板和快照的格式**"
+
+# 1533db8909654e9dbdee1bfb501c22da
+#: ../../storage.rst:103
+msgid "VMDK"
+msgstr "VMDK"
+
+# aa7a7f57290745ebb004f74e8d93a94c
+# 7d5a6b20bd9c40dd8e2bf7f89defbb4f
+#: ../../storage.rst:103 ../../storage.rst:352
+msgid "VHD"
+msgstr "VHD"
+
+# 857238d5d0894c4195147b0552ef94cc
+# 85858348297d4cb18e06b4f68df7bb9b
+#: ../../storage.rst:103 ../../storage.rst:354
+msgid "QCOW2"
+msgstr "QCOW2"
+
+# 45f3ddfdaf174b0e844873ef2d5609aa
+#: ../../storage.rst:103
+msgid "VHD Snapshots are not supported."
+msgstr "不支持VHD快照。"
+
+# 629dd8794f35435ba0c0de72442d0698
+#: ../../storage.rst:105
+msgid "**iSCSI support**"
+msgstr "**支持iSCSI**"
+
+# df0857bbc10d454694cb27c6368cc385
+# 6cbf7a9a5ccf4c9b8d9cfea376fa936c
+#: ../../storage.rst:105 ../../storage.rst:106
+msgid "VMFS"
+msgstr "VMFS"
+
+# 6356c605eb10407597ce69ae946eded4
+#: ../../storage.rst:105
+msgid "Clustered LVM"
+msgstr "集群化的LVM"
+
+# 54f6f377a0e9433ba6646f2d344089a1
+# e8acf322132f4c1d92c944041a19c61f
+#: ../../storage.rst:105 ../../storage.rst:106
+msgid "Yes, via Shared Mountpoint"
+msgstr "是的,通过Shared Mountpoint"
+
+# d6cf7d4bef014613aaf695ffffe4a235
+# c823d9f7038149b690668fa00379827b
+# 0b59cd2d03ac46529c20eaaab120981c
+# 846a3012c0ae422495176ac15ab15e55
+# d14fff6660d64688afc8ccbcc70cddfd
+# caa33ef9d4a04315a001850c938c31b8
+# 86461019f42a406e8b39a826bc193ed7
+# 5bb1f7b752e345d2b87e7e358be4b8a8
+# e68af722a2d2497aa6f8a8fca2cbdde6
+#: ../../storage.rst:105 ../../storage.rst:106 ../../storage.rst:107
+#: ../../storage.rst:109 ../../storage.rst:110 ../../storage.rst:110
+#: ../../storage.rst:110 ../../storage.rst:807 ../../storage.rst:807
+msgid "No"
+msgstr "不支持"
+
+# 4a312a6b96eb419e9e8f0340e73043c7
+#: ../../storage.rst:106
+msgid "**Fiber Channel support**"
+msgstr "**FC支持**"
+
+# ca35f289a9684c7dbf0aa1d2eec7ea07
+#: ../../storage.rst:106
+msgid "Yes, via Existing SR"
+msgstr "是的,通过已有的SR"
+
+# 50c9535f99f94ba991e8f54be3a35868
+#: ../../storage.rst:107
+msgid "**NFS support**"
+msgstr "**支持NFS**"
+
+# e2c8e01326de420a93da3da1cccc6e04
+# 03b10788ed144cee89bfeb280a91507b
+# 36ec13d7d1104063898e7ee586dc8e73
+# 7b8ce691a5754a2bbe7b77ba4a5beb29
+# 73f105a11ea244348d276ceda77ffa48
+# 8e54d7de196946248fa2f7c5e5e89ed6
+# f03361eae16c40518b6e18d98ee28635
+# 34559af0e0774036a131a78b6b54e924
+# 89b6eb69d35a47eabb875bdf4405e421
+#: ../../storage.rst:107 ../../storage.rst:107 ../../storage.rst:107
+#: ../../storage.rst:108 ../../storage.rst:108 ../../storage.rst:108
+#: ../../storage.rst:108 ../../storage.rst:110 ../../storage.rst:807
+msgid "Yes"
+msgstr "支持"
+
+# 6d3ad498707b47e183038ce5ebb1447d
+#: ../../storage.rst:108
+msgid "**Local storage support**"
+msgstr "**支持本地存储**"
+
+# 858891283fa8498382d9942dc59e2ae6
+#: ../../storage.rst:109
+msgid "**Storage over-provisioning**"
+msgstr "**存储超配**"
+
+# 876ffced6c3f4dd1825a99b39c624759
+#: ../../storage.rst:109
+msgid "NFS and iSCSI"
+msgstr "NFS and iSCSI"
+
+# 34edc60597864cb88c0d3a68161bd014
+# afaccbd5ae404bbf9a2b322b957fc27f
+#: ../../storage.rst:109 ../../storage.rst:109
+msgid "NFS"
+msgstr "NFS"
+
+# 5cdd4df99d8146b99052b26946cfdebc
+#: ../../storage.rst:110
+msgid "**SMB/CIFS**"
+msgstr "**SMB/CIFS**"
+
+# 23cfe36aac394c0183ffe7482f8dcded
+#: ../../storage.rst:113
+msgid ""
+"XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber "
+"Channel volumes and does not support over-provisioning in the hypervisor. "
+"The storage server itself, however, can support thin-provisioning. As a "
+"result the CloudStack can still support storage over-provisioning by running"
+" on thin-provisioned storage volumes."
+msgstr "XenServer通过在iSCSI和FC卷上使用集群化的LVM系统来存储VM镜像,并且不支持存储超配。尽管存储本身支持自动精简配置。不过CloudStack仍然支持在有自动精简配置的存储卷上使用存储超配。"
+
+# bd46a0f32fc0459fadf89598bd0b9f7b
+#: ../../storage.rst:119
+msgid ""
+"KVM supports \"Shared Mountpoint\" storage. A shared mountpoint is a file "
+"system path local to each server in a given cluster. The path must be the "
+"same across all Hosts in the cluster, for example /mnt/primary1. This shared"
+" mountpoint is assumed to be a clustered filesystem such as OCFS2. In this "
+"case the CloudStack does not attempt to mount or unmount the storage as is "
+"done with NFS. The CloudStack requires that the administrator insure that "
+"the storage is available"
+msgstr "KVM支持 \"Shared Mountpoint\"存储。Shared Mountpoint是群集中每个服务器本地文件系统中的一个路径。群集中所有主机上的这个路径必须一致,比如/mnt/primary1。假设Shared Mountpoint是一个集群文件系统如OCFS2。在这种情况下,CloudStack不会把它当做NFS存储去尝试挂载或卸载。CloudStack需要管理员保证存储时可用的。"
+
+# 5ab2d028f0aa4897b165fb8e42dbb0e4
+#: ../../storage.rst:127
+msgid ""
+"With NFS storage, CloudStack manages the overprovisioning. In this case the "
+"global configuration parameter storage.overprovisioning.factor controls the "
+"degree of overprovisioning. This is independent of hypervisor type."
+msgstr "在NFS存储中,CloudStack负责超配置。这种情况下,全局配置参数storage.overprovisioning.factor来控制超配的范围。这取决于hyperviso类型。"
+
+# 585fda9b393848eaa23c3131967805fe
+#: ../../storage.rst:132
+msgid ""
+"Local storage is an option for primary storage for vSphere, XenServer, and "
+"KVM. When the local disk option is enabled, a local disk storage pool is "
+"automatically created on each host. To use local storage for the System "
+"Virtual Machines (such as the Virtual Router), set "
+"system.vm.use.local.storage to true in global configuration."
+msgstr "在vSphere, XenServer和KVM中,本地存储是一个可选项。当选择了使用本地存储,所有主机上会自动创建本地存储资源池。要让System Virtual Machines (如the Virtual Router)使用本地存储,请设置全局配置中的system.vm.use.local.storage为true."
+
+# c4c43cee4d724ef7aa505614fe3cedba
+#: ../../storage.rst:138
+msgid ""
+"CloudStack supports multiple primary storage pools in a Cluster. For "
+"example, you could provision 2 NFS servers in primary storage. Or you could "
+"provision 1 iSCSI LUN initially and then add a second iSCSI LUN when the "
+"first approaches capacity."
+msgstr "CloudStack支持在一个群集内有多个主存储池。比如,有2个NFS服务器提供主存储。或原来有1个iSCSI LUN后来又添加了第二个iSCSI LUN。"
+
+# 235339683cb34f9984c233974b8da43d
+#: ../../storage.rst:144
+msgid "Storage Tags"
+msgstr "存储标签"
+
+# c9a9cdbd754642189859f3f96cfebe95
+#: ../../storage.rst:146
+msgid ""
+"Storage may be \"tagged\". A tag is a text string attribute associated with "
+"primary storage, a Disk Offering, or a Service Offering. Tags allow "
+"administrators to provide additional information about the storage. For "
+"example, that is a \"SSD\" or it is \"slow\". Tags are not interpreted by "
+"CloudStack. They are matched against tags placed on service and disk "
+"offerings. CloudStack requires all tags on service and disk offerings to "
+"exist on the primary storage before it allocates root or data disks on the "
+"primary storage. Service and disk offering tags are used to identify the "
+"requirements of the storage that those offerings have. For example, the high"
+" end service offering may require \"fast\" for its root disk volume."
+msgstr "存储是可以被\"标签\"的。标签是与主存储、磁盘方案或服务方案关联的字符串属性。标签允许管理员给存储添加额外的信息。比如\"SSD\"或者\"慢速\"。CloudStack不负责解释标签。它不会匹配服务和磁盘方案的标签。CloudStack要求在主存储上分配root或数据磁盘之前,所有服务和磁盘方案的都已存在对应的标签。服务和磁盘方案的标签被用于识别方案对存储的要求。比如,高端服务方案可能需要它的root磁盘卷是\"快速的\""
+
+# 62e869476add4ac8a88d34476a992a0b
+#: ../../storage.rst:158
+msgid ""
+"The interaction between tags, allocation, and volume copying across clusters"
+" and pods can be complex. To simplify the situation, use the same set of "
+"tags on the primary storage for all clusters in a pod. Even if different "
+"devices are used to present those tags, the set of exposed tags can be the "
+"same."
+msgstr "标签,分配,跨集群或机架的卷复制之间的关系是很复杂的。简单的环境就是在一个机架内所有集群的主存储使用相同的标签。即使用这些标签表示不同设备,展现出来的标签组仍可以是一样的。"
+
+# 85d0b9514cd94531b80bb8458c5ce0dc
+#: ../../storage.rst:165
+msgid "Maintenance Mode for Primary Storage"
+msgstr "主存储的维护模式"
+
+# 51dcf6eb4eec44809e6e374dbf77c6bf
+#: ../../storage.rst:167
+msgid ""
+"Primary storage may be placed into maintenance mode. This is useful, for "
+"example, to replace faulty RAM in a storage device. Maintenance mode for a "
+"storage device will first stop any new guests from being provisioned on the "
+"storage device. Then it will stop all guests that have any volume on that "
+"storage device. When all such guests are stopped the storage device is in "
+"maintenance mode and may be shut down. When the storage device is online "
+"again you may cancel maintenance mode for the device. The CloudStack will "
+"bring the device back online and attempt to start all guests that were "
+"running at the time of the entry into maintenance mode."
+msgstr "主存储可以被设置成维护模式。这很有用,例如,替换存储设备中坏的RAM。对存储设备的维护模式将首先停止任何新的来自预处理的来宾虚机,然后停止所有有数据卷的来宾虚机。当所有来宾虚机被停止的时候,这个存储设备就进入维护模式了并且可以关机。当存储设备再次上线的时候,你可以对这个设备取消维护模式。CloudStack将返回在线状态并且试着启动所有曾在这个设备进入维护模式前运行的来宾机器。"
+
+# 50c6445f7bbf459c8184fcbee613ef51
+#: ../../storage.rst:179
+msgid "Secondary Storage"
+msgstr "辅助存储"
+
+# 93e8dd0aa2384174bfaff80a3205b6cb
+#: ../../storage.rst:181
+msgid ""
+"This section gives concepts and technical details about CloudStack secondary"
+" storage. For information about how to install and configure secondary "
+"storage through the CloudStack UI, see the Advanced Installation Guide."
+msgstr "本章节讲述的是关于CloudStack的辅助存储概念和技术细节。更多关于如何通过CloudStack UI安装和配置主存储的信息,请参阅高级安装向导。"
+
+# 18793cf034ab43f1b77b289ac9d4286b
+#: ../../storage.rst:186
+msgid ""
+"`“About Secondary Storage” "
+"<http://docs.cloudstack.apache.org/en/latest/concepts.html#about-secondary-"
+"storage>`_"
+msgstr "`“关于辅助存储” <http://docs.cloudstack.apache.org/en/latest/concepts.html#about-secondary-storage>`_。"
+
+# 581e0ba4319a47feb92812e319ae14af
+#: ../../storage.rst:189
+msgid "Working With Volumes"
+msgstr "使用磁盘卷"
+
+# 142cd329b56e4fb2b0e17fb5fe687958
+#: ../../storage.rst:191
+msgid ""
+"A volume provides storage to a guest VM. The volume can provide for a root "
+"disk or an additional data disk. CloudStack supports additional volumes for "
+"guest VMs."
+msgstr "卷为来宾虚机提供存储。卷可以作为root分区或附加数据磁盘。CloudStack支持为来宾虚机添加卷。"
+
+# cdaaac178c9946e9bd5030fe82be6c78
+#: ../../storage.rst:195
+msgid ""
+"Volumes are created for a specific hypervisor type. A volume that has been "
+"attached to guest using one hypervisor type (e.g, XenServer) may not be "
+"attached to a guest that is using another hypervisor type, for "
+"example:vSphere, KVM. This is because the different hypervisors use "
+"different disk image formats."
+msgstr "不同的hypervisor创建的磁盘卷有所不同。当磁盘卷被附加到一种hypervisor的虚拟机(如:xenserver),就不能再被附加到其他类型的hypervisor,如:vmware、kvm的虚拟机中。因为它们所用的磁盘分区模式不同。"
+
+# 91341fe4ee6540a9a6ee240d99134524
+#: ../../storage.rst:201
+msgid ""
+"CloudStack defines a volume as a unit of storage available to a guest VM. "
+"Volumes are either root disks or data disks. The root disk has \"/\" in the "
+"file system and is usually the boot device. Data disks provide for "
+"additional storage, for example: \"/opt\" or \"D:\". Every guest VM has a "
+"root disk, and VMs can also optionally have a data disk. End users can mount"
+" multiple data disks to guest VMs. Users choose data disks from the disk "
+"offerings created by administrators. The user can create a template from a "
+"volume as well; this is the standard procedure for private template "
+"creation. Volumes are hypervisor-specific: a volume from one hypervisor type"
+" may not be used on a guest of another hypervisor type."
+msgstr "CloudStack定义一个卷作为来宾虚机的一个有效的存储单元。卷可能是root磁盘或者数据磁盘。root磁盘在文件系统中有 \"/\" 并且通常用于启动设备。数据磁盘提供额外的存储,比如:\"/opt\"或者\"D:\"。每个来宾VM都有一个root磁盘,VMs可能也还有数据磁盘。终端用可以给来宾VMs挂在多个数据磁盘。用户通过管理员创建的磁盘方案来选择数据磁盘。用户同样可以在卷上创建模板;这是标准私有模板的创建流程。针对不同的hypervisor卷也不同:一个hypervisor类型上的卷不能用于其它的hypervisor类型上的来宾虚机。"
+
+# da3a2cb646de40cba343e682fd29a500
+#: ../../storage.rst:213
+msgid ""
+"CloudStack supports attaching up to 13 data disks to a VM on XenServer "
+"hypervisor versions 6.0 and above. For the VMs on other hypervisor types, "
+"the data disk limit is 6."
+msgstr "CloudStack支持给XenServer 6.0和以上版本的VM最多附加13个数据磁盘。其它hypervisor类型上的VMs,最多附加6个数据磁盘。"
+
+# f994b230e52240c089e8967a20e17040
+#: ../../storage.rst:216
+msgid "Creating a New Volume"
+msgstr "创建新卷"
+
+# 73e8fe50f38c4b7ab55f0fc3569b141f
+#: ../../storage.rst:218
+msgid ""
+"You can add more data disk volumes to a guest VM at any time, up to the "
+"limits of your storage capacity. Both CloudStack administrators and users "
+"can add volumes to VM instances. When you create a new volume, it is stored "
+"as an entity in CloudStack, but the actual storage resources are not "
+"allocated on the physical storage device until you attach the volume. This "
+"optimization allows the CloudStack to provision the volume nearest to the "
+"guest that will use it when the first attachment is made."
+msgstr "你可以在符合你存储能力的情况下随时向来宾虚拟机添加多个数据卷。CloudStack的管理员和普通用户都可以向虚拟机实例中添加卷。当你创建了一个新卷,他以一个实体的形式存在于CloudStack中,但是在你将其附加到实例中之前他并不会被分配实际的物理空间。这个优化项允许CloudStack提供最接近来宾虚机的卷,并在第一个附加至虚机的时候使用它。"
+
+# 4e95f1cce44c4810b4dbd2d9ad64b99c
+#: ../../storage.rst:227
+msgid "Using Local Storage for Data Volumes"
+msgstr "使用本地存储作为数据卷"
+
+# 77c86c26103b40de80b813b21c07de64
+#: ../../storage.rst:229
+msgid ""
+"You can create data volumes on local storage (supported with XenServer, KVM,"
+" and VMware). The data volume is placed on the same host as the VM instance "
+"that is attached to the data volume. These local data volumes can be "
+"attached to virtual machines, detached, re-attached, and deleted just as "
+"with the other types of data volume."
+msgstr "您可以将数据盘创建在本地存储上(XenServer、KVM和VMware支持)。数据盘会存放在和所挂载的虚机相同的主机上。这些本地数据盘可以象其它类型的数据盘一样挂载到虚机、卸载、再挂载和删除。"
+
+# 4e4085b4548c4fd291c04570d4b72c31
+#: ../../storage.rst:235
+msgid ""
+"Local storage is ideal for scenarios where persistence of data volumes and "
+"HA is not required. Some of the benefits include reduced disk I/O latency "
+"and cost reduction from using inexpensive local disks."
+msgstr "在不需要持久化数据卷和HA的情况下,本地存储是个理想的选择。其优点包括降低磁盘I/O延迟、使用廉价的本地磁盘来降低费用等。"
+
+# fb5fadabf5084ba2be5f47f42c575bec
+#: ../../storage.rst:239
+msgid ""
+"In order for local volumes to be used, the feature must be enabled for the "
+"zone."
+msgstr "为了能使用本地磁盘,区域中必须启用该功能。"
+
+# 2738dcf7ec914826a7fee9dde6d1dd3d
+#: ../../storage.rst:242
+msgid ""
+"You can create a data disk offering for local storage. When a user creates a"
+" new VM, they can select this disk offering in order to cause the data disk "
+"volume to be placed in local storage."
+msgstr "您可以为本地存储创建一个数据盘方案。当创建新虚机时,用户就能够选择该磁盘方案使数据盘存放到本地存储上。"
+
+# e6cc30d22423450c85f9517f7c29b58c
+#: ../../storage.rst:246
+msgid ""
+"You can not migrate a VM that has a volume in local storage to a different "
+"host, nor migrate the volume itself away to a different host. If you want to"
+" put a host into maintenance mode, you must first stop any VMs with local "
+"data volumes on that host."
+msgstr "你不能将使用了本地存储作为磁盘的虚机迁移到别的主机,也不能迁移磁盘本身到别的主机。若要将主机置于维护模式,您必须先将该主机上所有拥有本地数据卷的虚机关机。"
+
+# 5ba5e0d99d2b485eb47568e8f5c49974
+#: ../../storage.rst:252
+msgid "To Create a New Volume"
+msgstr "创建新卷"
+
+# 854156bcaf7841df87abdbbe3c2e1a97
+# 81089de40b7f4cfabaf992d654b45b6a
+# d2aadcf9b28745ccabf9ab9238f12bb8
+# 87447c411f444603b00a3bdf59da65d0
+# 6f7be70585d8470fb8e8e0f82a57714b
+# c9aa8bf9f15c4956ab9d0372030dc6ee
+# 88f2f68cca994709945a84a66ff08f83
+#: ../../storage.rst:256 ../../storage.rst:386 ../../storage.rst:428
+#: ../../storage.rst:498 ../../storage.rst:529 ../../storage.rst:566
+#: ../../storage.rst:636
+msgid "Log in to the CloudStack UI as a user or admin."
+msgstr "使用用户或管理员登录到CloudStack用户界面。"
+
+# 72e414f9ba5a469aa0219d560888934b
+# 14f9e0c99a7a49f6ac1f53e3163d2025
+# 50e1473900704ebcae177aa3a73ed45c
+# ce7e768615b345d1a5cfd791b3e49343
+#: ../../storage.rst:260 ../../storage.rst:324 ../../storage.rst:640
+#: ../../storage.rst:756
+msgid "In the left navigation bar, click Storage."
+msgstr "在左侧导航栏点击存储。"
+
+# 5e66820dfd5e495fb59a2e3b04eceaf4
+# 7490a7779492470692842a5bc16f66a8
+# 05e2753aad0543ed9de8f5fe61ae80d8
+#: ../../storage.rst:264 ../../storage.rst:394 ../../storage.rst:644
+msgid "In Select View, choose Volumes."
+msgstr "在选择视图中选择卷。"
+
+# 98f953c385004db884f1a0b9d7fcce09
+#: ../../storage.rst:268
+msgid ""
+"To create a new volume, click Add Volume, provide the following details, and"
+" click OK."
+msgstr "点击添加卷来创建一个新卷,填写以下信息后点击确定。"
+
+# f77218cc8e0944c5ac93425caddc5a5c
+#: ../../storage.rst:273
+msgid "Name. Give the volume a unique name so you can find it later."
+msgstr "名字。给卷取个唯一的名字以便于你以后找到它。"
+
+# 77f2d58bc029432fad2e20894e0dc4a4
+#: ../../storage.rst:277
+msgid ""
+"Availability Zone. Where do you want the storage to reside? This should be "
+"close to the VM that will use the volume."
+msgstr "可用的资源域。你想让这个存储在哪个地方有效?这个应该接近要是用这个卷的VM。(就是说你要 在单个资源域内使用这个存储就选择单个资源域,如果此存储要在多个资源与内共享你就选所有资源域)"
+
+# 0dd389820dab437ab448b331b2e2e3dc
+#: ../../storage.rst:282
+msgid "Disk Offering. Choose the characteristics of the storage."
+msgstr "磁盘方案。选择存储特性。"
+
+# 3ff901f9fc4245859f4413152d691ec2
+#: ../../storage.rst:284
+msgid ""
+"The new volume appears in the list of volumes with the state “Allocated.” "
+"The volume data is stored in CloudStack, but the volume is not yet ready for"
+" use"
+msgstr "新建的存储会在卷列表中显示为“已分配”状态。卷数据已经存储到CloudStack了,但是该卷还不能被使用。"
+
+# 1fd0848ef74948fdbcbccf818d92177d
+#: ../../storage.rst:290
+msgid "To start using the volume, continue to Attaching a Volume"
+msgstr "通过附加卷来开始使用这个卷。"
+
+# c0df3d546d4d4bb0b749ee670e7fb1b4
+#: ../../storage.rst:293
+msgid "Uploading an Existing Volume to a Virtual Machine"
+msgstr "上传一个已存在的卷给虚拟机"
+
+# 72bbdbadb3124063954e9e6fe0dce7a1
+#: ../../storage.rst:295
+msgid ""
+"Existing data can be made accessible to a virtual machine. This is called "
+"uploading a volume to the VM. For example, this is useful to upload data "
+"from a local file system and attach it to a VM. Root administrators, domain "
+"administrators, and end users can all upload existing volumes to VMs."
+msgstr "已存在的数据现在可以被虚拟机存取。这个被称为上传一个卷到VM。例如,这对于从本地数据系统上传数据并将数据附加到VM是非常有用的。Root管理员、域管理员和终端用户都可以给VMs上传已存在的卷。"
+
+# c9884a3f983640be9c819a9386183862
+#: ../../storage.rst:301
+msgid ""
+"The upload is performed using HTTP. The uploaded volume is placed in the "
+"zone's secondary storage"
+msgstr "使用HTTP上传。上传的卷被存储在区域中的辅助存储中。"
+
+# 0a24f9d7f649445ea6f882e03af5a4c8
+#: ../../storage.rst:304
+msgid ""
+"You cannot upload a volume if the preconfigured volume limit has already "
+"been reached. The default limit for the cloud is set in the global "
+"configuration parameter max.account.volumes, but administrators can also set"
+" per-domain limits that are different from the global default. See Setting "
+"Usage Limits"
+msgstr "如果预配置的卷已经达到了上限的话,那么你就不能上传卷了。默认的限制在全局配置参数max.account.volumes中设置,但是管理员同样可以为每个用户域设置不同于全局默认的上限值。请参阅设置使用限制。"
+
+# 561cea17ed5b4aa18cea478b6159261d
+#: ../../storage.rst:310
+msgid "To upload a volume:"
+msgstr "要上传一个卷:"
+
+# 5ca6925a182745bd92c83dddbb7ae803
+#: ../../storage.rst:314
+msgid ""
+"(Optional) Create an MD5 hash (checksum) of the disk image file that you are"
+" going to upload. After uploading the data disk, CloudStack will use this "
+"value to verify that no data corruption has occurred."
+msgstr "(可选项)为将要上传的磁盘镜像文件创建一个MD5哈希(校验)。再上传数据磁盘之后,CloudStack将使用这个校验值来检查这个磁盘文件再上传过程中没有出错。"
+
+# 51a89894bbfa4442971f72c7e46f146d
+#: ../../storage.rst:320
+msgid "Log in to the CloudStack UI as an administrator or user"
+msgstr "用管理员或用户账号登录CloudStack UI"
+
+# 28723898f3674b00ab161be4a747617a
+#: ../../storage.rst:328
+msgid "Click Upload Volume."
+msgstr "点击上传卷。"
+
+# ad72af46b40f4b3f9a6e531498b729d9
+#: ../../storage.rst:332
+msgid "Provide the following:"
+msgstr "填写以下内容:"
+
+# 2171cbf4083742a8be4e3f3d6905d0da
+#: ../../storage.rst:336
+msgid ""
+"Name and Description. Any desired name and a brief description that can be "
+"shown in the UI."
+msgstr "名称和描述。你想要的任何名称和一个简洁的描述,这些都会显示在UI中。"
+
+# 4cd509c15df24aba8666b7d11a9051be
+#: ../../storage.rst:341
+msgid ""
+"Availability Zone. Choose the zone where you want to store the volume. VMs "
+"running on hosts in this zone can attach the volume."
+msgstr "可用的区域:选择你想存储卷的区域。运行在该区域中的主机上的VMs都可以附加这个卷。"
+
+# 17cb7725cd0940cf8557d68206638aea
+#: ../../storage.rst:346
+msgid ""
+"Format. Choose one of the following to indicate the disk image format of the"
+" volume."
+msgstr "格式。在下面所指出的卷的磁盘镜像格式中选择一种。"
+
+# e4c763d0aab143b49ab6e9d9a1432df0
+#: ../../storage.rst:350
+msgid "Hypervisor"
+msgstr "Hypervisor"
+
+# 31ec3ac278d44770a548d99764119364
+#: ../../storage.rst:350
+msgid "Disk Image Format"
+msgstr "磁盘镜像格式"
+
+# 81cdbfc4baaf46318a9b1031f0aa73f9
+#: ../../storage.rst:352
+msgid "XenServer"
+msgstr "XenServer"
+
+# b0ad57c5512c4cfda950f3a262618a6d
+#: ../../storage.rst:353
+msgid "VMware"
+msgstr "VMware"
+
+# 9714e77ca28e441fad02c1f395a121a9
+#: ../../storage.rst:353
+msgid "OVA"
+msgstr "OVA"
+
+# 1c6d0308a6d84f04909361d7d827e4a8
+#: ../../storage.rst:359
+msgid ""
+"URL. The secure HTTP or HTTPS URL that CloudStack can use to access your "
+"disk. The type of file at the URL must match the value chosen in Format. For"
+" example, if Format is VHD, the URL might look like the following:"
+msgstr "URL。CloudStack用来访问你的磁盘的安全HTTP或HTTPS URL。URL对应的文件种类必须符合在格式中选择的。例如,格式为VHD,则URL必须像下面的:"
+
+# f0494cc84c3941c1b9f499bc95a77793
+#: ../../storage.rst:364
+msgid "``http://yourFileServerIP/userdata/myDataDisk.vhd``"
+msgstr "``http://yourFileServerIP/userdata/myDataDisk.vhd``"
+
+# 459a453424c84b51abfd379a935f578d
+#: ../../storage.rst:368
+msgid "MD5 checksum. (Optional) Use the hash that you created in step 1."
+msgstr "MD5校验。(可选项)使用在步骤1中创建的哈希。"
+
+# 8532aa0d890a4990b343381696efe17b
+#: ../../storage.rst:372
+msgid ""
+"Wait until the status of the volume shows that the upload is complete. Click"
+" Instances - Volumes, find the name you specified in step 5, and make sure "
+"the status is Uploaded."
+msgstr "等到卷的上传显示完成。点击实例-卷,找到你在步骤5中指定的名称,单后确保状态是已上传。"
+
+# 9d29a7dddfd446539ef41dfcdf464ca1
+#: ../../storage.rst:377
+msgid "Attaching a Volume"
+msgstr "附加一个卷"
+
+# 59c5f93ac3c64d8eb008975ca5b66300
+#: ../../storage.rst:379
+msgid ""
+"You can attach a volume to a guest VM to provide extra disk storage. Attach "
+"a volume when you first create a new volume, when you are moving an existing"
+" volume from one VM to another, or after you have migrated a volume from one"
+" storage pool to another."
+msgstr "你可以通过附加一个卷来提供虚拟机的额外磁盘存储。当你第一次创建新卷,或移动已存在的卷到另一台虚拟机,或实在从另一个存储池迁移过来一个卷的时候你才可以附加一个卷。"
+
+# d2666c87d93e413aa8dd8637e062f650
+#: ../../storage.rst:390
+msgid "In the left navigation, click Storage."
+msgstr "在左侧导航栏点击存储。"
+
+# 60b9f463a5304e338a5505ef7d8c64ff
+#: ../../storage.rst:398
+msgid ""
+"Click the volume name in the Volumes list, then click the Attach Disk button"
+" |AttachDiskButton.png|"
+msgstr "在卷列表中点击卷的名称,然后点击附加磁盘按钮 |AttachDiskButton.png|"
+
+# 9b1bee8f6c564762854e98112c13ef30
+#: ../../storage.rst:403
+msgid ""
+"In the Instance popup, choose the VM to which you want to attach the volume."
+" You will only see instances to which you are allowed to attach volumes; for"
+" example, a user will see only instances created by that user, but the "
+"administrator will have more choices."
+msgstr "在弹出的实例界面,选择你打算附加卷的那台虚拟机。你只能看到允许你附加卷的实例;比如,普通用户只能看到他自己创建的实例,而管理员将会有更多的选择。"
+
+# 650c85a5e1254efdb77ed55f37f13a14
+#: ../../storage.rst:410
+msgid ""
+"When the volume has been attached, you should be able to see it by clicking "
+"Instances, the instance name, and View Volumes."
+msgstr "当卷被附加之后,你通过点击实例看到实例名和该实例所附加的卷。"
+
+# 3a8754012f8f4da98dfba46033984c06
+#: ../../storage.rst:414
+msgid "Detaching and Moving Volumes"
+msgstr "卸载和移动卷"
+
+# 15d989ccfe6b43b28260c1289e7388cf
+#: ../../storage.rst:417
+msgid ""
+"This procedure is different from moving volumes from one storage pool to "
+"another as described in `“VM Storage Migration” <#vm-storage-migration>`_."
+msgstr "这个过程不同于从一个存储池移动卷到其他的池。这些内容在 `“VM存储迁移” <#vm-storage-migration>`_中有描述。"
+
+# 8bf4295f191343829d3c43e858b12a1e
+#: ../../storage.rst:419
+msgid ""
+"A volume can be detached from a guest VM and attached to another guest. Both"
+" CloudStack administrators and users can detach volumes from VMs and move "
+"them to other VMs."
+msgstr "卷可以从来宾虚机上卸载再附加到其他来宾虚机上。CloudStack管理员和用户都能从VMs上卸载卷再给其他VMs附加上。"
+
+# 4b538b0a7328497cbb1de6c4dd724eb2
+#: ../../storage.rst:423
+msgid ""
+"If the two VMs are in different clusters, and the volume is large, it may "
+"take several minutes for the volume to be moved to the new VM."
+msgstr "如果两个VMs存在于不同的群集中,并且卷很大,那么卷移动至新的VM上可能要耗费比较长的时间。"
+
+# 39d64a096df5469ba79c30f50856d546
+#: ../../storage.rst:432
+msgid ""
+"In the left navigation bar, click Storage, and choose Volumes in Select "
+"View. Alternatively, if you know which VM the volume is attached to, you can"
+" click Instances, click the VM name, and click View Volumes."
+msgstr "在左侧的导航栏,点击存储,在选择视图中选择卷。或者,如果你知道卷要附加给哪个VM的话,你可以点击实例,再点击VM名称,然后点击查看卷。"
+
+# 791d977d23984313b80ffa2aa915577d
+#: ../../storage.rst:439
+msgid ""
+"Click the name of the volume you want to detach, then click the Detach Disk "
+"button. |DetachDiskButton.png|"
+msgstr "点击你想卸载卷的名字,然后点击卸载磁盘按钮。 |DetachDiskButton.png|"
+
+# 6b7ea67796a948bbbaeab6bbdaf832c2
+#: ../../storage.rst:444
+msgid ""
+"To move the volume to another VM, follow the steps in `“Attaching a Volume” "
+"<#attaching-a-volume>`_."
+msgstr "要移动卷至其他VM,按照`“附加卷” <#attaching-a-volume>`_中的步骤。"
+
+# 6597c6aaa3fc40f89bdac966f91c4642
+#: ../../storage.rst:448
+msgid "VM Storage Migration"
+msgstr "VM存储迁移"
+
+# 98aac3254e864e4dad42c3824a081f9d
+#: ../../storage.rst:450
+msgid "Supported in XenServer, KVM, and VMware."
+msgstr "支持XenServer、KVM和VMware。"
+
+# 04f285a0220743a19e6d3a7b54226766
+#: ../../storage.rst:453
+msgid ""
+"This procedure is different from moving disk volumes from one VM to another "
+"as described in `“Detaching and Moving Volumes” <#detaching-and-moving-"
+"volumes>`_."
+msgstr "这个过程不同于从一个虚拟机移动磁盘卷到另外的虚拟机。这些内容在 \"查看挂载和移动卷\" <#detaching-and-moving-volumes>`_中有描述。"
+
+# 63619f4ba4c14b57b06d4b6f34cad27e
+#: ../../storage.rst:455
+msgid ""
+"You can migrate a virtual machine’s root disk volume or any additional data "
+"disk volume from one storage pool to another in the same zone."
+msgstr "你可以从同一区域中的一个存储池迁移虚机的root磁盘卷或任何其他的数据磁盘卷到其他的池"
+
+# b374aaa7079f4357a3f44ea9e8d06dfc
+#: ../../storage.rst:458
+msgid ""
+"You can use the storage migration feature to achieve some commonly desired "
+"administration goals, such as balancing the load on storage pools and "
+"increasing the reliability of virtual machines by moving them away from any "
+"storage pool that is experiencing issues."
+msgstr "你可以使用存储迁移功能完成一些常用的管理目标。如将它们从有问题的存储池中迁移出去以平衡存储池的负载和增加虚拟机的可靠性。"
+
+# 04abf2b317084f6a948d7878ad1cbaf4
+#: ../../storage.rst:463
+msgid ""
+"On XenServer and VMware, live migration of VM storage is enabled through "
+"CloudStack support for XenMotion and vMotion. Live storage migration allows "
+"VMs to be moved from one host to another, where the VMs are not located on "
+"storage shared between the two hosts. It provides the option to live migrate"
+" a VM’s disks along with the VM itself. It is possible to migrate a VM from "
+"one XenServer resource pool / VMware cluster to another, or to migrate a VM "
+"whose disks are on local storage, or even to migrate a VM’s disks from one "
+"storage repository to another, all while the VM is running."
+msgstr "在XenServer和VMware上,由于CloudStack支持XenMotion和vMotion,VM存储的在线迁移是启用的。在线存储迁移允许没有在共享存储上的VMs从一台主机迁移到另一台主机上。它提供选项让VM的磁盘与VM本身一起在线迁移。它让XenServer资源池之间/VMware群集之间迁移VM,或者在本地存储运行的VM,甚至是存储库之间迁移VM的磁盘成为可能,而且迁移同时VM是正在运行的。"
+
+# def78c6283b8421d959acad05e006b34
+#: ../../storage.rst:474
+msgid ""
+"Because of a limitation in VMware, live migration of storage for a VM is "
+"allowed only if the source and target storage pool are accessible to the "
+"source host; that is, the host where the VM is running when the live "
+"migration operation is requested."
+msgstr "由于VMware中的限制,仅当源和目标存储池都能被源主机访问时才允许VM存储的在线迁移;也就是说,当需要在线迁移操作时,源主机是运行VM的主机。"
+
+# c24b72459dde481887747acf4697636f
+#: ../../storage.rst:477
+msgid "Migrating a Data Volume to a New Storage Pool"
+msgstr "将数据卷迁移到新的存储池"
+
+# bf37a69a59b542a98c25363d45c9713d
+#: ../../storage.rst:479
+msgid "There are two situations when you might want to migrate a disk:"
+msgstr "当你想迁移磁盘的时候可能有两种情况:"
+
+# f8b93cb34c384463a75f83959616871f
+#: ../../storage.rst:483
+msgid ""
+"Move the disk to new storage, but leave it attached to the same running VM."
+msgstr "将磁盘移动到新的存储,但是还将其附加在原来正在运行的VM上。"
+
+# 5cbf239bfd444a0f9c842deb94ed82ba
+#: ../../storage.rst:488
+msgid ""
+"Detach the disk from its current VM, move it to new storage, and attach it "
+"to a new VM."
+msgstr "从当前VM上卸载磁盘,然后将其移动至新的存储,再将其附加至新的VM。"
+
+# 0d25ecabc349499586d885844f71b1d0
+#: ../../storage.rst:492
+msgid "Migrating Storage For a Running VM"
+msgstr "为正在运行的VM迁移存储"
+
+# 245dccc84a4e456990f3c0543c4fead3
+#: ../../storage.rst:494
+msgid "(Supported on XenServer and VMware)"
+msgstr "(支持XenServer和VMware)"
+
+# 30cb4d3d0e4e417492b11e590eb7f765
+#: ../../storage.rst:502
+msgid ""
+"In the left navigation bar, click Instances, click the VM name, and click "
+"View Volumes."
+msgstr "在左侧的导航栏,点击实例,再点击VM名,接着点击查看卷。"
+
+# 5277b5ef2825414da877bab6feb8fc04
+#: ../../storage.rst:507
+msgid "Click the volume you want to migrate."
+msgstr "点击你想迁移的卷。"
+
+# d0f6564fdaf8483e98845c58dc25c962
+# 9e933a0caa314e80b7270c72c0de6271
+#: ../../storage.rst:511 ../../storage.rst:533
+msgid ""
+"Detach the disk from the VM. See `“Detaching and Moving Volumes” "
+"<#detaching-and-moving-volumes>`_ but skip the “reattach” step at the end. "
+"You will do that after migrating to new storage."
+msgstr "从VM卸载磁盘。请参阅 `“卸载和移动卷” <#detaching-and-moving-volumes>`_ 但是跳过最后的\"重新附加\"步骤。你会在迁移过后在新的存储上做这一步。"
+
+# 4649c894198146228bfeed3a1fb7bdd4
+# 27b66737b23347a0926867a4c198ca1a
+#: ../../storage.rst:517 ../../storage.rst:539
+msgid ""
+"Click the Migrate Volume button |Migrateinstance.png| and choose the "
+"destination from the dropdown list."
+msgstr "点击迁移卷按钮 |Migrateinstance.png| ,然后从下拉列表里面选择目标位置。"
+
+# 8b7c76c6d3b441929912e2e36ceb34d2
+#: ../../storage.rst:521
+msgid ""
+"Watch for the volume status to change to Migrating, then back to Ready."
+msgstr "这期间,卷的状态会变成正在迁移,然后又变回已就绪。"
+
+# 3ffc696411bf46ccacd94ed84c8a4e52
+#: ../../storage.rst:525
+msgid "Migrating Storage and Attaching to a Different VM"
+msgstr "迁移存储和附加到不同的VM"
+
+# 451b903ccdf9481a87553a1ff3e11675
+#: ../../storage.rst:543
+msgid ""
+"Watch for the volume status to change to Migrating, then back to Ready. You "
+"can find the volume by clicking Storage in the left navigation bar. Make "
+"sure that Volumes is displayed at the top of the window, in the Select View "
+"dropdown."
+msgstr "观察卷的状态会变成正在迁移,然后又变回已就绪。你可以点击左侧导航条中的存储找到卷。在选择查看的下拉列表中,确保卷显示在窗口的顶部。"
+
+# 3ea9addc45e04febafb2f43888f9756a
+#: ../../storage.rst:550
+msgid ""
+"Attach the volume to any desired VM running in the same cluster as the new "
+"storage server. See `“Attaching a Volume” <#attaching-a-volume>`_"
+msgstr "在新的存储服务器中给运行在同一群集中的任何想要的VM附加卷。请参阅 `“附加卷” <#attaching-a-volume>`_。"
+
+# 4f145ec0a8e9487a840dd7dbd6858579
+#: ../../storage.rst:555
+msgid "Migrating a VM Root Volume to a New Storage Pool"
+msgstr "迁移VM的Root卷到新的存储池"
+
+# b1b1c5f5444e43bcb759263c0dc47036
+#: ../../storage.rst:557
+msgid ""
+"(XenServer, VMware) You can live migrate a VM's root disk from one storage "
+"pool to another, without stopping the VM first."
+msgstr "(XenServer、VMware)你可以在停止VM的情况下,使用在线迁移将VM的root磁盘从一个存储池移动到另外一个。"
+
+# df65430daab94ed197c4acaf08a3e836
+#: ../../storage.rst:560
+msgid ""
+"(KVM) When migrating the root disk volume, the VM must first be stopped, and"
+" users can not access the VM. After migration is complete, the VM can be "
+"restarted."
+msgstr "(KVM)当前已root磁盘卷的时候,VM必须关机,这时用户不能访问VM。在迁移完成之后,VM就能重启了。"
+
+# be481dbccbbf4cb0a2cc056284533ab8
+#: ../../storage.rst:570
+msgid "In the left navigation bar, click Instances, and click the VM name."
+msgstr "在左侧的导航栏里,点击实例,然后点击VM名。"
+
+# 5274bdb89bf44ea3b038c790ff8672b4
+#: ../../storage.rst:574
+msgid "(KVM only) Stop the VM."
+msgstr "(仅限于KVM)停止VM。"
+
+# 33f3864ed4d34fb881cc89f632512d88
+#: ../../storage.rst:578
+msgid ""
+"Click the Migrate button |Migrateinstance.png| and choose the destination "
+"from the dropdown list."
+msgstr "点击迁移按钮 |Migrateinstance.png| ,然后从下拉列表中选择目标位置。"
+
+# 3349af1b38e4457482c539813e40a08c
+#: ../../storage.rst:581
+msgid ""
+"If the VM's storage has to be migrated along with the VM, this will be noted"
+" in the host list. CloudStack will take care of the storage migration for "
+"you."
+msgstr "如果VM的存储与VM必须一起被迁移,这点会在主机列表中标注。CloudStack会为你自动的进行存储迁移。"
+
+# 4445e369263d4d0dafd72fe3666283a7
+#: ../../storage.rst:585
+msgid ""
+"Watch for the volume status to change to Migrating, then back to Running (or"
+" Stopped, in the case of KVM). This can take some time."
+msgstr "观察卷的状态会变成迁移中,然后变回运行中(或者停止,在KVM中)。这过程会持续一段时间。"
+
+# e1ad558399c64d8aa7ae00633e58c413
+#: ../../storage.rst:590
+msgid "(KVM only) Restart the VM."
+msgstr "(仅限于KVM)重启VM。"
+
+# a5eee53b3a944bf88fba18aafe337287
+#: ../../storage.rst:593
+msgid "Resizing Volumes"
+msgstr "重新规划卷"
+
+# a5d5757162eb492aaf50d2220d1d1b98
+#: ../../storage.rst:595
+msgid ""
+"CloudStack provides the ability to resize data disks; CloudStack controls "
+"volume size by using disk offerings. This provides CloudStack administrators"
+" with the flexibility to choose how much space they want to make available "
+"to the end users. Volumes within the disk offerings with the same storage "
+"tag can be resized. For example, if you only want to offer 10, 50, and 100 "
+"GB offerings, the allowed resize should stay within those limits. That "
+"implies if you define a 10 GB, a 50 GB and a 100 GB disk offerings, a user "
+"can upgrade from 10 GB to 50 GB, or 50 GB to 100 GB. If you create a custom-"
+"sized disk offering, then you have the option to resize the volume by "
+"specifying a new, larger size."
+msgstr "CloudStack提供了调整数据盘大小的功能;CloudStack借助磁盘方案控制卷大小。这样提供了CloudStack管理员可以灵活地选择他们想要给终端用户多少可用空间。使用相同存储标签的磁盘方案中的卷可以重新划分。比如,如果你只想提供 10,50和100GB的方案,重新划分允许的极限就不会超过这些。也就是说,如果你定义了10GB,50GB和100GB的磁盘方案,用户可以从10GB升级到50GB,或者从50GB升级到100GB。如果你创建了自定义大小的磁盘方案,那么你可以重新规划卷的大小为更大的值。"
+
+# 4d2a89a3e81a4293bb926db2952a2d89
+#: ../../storage.rst:606
+msgid ""
+"Additionally, using the resizeVolume API, a data volume can be moved from a "
+"static disk offering to a custom disk offering with the size specified. This"
+" functionality allows those who might be billing by certain volume sizes or "
+"disk offerings to stick to that model, while providing the flexibility to "
+"migrate to whatever custom size necessary."
+msgstr "另外,使用 resizeVolume API,数据卷可以从一个静态磁盘方案移动到指定大小的自定义磁盘方案。此功能允对特定容量或磁盘方案进行收费,同时可以灵活地更改磁盘大小。"
+
+# 0c302b9381964652a04f4931be9a3656
+#: ../../storage.rst:612
+msgid ""
+"This feature is supported on KVM, XenServer, and VMware hosts. However, "
+"shrinking volumes is not supported on VMware hosts."
+msgstr "KVM, XenServer和VMware主机支持这个功能。但是VMware主机不支持卷的收缩。"
+
+# c9bd7905071a44d4a6f7905fee796c4a
+#: ../../storage.rst:615
+msgid "Before you try to resize a volume, consider the following:"
+msgstr "在你试图重新规划卷大小之前,请考虑以下几点:"
+
+# 82c7ca43b93f4df09d6c513ff5b70486
+#: ../../storage.rst:619
+msgid "The VMs associated with the volume are stopped."
+msgstr "与卷关联的VMs是停止状态。"
+
+# 6f5a21b47e314e0484db238c6e9c457e
+#: ../../storage.rst:623
+msgid "The data disks associated with the volume are removed."
+msgstr "与卷关联的数据磁盘已经移除了。"
+
+# fec276a1979249fb9dc124f18e1455bd
+#: ../../storage.rst:627
+msgid ""
+"When a volume is shrunk, the disk associated with it is simply truncated, "
+"and doing so would put its content at risk of data loss. Therefore, resize "
+"any partitions or file systems before you shrink a data disk so that all the"
+" data is moved off from that disk."
+msgstr "当卷缩小的时候,上面的磁盘会被截断,这么做的话可能会丢失数据。因此,在缩小数据磁盘之前,重新规划任何分区或文件系统以便数据迁移出这个磁盘。"
+
+# 91d00577aa774910bc0090ff9249c714
+#: ../../storage.rst:632
+msgid "To resize a volume:"
+msgstr "要重新规划卷容量:"
+
+# b8b72eb1404144179334e6914f461c43
+#: ../../storage.rst:648
+msgid ""
+"Select the volume name in the Volumes list, then click the Resize Volume "
+"button |resize-volume-icon.png|"
+msgstr "在卷列表中选择卷名称,然后点击调整卷大小按钮 |resize-volume-icon.png|"
+
+# 6d5f5f78fa294317aaaa19d07403aa91
+#: ../../storage.rst:653
+msgid ""
+"In the Resize Volume pop-up, choose desired characteristics for the storage."
+msgstr "在弹出的调整卷大小窗口中,为存储选择想要的方案。"
+
+# 94cd2f322cad423485fcfdaa0afe2ab4
+#: ../../storage.rst:656
+msgid "|resize-volume.png|"
+msgstr "|resize-volume.png|"
+
+# 7f15ee5fc83e482791baa84599ea55cd
+#: ../../storage.rst:660
+msgid "If you select Custom Disk, specify a custom size."
+msgstr "如果你选择自定义磁盘,请指定一个自定义大小。"
+
+# 138ac0a6338b4b0f95312bd4dec59967
+#: ../../storage.rst:664
+msgid "Click Shrink OK to confirm that you are reducing the size of a volume."
+msgstr "点击是否确实要缩小卷大小来确认你要缩小的容量。"
+
+# 7381eca9284e4773a1bb46e44a3865aa
+#: ../../storage.rst:667
+msgid ""
+"This parameter protects against inadvertent shrinking of a disk, which might"
+" lead to the risk of data loss. You must sign off that you know what you are"
+" doing."
+msgstr "此参数避免了不小心的失误造成数据的丢失。你必须知道你在做什么。"
+
+# eed53ca74872424ea49fa6cabfbe9eb9
+#: ../../storage.rst:673
+msgid "Click OK."
+msgstr "点击确定。"
+
+# 5d71f55bf71c4f58beb781d2cb94c74c
+#: ../../storage.rst:676
+msgid "Reset VM to New Root Disk on Reboot"
+msgstr "在VM重启时重设VM的root盘"
+
+# 2521d69d348047fc8a660b3b8a77b2ac
+#: ../../storage.rst:678
+msgid ""
+"You can specify that you want to discard the root disk and create a new one "
+"whenever a given VM is rebooted. This is useful for secure environments that"
+" need a fresh start on every boot and for desktops that should not retain "
+"state. The IP address of the VM will not change due to this operation."
+msgstr "你可以指定你想要放弃的root磁盘和创建一个新的,并且无论何时在VM重启时都使用新的。每次启动时都是一个全新的VM并且桌面不需要保存它的状态,出于安全环境考虑这非常有用。VM的IP地址在这个操作期间不会改变。"
+
+# f9ff6cc586b8407c9ff1e235962ec731
+#: ../../storage.rst:684
+msgid "**To enable root disk reset on VM reboot:**"
+msgstr "**要启用在VM重启时重置root磁盘:**"
+
+# 0c3f06afe8504df7a4bf4ea7bea288bf
+#: ../../storage.rst:686
+msgid ""
+"When creating a new service offering, set the parameter isVolatile to True. "
+"VMs created from this service offering will have their disks reset upon "
+"reboot. See `“Creating a New Compute Offering” "
+"<service_offerings.html#creating-a-new-compute-offering>`_."
+msgstr "当创建一个新的服务方案时,设置isVolatile这个参数为True。从这个服务方案创建的VMs一旦重启,它们的磁盘就会重置。请参阅 `“创建新的计算方案” <service_offerings.html#creating-a-new-compute-offering>`_。"
+
+# d0e6735ecfb243bcb2038075c332453d
+#: ../../storage.rst:692
+msgid "Volume Deletion and Garbage Collection"
+msgstr "卷的删除和回收"
+
+# 15a72eae3cce46e494793039f4408bc2
+#: ../../storage.rst:694
+msgid ""
+"The deletion of a volume does not delete the snapshots that have been "
+"created from the volume"
+msgstr "删除卷不会删除曾经对卷做的快照"
+
+# 484eaae26aa442b2af1e54dea16342d2
+#: ../../storage.rst:697
+msgid ""
+"When a VM is destroyed, data disk volumes that are attached to the VM are "
+"not deleted."
+msgstr "当一个VM被销毁时,附加到该VM的数据磁盘卷不会被删除。"
+
+# 5fd59185e6d64db280b2ca89ecca3f89
+#: ../../storage.rst:700
+msgid ""
+"Volumes are permanently destroyed using a garbage collection process. The "
+"global configuration variables expunge.delay and expunge.interval determine "
+"when the physical deletion of volumes will occur."
+msgstr "使用回收程序后,卷就永久的被销毁了。全局配置变量expunge.delay和expunge.interval决定了何时物理删除卷。"
+
+# 9111bfdfe0ee4dcf8c15a359324059fc
+#: ../../storage.rst:706
+msgid ""
+"`expunge.delay`: determines how old the volume must be before it is "
+"destroyed, in seconds"
+msgstr "`expunge.delay`:决定在卷被销毁之前卷存在多长时间,以秒计算。"
+
+# b9e7a6caccba433b8b23ff40bfd62123
+#: ../../storage.rst:711
+msgid ""
+"`expunge.interval`: determines how often to run the garbage collection check"
+msgstr "`expunge.interval`:决定回收检查运行频率。"
+
+# 984f73d3efdc4d5a8a6a4309599cb386
+#: ../../storage.rst:714
+msgid ""
+"Administrators should adjust these values depending on site policies around "
+"data retention."
+msgstr "管理员可以根据站点数据保留策略来调整这些值。"
+
+# 08d9ad354b7942bda197e39303ab4ebe
+#: ../../storage.rst:718
+msgid "Working with Volume Snapshots"
+msgstr "使用卷快照"
+
+# 9eb74cf1e4cd42df8c38300249e3e96b
+# a741a75990ca4897a4f34de220bde407
+#: ../../storage.rst:720 ../../storage.rst:773
+msgid ""
+"(Supported for the following hypervisors: **XenServer**, **VMware vSphere**,"
+" and **KVM**)"
+msgstr "(支持以下hypervisors:**XenServer**, **VMware vSphere** 和 **KVM**)"
+
+# 673b7caff5fb4ce481e087a9877d4dcd
+#: ../../storage.rst:723
+msgid ""
+"CloudStack supports snapshots of disk volumes. Snapshots are a point-in-time"
+" capture of virtual machine disks. Memory and CPU states are not captured. "
+"If you are using the Oracle VM hypervisor, you can not take snapshots, since"
+" OVM does not support them."
+msgstr "CloudStack支持磁盘卷的快照。快照为虚拟机某一时间点的抓取。内存和CPU状态不会被抓取。如果你使用Oracle VM hypervisor,那么你不能做快照,因为OVM不支持。"
+
+# d6369c41ebb54df68c691818f61104bb
+#: ../../storage.rst:728
+msgid ""
+"Snapshots may be taken for volumes, including both root and data disks "
+"(except when the Oracle VM hypervisor is used, which does not support "
+"snapshots). The administrator places a limit on the number of stored "
+"snapshots per user. Users can create new volumes from the snapshot for "
+"recovery of particular files and they can create templates from snapshots to"
+" boot from a restored disk."
+msgstr "卷,包括root和数据磁盘(使用Oracle VM hypervisor除外,因为OVM不支持快照)都可以做快照。管理员可以限制每个用户的快照数量。用户可以通过快照创建新的卷,用来恢复特定的文件,还可以通过快照创建模板来启动恢复的磁盘。"
+
+# 90f5f9401836415abbc9e1620b3f224f
+#: ../../storage.rst:735
+msgid ""
+"Users can create snapshots manually or by setting up automatic recurring "
+"snapshot policies. Users can also create disk volumes from snapshots, which "
+"may be attached to a VM like any other disk volume. Snapshots of both root "
+"disks and data disks are supported. However, CloudStack does not currently "
+"support booting a VM from a recovered root disk. A disk recovered from "
+"snapshot of a root disk is treated as a regular data disk; the data on "
+"recovered disk can be accessed by attaching the disk to a VM."
+msgstr "用户可以手动或者设置自动循环快照策略创建快照。用户也可以从快照创建附磁盘卷,并像其他磁盘卷一样附加到虚机上。root和数据磁盘支持快照。但是,CloudStack目前不支持通过恢复的root盘启动VM。从快照恢复的root盘会被认为是数据盘;恢复的磁盘可以附加到VM上以访问上面的数据。"
+
+# 75d1388574754e729e8da27b3c799a49
+#: ../../storage.rst:744
+msgid ""
+"A completed snapshot is copied from primary storage to secondary storage, "
+"where it is stored until deleted or purged by newer snapshot."
+msgstr "完整快照慧聪主存储拷贝到附加存储,并会一直存储在里面知道删除或被新的快照覆盖。"
+
+# bada0f726d0d4d729aea533943c409b3
+#: ../../storage.rst:748
+msgid "How to Snapshot a Volume"
+msgstr "如何给卷做快照"
+
+# 44e0d512d57c4888a44a396a5eac75bb
+#: ../../storage.rst:752
+msgid "Log in to the CloudStack UI as a user or administrator."
+msgstr "是用用户或者管理员登录CloudStack。"
+
+# 19c4af0199724420aecc49d58b0f818e
+#: ../../storage.rst:760
+msgid "In Select View, be sure Volumes is selected."
+msgstr "在选择视图,确认选择的是卷。"
+
+# 70d14f08edf540afaa590235f7ea2f8b
+#: ../../storage.rst:764
+msgid "Click the name of the volume you want to snapshot."
+msgstr "点击你要做快照的卷的名称。"
+
+# aed06a6f99fd4092a29f2307fa3f046b
+#: ../../storage.rst:768
+msgid "Click the Snapshot button. |SnapshotButton.png|"
+msgstr "点击快照按钮。 |SnapshotButton.png|"
+
+# 669a8d0c02184e369299bf9d7e5483d2
+#: ../../storage.rst:771
+msgid "Automatic Snapshot Creation and Retention"
+msgstr "创建和保留自动快照"
+
+# 24d0d72217234a93a95c9d1990899367
+#: ../../storage.rst:776
+msgid ""
+"Users can set up a recurring snapshot policy to automatically create "
+"multiple snapshots of a disk at regular intervals. Snapshots can be created "
+"on an hourly, daily, weekly, or monthly interval. One snapshot policy can be"
+" set up per disk volume. For example, a user can set up a daily snapshot at "
+"02:30."
+msgstr "用户可以设置循环快照策略来自动的为磁盘定期地创建多个快照。快照可以按小时,天,周或者月为周期。每个磁盘卷都可以设置快照策略。比如,用户可以设置每天的02:30做快照。"
+
+# 1ddc07ffd4744db3996a56928fabe1b3
+#: ../../storage.rst:782
+msgid ""
+"With each snapshot schedule, users can also specify the number of scheduled "
+"snapshots to be retained. Older snapshots that exceed the retention limit "
+"are automatically deleted. This user-defined limit must be equal to or lower"
+" than the global limit set by the CloudStack administrator. See `“Globally "
+"Configured Limits” <usage.html#globally-configured-limits>`_. The limit "
+"applies only to those snapshots that are taken as part of an automatic "
+"recurring snapshot policy. Additional manual snapshots can be created and "
+"retained."
+msgstr "依靠每个快照计划,用户还可以指定计划快照的保留数量。超出保留期限的老快照会被自动的删除。用户定义的限制必须等于或小于CloudStack管理员设置的全局限制。请参阅 `“全局配置的限制” <usage.html#globally-configured-limits>`_.。限制只能应用给作为自动循环快照策略的一部分的快照。额外的手动快照能被创建和保留。"
+
+# cf33bcc958214dce8809b1b3664d8473
+#: ../../storage.rst:793
+msgid "Incremental Snapshots and Backup"
+msgstr "增量快照和备份"
+
+# 790dbaf719ea4af3a21944492c933590
+#: ../../storage.rst:795
+msgid ""
+"Snapshots are created on primary storage where a disk resides. After a "
+"snapshot is created, it is immediately backed up to secondary storage and "
+"removed from primary storage for optimal utilization of space on primary "
+"storage."
+msgstr "创建的快照保存在磁盘所在的主存储。在创建快照之后,它会立即被备份到辅助存储并在主存储上删除以节省主存储的空间。"
+
+# c6a3543640914d2abcb184e9f17b9a33
+#: ../../storage.rst:800
+msgid ""
+"CloudStack does incremental backups for some hypervisors. When incremental "
+"backups are supported, every N backup is a full backup."
+msgstr "CloudStack给一些 hypervisors做增量备份。当使用了增量备份,那么每N备份就是一个完全备份。"
+
+# ca4450266a9e41e4ba1d71743809cc71
+#: ../../storage.rst:807
+msgid "Support incremental backup"
+msgstr "支持增量备份"
+
+# 05da4101c8ee4a32a1cd8e61dd902cca
+#: ../../storage.rst:812
+msgid "Volume Status"
+msgstr "卷状态"
+
+# 389f5943ba4c4e04be7c271c11632520
+#: ../../storage.rst:814
+msgid ""
+"When a snapshot operation is triggered by means of a recurring snapshot "
+"policy, a snapshot is skipped if a volume has remained inactive since its "
+"last snapshot was taken. A volume is considered to be inactive if it is "
+"either detached or attached to a VM that is not running. CloudStack ensures "
+"that at least one snapshot is taken since the volume last became inactive."
+msgstr "当快照操作是由一个循环快照策略所引发的时候,如果从其上次创建快照后,卷一直处于非活跃状态,快照被跳过。如果卷被分离或附加的虚拟机没有运行,那么它就被认为是非活跃的。CloudStack会确保从卷上一次变得不活跃后,至少创建了一个快照。"
+
+# f6a7564bbd474bb28c93ac2ef46e537f
+#: ../../storage.rst:821
+msgid ""
+"When a snapshot is taken manually, a snapshot is always created regardless "
+"of whether a volume has been active or not."
+msgstr "当手动创建了快照,不管改卷是不是活跃的,快照会一直被创建。"
+
+# e1558eacbe2f4d768b7fe6e226152c57
+#: ../../storage.rst:825
+msgid "Snapshot Restore"
+msgstr "快照恢复"
+
+# eb2f5defecae49b9a0b4338cc0a8ff65
+#: ../../storage.rst:827
+msgid ""
+"There are two paths to restoring snapshots. Users can create a volume from "
+"the snapshot. The volume can then be mounted to a VM and files recovered as "
+"needed. Alternatively, a template may be created from the snapshot of a root"
+" disk. The user can then boot a VM from this template to effect recovery of "
+"the root disk."
+msgstr "有两种方式恢复快照。用户能够从快照中创建一个卷。卷可以随后被挂载到虚拟机上并且文件根据需要被复原。另一种方式是,模板可以从一个root 盘的快照创建。用户能够从这个模板启动虚拟机从而实际上复原root盘。"
+
+# e9999cd4fd964600a2979344583457d2
+#: ../../storage.rst:834
+msgid "Snapshot Job Throttling"
+msgstr "快照工作调节"
+
+# c31b190ad5a64d5c84c623c66056d37a
+#: ../../storage.rst:836
+msgid ""
+"When a snapshot of a virtual machine is requested, the snapshot job runs on "
+"the same host where the VM is running or, in the case of a stopped VM, the "
+"host where it ran last. If many snapshots are requested for VMs on a single "
+"host, this can lead to problems with too many snapshot jobs overwhelming the"
+" resources of the host."
+msgstr "当虚拟机需要快照时,VM所在的主机上就会运行快照工作,或者在VM最后运行的主机上。如果在一台主机上的VMs需要很多快照,那么这会导致太多的快照工作进而占用过多的主机资源。"
+
+# b250747385d042f49ad48f81329b10a7
+#: ../../storage.rst:842
+msgid ""
+"To address this situation, the cloud's root administrator can throttle how "
+"many snapshot jobs are executed simultaneously on the hosts in the cloud by "
+"using the global configuration setting "
+"concurrent.snapshots.threshold.perhost. By using this setting, the "
+"administrator can better ensure that snapshot jobs do not time out and "
+"hypervisor hosts do not experience performance issues due to hosts being "
+"overloaded with too many snapshot requests."
+msgstr "针对这种情况,云端的root管理员可以利用全局配置设置中的concurrent.snapshots.threshold.perhost调节有多少快照工作同时在主机上运行。借助这个设置,当太多快照请求发生时,管理员更好的确认快照工作不会超时并且hypervisor主机不会有性能问题。"
+
+# d1dd9aa964bc44e39ace5434f582dcd1
+#: ../../storage.rst:850
+msgid ""
+"Set concurrent.snapshots.threshold.perhost to a value that represents a best"
+" guess about how many snapshot jobs the hypervisor hosts can execute at one "
+"time, given the current resources of the hosts and the number of VMs running"
+" on the hosts. If a given host has more snapshot requests, the additional "
+"requests are placed in a waiting queue. No new snapshot jobs will start "
+"until the number of currently executing snapshot jobs falls below the "
+"configured limit."
+msgstr "给concurrent.snapshots.threshold.perhost设置一个你结合目前主机资源和在主机上运行的VMs数量的最佳值,这个值代表了在同一时刻有多少快照工作在hypervisor主机上执行。如果一个主机有比较多的快照请求,额外的请求就会被放在等待队列里。在当前执行 的快照工作数量下降至限制值之内,新的快照工作才会开始。"
+
+# 7b49369aa49743b780984cc9c3bd2c52
+#: ../../storage.rst:858
+msgid ""
+"The admin can also set job.expire.minutes to place a maximum on how long a "
+"snapshot request will wait in the queue. If this limit is reached, the "
+"snapshot request fails and returns an error message."
+msgstr "管理员也可以通过job.expire.minutes给快照请求等待队列的长度设置一个最大值。如果达到了这个限制,那么快照请求会失败并且返回一个错误消息。"
+
+# fb6fcac386824780ac7f09de0d50a555
+#: ../../storage.rst:863
+msgid "VMware Volume Snapshot Performance"
+msgstr "VMware卷快照性能"
+
+# 80cd717eab4a487f89e5d530af50dcdf
+#: ../../storage.rst:865
+msgid ""
+"When you take a snapshot of a data or root volume on VMware, CloudStack uses"
+" an efficient storage technique to improve performance."
+msgstr "当你为VMware中的数据卷或root卷做快照时,CloudStack使用一种高效率的存储技术来提高性能。"
+
+# 0feb29ffc87942eaa740795e36db3801
+#: ../../storage.rst:868
+msgid ""
+"A snapshot is not immediately exported from vCenter to a mounted NFS share "
+"and packaged into an OVA file format. This operation would consume time and "
+"resources. Instead, the original file formats (e.g., VMDK) provided by "
+"vCenter are retained. An OVA file will only be created as needed, on demand."
+" To generate the OVA, CloudStack uses information in a properties file "
+"(\\*.ova.meta) which it stored along with the original snapshot data."
+msgstr "快照不会立即从vCenter导出OVA格式文件到挂载的NFS共享中。这个操作会消耗时间和资源。相反的,由vCenter提供的原始文件格式(比如VMDK)被保留。OVA文件只有在需要的时候被创建。CloudStack使用与原始快照数据存储在一起的属性文件(\\*.ova.meta)中的信息来生成OVA。"
+
+# de8e361b5b984d8fac0ef05d6f5e03e2
+#: ../../storage.rst:877
+msgid ""
+"For upgrading customers: This process applies only to newly created "
+"snapshots after upgrade to CloudStack 4.2. Snapshots that have already been "
+"taken and stored in OVA format will continue to exist in that format, and "
+"will continue to work as expected."
+msgstr "对于旧版本升级的客户:这个过程只适用于在升级到CloudStack 4.2之后新创建的快照。已经做过快照并且使用OVA格式存储的将继续使用已有的格式,并且也能正常工作。"


[25/40] git commit: Add po files for zh_CN

Posted by ra...@apache.org.
Add po files for zh_CN


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

Branch: refs/heads/4.4
Commit: fff40fc1966522f4355121299607f858f90a4032
Parents: a209573
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Tue May 27 10:59:48 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Tue May 27 10:59:48 2014 +0200

----------------------------------------------------------------------
 source/locale/zh_CN/LC_MESSAGES/accounts.po     |  553 ++
 .../locale/zh_CN/LC_MESSAGES/administration.po  |   96 +
 source/locale/zh_CN/LC_MESSAGES/api.po          |  155 +
 source/locale/zh_CN/LC_MESSAGES/events.po       |  414 +
 source/locale/zh_CN/LC_MESSAGES/hosts.po        | 1059 +++
 source/locale/zh_CN/LC_MESSAGES/index.po        |  104 +
 source/locale/zh_CN/LC_MESSAGES/management.po   |  605 ++
 source/locale/zh_CN/LC_MESSAGES/networking.po   |  901 ++
 source/locale/zh_CN/LC_MESSAGES/networking2.po  | 8448 ++++++++++++++++++
 source/locale/zh_CN/LC_MESSAGES/projects.po     |  756 ++
 source/locale/zh_CN/LC_MESSAGES/reliability.po  |  486 +
 .../zh_CN/LC_MESSAGES/service_offerings.po      | 1080 +++
 source/locale/zh_CN/LC_MESSAGES/storage.po      | 1461 +++
 source/locale/zh_CN/LC_MESSAGES/systemvm.po     |  958 ++
 source/locale/zh_CN/LC_MESSAGES/templates.po    | 1557 ++++
 .../locale/zh_CN/LC_MESSAGES/troubleshooting.po |  499 ++
 source/locale/zh_CN/LC_MESSAGES/tuning.po       |  166 +
 source/locale/zh_CN/LC_MESSAGES/ui.po           |  457 +
 source/locale/zh_CN/LC_MESSAGES/usage.po        | 1656 ++++
 .../zh_CN/LC_MESSAGES/virtual_machines.po       | 1860 ++++
 20 files changed, 23271 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/accounts.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/accounts.po b/source/locale/zh_CN/LC_MESSAGES/accounts.po
new file mode 100644
index 0000000..c7f84c9
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/accounts.po
@@ -0,0 +1,553 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+# morgan wang <mo...@gmail.com>, 2014
+# renoshen <sh...@sinosig.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 07:52+0000\n"
+"Last-Translator: renoshen <sh...@sinosig.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 90951daa147540dab10f9d0c78d8c73b
+#: ../../accounts.rst:18
+msgid "Managing Accounts, Users and Domains"
+msgstr "管理账户,用户和域"
+
+# 661635f04f94452db5ca9e4dd563cef7
+#: ../../accounts.rst:21
+msgid "Accounts, Users, and Domains"
+msgstr "账户,用户,域"
+
+# a7494e04f72d469a86f3c67e958ed65f
+#: ../../accounts.rst:24
+msgid "Accounts"
+msgstr "账户"
+
+# 457dea8dff534d9aa75e2270c1e1ac6d
+#: ../../accounts.rst:26
+msgid ""
+"An account typically represents a customer of the service provider or a "
+"department in a large organization. Multiple users can exist in an account."
+msgstr "一个账户通常代表一个客户的服务提供者或一个大组织中的一个部门。一个账户可存在多个用户。"
+
+# b45cd9ee7d3e478cbb3c129943ce53d5
+#: ../../accounts.rst:31
+msgid "Domains"
+msgstr "域"
+
+# 10ebf41c7dbf4e65b1be24934d043965
+#: ../../accounts.rst:33
+msgid ""
+"Accounts are grouped by domains. Domains usually contain multiple accounts "
+"that have some logical relationship to each other and a set of delegated "
+"administrators with some authority over the domain and its subdomains. For "
+"example, a service provider with several resellers could create a domain for"
+" each reseller."
+msgstr "帐户通常按域进行分组。域中经常包含多个账户,这些账户间存在一些逻辑上关系和一系列该域和其子域下的委派的管理员(这段的意思就是说在逻辑上域下可以有管理员,子域下也可以有管理员)。比如,一个服务提供商可有多个分销商这样的服务提供商就能为每一个分销商创建一个域"
+
+# 403c3bff584f41c6b9ee1d4ba5bc6241
+#: ../../accounts.rst:39
+msgid ""
+"For each account created, the Cloud installation creates three different "
+"types of user accounts: root administrator, domain administrator, and user."
+msgstr "对于每个账户的创建,&PRODUCT; 创建了三种不同类型的用户账户:根管理员,域管理员,普通用户。"
+
+# 65e0965c3efe4beb825b48109a593375
+#: ../../accounts.rst:44
+msgid "Users"
+msgstr "普通用户"
+
+# 34892ebe1c424238b2d30be07cfbef77
+#: ../../accounts.rst:46
+msgid ""
+"Users are like aliases in the account. Users in the same account are not "
+"isolated from each other, but they are isolated from users in other "
+"accounts. Most installations need not surface the notion of users; they just"
+" have one user per account. The same user cannot belong to multiple "
+"accounts."
+msgstr "用户就像是账户的别名。在同一账户下的用户彼此之间并非隔离的。但是他们与不同账户下的用户是相互隔离的。大多数安装不需要用户的表面概念;他们只是每一个帐户的用户。同一用户不能属于多个帐户。"
+
+# 31c0da272edb4413bba06570446855e5
+#: ../../accounts.rst:52
+msgid ""
+"Username is unique in a domain across accounts in that domain. The same "
+"username can exist in other domains, including sub-domains. Domain name can "
+"repeat only if the full pathname from root is unique. For example, you can "
+"create root/d1, as well as root/foo/d1, and root/sales/d1."
+msgstr "多个账户中的用户名在域中应该是唯一的。相同的用户名能在其他的域中存在,包括子域。域名只有在全路径名唯一的时候才能重复。比如,你能创建一个root/d1,也可以创建root/foo/d1和root/sales/d1。"
+
+# 1754108df51d4b9aa2bfcab98e1b9bf0
+#: ../../accounts.rst:57
+msgid ""
+"Administrators are accounts with special privileges in the system. There may"
+" be multiple administrators in the system. Administrators can create or "
+"delete other administrators, and change the password for any user in the "
+"system."
+msgstr "管理员在系统中是拥有特权的账户。可能有多个管理员在系统中,管理员能创建删除其他管理员,并且修改系统中任意用户的密码。"
+
+# 12ec03346ad2491195e691d8d6e3139b
+#: ../../accounts.rst:63
+msgid "Domain Administrators"
+msgstr "域管理员"
+
+# 14a1bb86d2624ad3b4c82731fa8dd170
+#: ../../accounts.rst:65
+msgid ""
+"Domain administrators can perform administrative operations for users who "
+"belong to that domain. Domain administrators do not have visibility into "
+"physical servers or other domains."
+msgstr "域管理员可以对属于该域的用户进行管理操作。域管理员在物理服务器或其他域中不可见。"
+
+# 39f193590cb5492691994021f7591f2e
+#: ../../accounts.rst:70
+msgid "Root Administrator"
+msgstr "根管理员"
+
+# 97d51f9ba69843b5af3c3770b5e6a41d
+#: ../../accounts.rst:72
+msgid ""
+"Root administrators have complete access to the system, including managing "
+"templates, service offerings, customer care administrators, and domains"
+msgstr "根管理员拥有系统完全访问权限,包括管理模板,服务方案,客户服务管理员和域。"
+
+# 0231216736c74923a934181f66c7be6d
+#: ../../accounts.rst:77
+msgid "Resource Ownership"
+msgstr "资源所有权"
+
+# 72eb8676abfd416cb9bbb177a3de84f6
+#: ../../accounts.rst:79
+msgid ""
+"Resources belong to the account, not individual users in that account. For "
+"example, billing, resource limits, and so on are maintained by the account, "
+"not the users. A user can operate on any resource in the account provided "
+"the user has privileges for that operation. The privileges are determined by"
+" the role. A root administrator can change the ownership of any virtual "
+"machine from one account to any other account by using the "
+"assignVirtualMachine API. A domain or sub-domain administrator can do the "
+"same for VMs within the domain from one account to any other account in the "
+"domain or any of its sub-domains."
+msgstr "资源属于帐户,而不是帐户中的单个用户。例如,账单、资源限制等由帐户维护,而不是用户维护。用户有权限操作任何在帐户中提供的资源。权限有角色决定。根管理员通过使用assignVirtualMachine API可以将任何虚拟机的所有权从一个帐户调整到另一个帐户。域或子域管理员可以对域中的VMs做同样的操作,包括子域。"
+
+# ff5d0b1e1c574c599f7af2c724e6fed1
+#: ../../accounts.rst:90
+msgid "Dedicating Resources to Accounts and Domains"
+msgstr "给帐户和域分配专用资源"
+
+# 0a4bdfeefcbc4e6b90e29d85882276e5
+#: ../../accounts.rst:92
+msgid ""
+"The root administrator can dedicate resources to a specific domain or "
+"account that needs private infrastructure for additional security or "
+"performance guarantees. A zone, pod, cluster, or host can be reserved by the"
+" root administrator for a specific domain or account. Only users in that "
+"domain or its subdomain may use the infrastructure. For example, only users "
+"in a given domain can create guests in a zone dedicated to that domain."
+msgstr "根管理员可以将资源分配给指定的域或为了保证额外的安全或性能从而需要单独基础架构帐户。为了一个指定的域或账号,区域、机架、群集或者主机可以被根管理员保留。只有域或它的子域中的用户可以使用这个基础架构。比如,只有域中的用户可以在其中的区域中创建来宾虚机。"
+
+# d6b26e49ebc04db7bc3a577de66cada3
+#: ../../accounts.rst:100
+msgid "There are several types of dedication available:"
+msgstr "这里有几种有效的分配方式:"
+
+# dac518c9d097412c8fc411ea7ed6a9e7
+#: ../../accounts.rst:104
+msgid ""
+"Explicit dedication. A zone, pod, cluster, or host is dedicated to an "
+"account or domain by the root administrator during initial deployment and "
+"configuration."
+msgstr "明确的专用。根管理员在初始部署和配置期间给一个帐户或者域分配了一个区域、机架、群集或者主机。"
+
+# 574012d1f1984a9a8d7a720f9ea1c4d6
+#: ../../accounts.rst:110
+msgid ""
+"Strict implicit dedication. A host will not be shared across multiple "
+"accounts. For example, strict implicit dedication is useful for deployment "
+"of certain types of applications, such as desktops, where no host can be "
+"shared between different accounts without violating the desktop software's "
+"terms of license."
+msgstr "严格的潜在专用:一个主机禁止通过多个账号共享。例如,严格私自共享对于部署的某些应用是有用处的,像没有软件授权主机不能在不同账号间进行桌面共享。"
+
+# a5988bb1ccf4413394ead18a5bf8d2b4
+#: ../../accounts.rst:118
+msgid ""
+"Preferred implicit dedication. The VM will be deployed in dedicated "
+"infrastructure if possible. Otherwise, the VM can be deployed in shared "
+"infrastructure."
+msgstr "优先的潜在专用。如果可以的话,VM会被部署在专用的基础架构中。否则,VM可被部署在共享基础架构中。"
+
+# 599bcac969ab4007b46f4a44e3aab507
+#: ../../accounts.rst:123
+msgid "How to Dedicate a Zone, Cluster, Pod, or Host to an Account or Domain"
+msgstr "如何给帐户或者域指定一个区域、群集、机架或者主机"
+
+# 235f58f9b9bd48eab66c66dc94d93e40
+#: ../../accounts.rst:125
+msgid ""
+"For explicit dedication: When deploying a new zone, pod, cluster, or host, "
+"the root administrator can click the Dedicated checkbox, then choose a "
+"domain or account to own the resource."
+msgstr "对于明确的专用:当部署一个新的区域、机架、群集或者主机的时候,根管理员可以点击Dedicated选框,然后选择域或者帐户来拥有这些资源。"
+
+# 99189fbc5d704126a534a43918bd1cc9
+#: ../../accounts.rst:129
+msgid ""
+"To explicitly dedicate an existing zone, pod, cluster, or host: log in as "
+"the root admin, find the resource in the UI, and click the Dedicate button. "
+"|button to dedicate a zone, pod,cluster, or host|"
+msgstr "对于明确的专用一个已存在的区域、机架、群集或者主机:使用根管理员登录,在UI中找到资源,然后点击Dedicate按钮。|button to dedicate a zone, pod,cluster, or host|"
+
+# e7ebf6fbd7d048bf822061139e2b5a4c
+#: ../../accounts.rst:133
+msgid ""
+"For implicit dedication: The administrator creates a compute service "
+"offering and in the Deployment Planner field, chooses "
+"ImplicitDedicationPlanner. Then in Planner Mode, the administrator specifies"
+" either Strict or Preferred, depending on whether it is permissible to allow"
+" some use of shared resources when dedicated resources are not available. "
+"Whenever a user creates a VM based on this service offering, it is allocated"
+" on one of the dedicated hosts."
+msgstr "对于隐式的专用:管理员创建的计算服务方案和在部署规划区域选择ImplicitDedicationPlanner。然后在规划模型中,管理员按照是否允许一些人当没有专用资源可用的时候使用共享资源来选择严格的或者优先的。无论何时,用户基于这个服务方案创建的VM都会位于专用主机。"
+
+# 57e1c25d97df4d22b88b35dc599e45f7
+#: ../../accounts.rst:142
+msgid "How to Use Dedicated Hosts"
+msgstr "如何使用专用主机"
+
+# b227acf3ae06498d99b21119713e2238
+#: ../../accounts.rst:144
+msgid ""
+"To use an explicitly dedicated host, use the explicit-dedicated type of "
+"affinity group (see `“Affinity Groups” <virtual_machines.html#affinity-"
+"groups>`_). For example, when creating a new VM, an end user can choose to "
+"place it on dedicated infrastructure. This operation will succeed only if "
+"some infrastructure has already been assigned as dedicated to the user's "
+"account or domain."
+msgstr "要使用明确专用主机,在关联组 (参阅 `“关联组” <virtual_machines.html#affinity-groups>`_)中选择explicit-dedicated 类型。比如,当创建新VM的时候,终端用户可以选择将其运行在专用基础架构上。如果一些基础架构已经被分配给专用的用户帐号或域,那么这个操作才能成功。"
+
+# f9c5cb26d6904347ad48d4ceba1481a6
+#: ../../accounts.rst:152
+msgid "Behavior of Dedicated Hosts, Clusters, Pods, and Zones"
+msgstr "专用主机、群集、机架和区域的行为"
+
+# 05b28e9607634f78abda79633a1403cf
+#: ../../accounts.rst:154
+msgid ""
+"The administrator can live migrate VMs away from dedicated hosts if desired,"
+" whether the destination is a host reserved for a different account/domain "
+"or a host that is shared (not dedicated to any particular account or "
+"domain). CloudStack will generate an alert, but the operation is allowed."
+msgstr "管理员可以将VMs从专用主机上迁移到任何想要的地方,不管目标主机是不同帐号/域专用的还是共享的主机(不对任何特殊帐号或域专用)。CloudStack将生成一个警告,不过操作还是允许的。"
+
+# ce25fc9a198a4cbeaabd2e2405325e9c
+#: ../../accounts.rst:160
+msgid ""
+"Dedicated hosts can be used in conjunction with host tags. If both a host "
+"tag and dedication are requested, the VM will be placed only on a host that "
+"meets both requirements. If there is no dedicated resource available to that"
+" user that also has the host tag requested by the user, then the VM will not"
+" deploy."
+msgstr "专用主机可用主机标签连接。如果同时需要主机标签和专用,那么VM将只会在匹配所有需求的主机上运行。如果没有专用资源可用于这类用户,那么VM就不会被不部署。"
+
+# aeb33b23037c45be909c3768cc8966b6
+#: ../../accounts.rst:166
+msgid ""
+"If you delete an account or domain, any hosts, clusters, pods, and zones "
+"that were dedicated to it are freed up. They will now be available to be "
+"shared by any account or domain, or the administrator may choose to re-"
+"dedicate them to a different account or domain."
+msgstr "如果你删除了一个指定了专用资源的帐号或者域,那么其中的任何主机、群集、机架和区域就会被释放。它们会变成可被任何帐户或者域共享,或者管理员可选择重新把它们指定给不同的帐号或域。"
+
+# 1ce4e0516a79477a817eb0619fbfb51e
+#: ../../accounts.rst:171
+msgid ""
+"System VMs and virtual routers affect the behavior of host dedication. "
+"System VMs and virtual routers are owned by the CloudStack system account, "
+"and they can be deployed on any host. They do not adhere to explicit "
+"dedication. The presence of system vms and virtual routers on a host makes "
+"it unsuitable for strict implicit dedication. The host can not be used for "
+"strict implicit dedication, because the host already has VMs of a specific "
+"account (the default system account). However, a host with system VMs or "
+"virtual routers can be used for preferred implicit dedication."
+msgstr "系统VMs和虚拟路由器影响专用主机的行为。系统VMs和虚拟路由器由CloudStack系统账号拥有,并且它们可在任何主机上部署。它们不会伴随着明确专用主机。主机上的系统虚机和虚拟路由器使其不再适合作为严格的潜在专用主机。主机之所以不能用于严格的潜在专用主机,是因为主机已经有针对帐号(默认系统账号)的VMs。尽管如此,运行着系统VMs或虚拟路由器的主机可以被用于优先的潜在专用。"
+
+# ad8c17e1de7c4cb4af2c8b55ee0a851c
+#: ../../accounts.rst:182
+msgid "Using an LDAP Server for User Authentication"
+msgstr "使用LDAP服务器用于用户验证"
+
+# d3eb07c14a05493ba2ff39ea53010821
+#: ../../accounts.rst:184
+msgid ""
+"You can use an external LDAP server such as Microsoft Active Directory or "
+"ApacheDS to authenticate CloudStack end-users. Just map CloudStack accounts "
+"to the corresponding LDAP accounts using a query filter. The query filter is"
+" written using the query syntax of the particular LDAP server, and can "
+"include special wildcard characters provided by CloudStack for matching "
+"common values such as the user’s email address and name. CloudStack will "
+"search the external LDAP directory tree starting at a specified base "
+"directory and return the distinguished name (DN) and password of the "
+"matching user. This information along with the given password is used to "
+"authenticate the user.."
+msgstr "你可以使用一个外部LDAP服务器,例如微软活动目录或ApacheDS进行CloudStack的终端用户验证。仅仅使用查询过滤器映射CloudStack账户与对应的LDAP帐户。查询过滤器是使用查询语法写的特别的LDAP服务器,可以包括用CloudStack提供的特殊通配符匹配通用的像用户的电子邮件地址和名称这种值。CloudStack将在外部LDAP目录树中从一个指定的基目搜索录并返回专有名称(DN)和密码匹配用户。这个信息以及给定的密码是用于验证用户。。"
+
+# efbc795d47b644b592c065f9221a5ecc
+#: ../../accounts.rst:195
+msgid ""
+"To set up LDAP authentication in CloudStack, call the CloudStack API command"
+" ldapConfig and provide the following:"
+msgstr "在CloudStack中设置LDAP验证,调用CloudStack API指令ldapConfig,并提供如下:"
+
+# 7826c9574e864a3fa3927d2452d6f247
+#: ../../accounts.rst:200
+msgid "Hostname or IP address and listening port of the LDAP server"
+msgstr "LDAP服务器的主机名或IP地址和监听端口"
+
+# 70b92e095a0749628ec280152921d951
+#: ../../accounts.rst:204
+msgid "Base directory and query filter"
+msgstr "基本目录和查询过滤器"
+
+# 4fe250c5d3ac44ab883b8c10af24f1fe
+#: ../../accounts.rst:208
+msgid ""
+"Search user DN credentials, which give CloudStack permission to search on "
+"the LDAP server"
+msgstr "搜索用户DN 凭证,这个凭证是授予CloudStack允许搜索LDAP服务器上的凭证"
+
+# 2ceaa9828892484ebd391520d745991d
+#: ../../accounts.rst:213
+msgid "SSL keystore and password, if SSL is used"
+msgstr "SSL密钥库和密码,如果使用了SSL"
+
+# 26d8fb1d67a74f8387452da5b3cce675
+#: ../../accounts.rst:216
+msgid "Example LDAP Configuration Commands"
+msgstr "LDAP配置命令示例"
+
+# 1c19000335be4f7ebdab1d79a7c4658c
+#: ../../accounts.rst:218
+msgid ""
+"To understand the examples in this section, you need to know the basic "
+"concepts behind calling the CloudStack API, which are explained in the "
+"Developer’s Guide."
+msgstr "为了明白本章节的示例, 你需要知道调用CloudStack API的基本概念,这在开发者文档中有讲解。"
+
+# d7aafed8ded6431d8129d3bbe41769aa
+#: ../../accounts.rst:222
+msgid ""
+"The following shows an example invocation of ldapConfig with an ApacheDS "
+"LDAP server"
+msgstr "以下展示了通过ApacheDS LDAP服务器调用 ldapConfig命令的示例"
+
+# 7214405299e94877a1c09f6c6287ee10
+#: ../../accounts.rst:229
+msgid ""
+"The command must be URL-encoded. Here is the same example without the URL "
+"encoding:"
+msgstr "命令调用的URL必须进行编码. 这里是一个没有进行URL编码的示例:"
+
+# 74c45748c7614774911829b534605cc1
+#: ../../accounts.rst:247
+msgid ""
+"The following shows a similar command for Active Directory. Here, the search"
+" base is the testing group within a company, and the users are matched up "
+"based on email address."
+msgstr "以下展示了与活动目录类似的命令。这里,搜索是基于一个公司的测试组,用户是根据邮件地址进行查找。"
+
+# e42d0dbce6674c9ba00d73998fb30e71
+#: ../../accounts.rst:255
+msgid ""
+"The next few sections explain some of the concepts you will need to know "
+"when filling out the ldapConfig parameters."
+msgstr "接下来的几个章节解释了当填写ldapConfig参数时你需要知道的一些概念。"
+
+# a47324fc43df41cdbcae97f676f2536f
+#: ../../accounts.rst:259
+msgid "Search Base"
+msgstr "搜索基础目录"
+
+# f44d14b0d741402087e0cc706bbb068e
+#: ../../accounts.rst:261
+msgid ""
+"An LDAP query is relative to a given node of the LDAP directory tree, called"
+" the search base. The search base is the distinguished name (DN) of a level "
+"of the directory tree below which all users can be found. The users can be "
+"in the immediate base directory or in some subdirectory. The search base may"
+" be equivalent to the organization, group, or domain name. The syntax for "
+"writing a DN varies depending on which LDAP server you are using. A full "
+"discussion of distinguished names is outside the scope of our documentation."
+" The following table shows some examples of search bases to find users in "
+"the testing department.."
+msgstr "LDAP查询与一个LDAP目录树中的节点有关,称之为做搜索基础目录。搜索基础目录是目录库中的一级的distinguished name(DN),在这里能找到所有用户。用户可以直属于根目录或者一些子目录。搜索基础目录可能是组织、组或者域用户名。用于写DN变量的语法取决于你所使用的LDAP服务。再深入全面的讨论distinguished names超出了我们文档的范围。以下表格中展示了一些在搜索基础目录中查找测试部门中用户的示例。"
+
+# c824c6d3616243eaa848cc45808ec373
+# 46c8c55831674fd3a12caa7352108fa4
+#: ../../accounts.rst:272 ../../accounts.rst:328
+msgid "LDAP Server"
+msgstr "LDAP服务器"
+
+# bf34c451c0994186b556742324006c30
+#: ../../accounts.rst:272
+msgid "Example Search Base DN"
+msgstr "搜索基本DN示例"
+
+# c6940ea324fb4c99895c4d2152bfd32e
+# 359bafef7f4044e380b30643767ad285
+#: ../../accounts.rst:274 ../../accounts.rst:330
+msgid "ApacheDS"
+msgstr "ApacheDS"
+
+# 2253d38b2ae84eeab805635117cf368c
+#: ../../accounts.rst:274
+msgid "OU=testing, O=project"
+msgstr "OU=testing, O=project"
+
+# ddf11f35901948058a34dff9cbca8c3d
+# 6d6eab10b7674a65aedf6c1f41312bf8
+#: ../../accounts.rst:275 ../../accounts.rst:331
+msgid "Active Directory"
+msgstr "Active Directory"
+
+# 0fdc037b3c2746e0b455bd0594bf0bee
+#: ../../accounts.rst:275
+msgid "OU=testing, DC=company"
+msgstr "OU=testing, DC=company"
+
+# 03d46aff89114039bebeeea32fbcda86
+#: ../../accounts.rst:279
+msgid "Query Filter"
+msgstr "查询过滤"
+
+# 93b867a441bc4cddad5a72d6b9e51abf
+#: ../../accounts.rst:281
+msgid ""
+"The query filter is used to find a mapped user in the external LDAP server. "
+"The query filter should uniquely map the CloudStack user to LDAP user for a "
+"meaningful authentication. For more information about query filter syntax, "
+"consult the documentation for your LDAP server."
+msgstr "查询过滤器用于在外部LDAP服务器中查找一个映射的用户。为实现有效认证,查询过滤器应该将CloudStack的用户唯一映射到LDAP用户。关于查询过滤器的语法,请参考您使用的LDAP服务器文档。"
+
+# 94920970089b494395b1e5410ad30bb1
+#: ../../accounts.rst:286
+msgid "The CloudStack query filter wildcards are:"
+msgstr "CloudStack查询过滤的通配符有:"
+
+# f7c82cdd777a4284b5adc6a920065f32
+#: ../../accounts.rst:289
+msgid "Query Filter Wildcard"
+msgstr "查询过滤通配符"
+
+# 2e1c45a30d2648c6878074583a6a4c7b
+#: ../../accounts.rst:289
+msgid "Description"
+msgstr "描述"
+
+# b636b6a26b4942d390e3083bb99636ec
+#: ../../accounts.rst:291
+msgid "%u"
+msgstr "%u"
+
+# b85fa10a6f7c473f9579fbee87abc7dc
+#: ../../accounts.rst:291
+msgid "User name"
+msgstr "用户名"
+
+# aaca04ef47ce4a6d957d7f999021beec
+#: ../../accounts.rst:292
+msgid "%e"
+msgstr "%e"
+
+# 04104fb07bb94de38b10667d6fdadf04
+#: ../../accounts.rst:292
+msgid "Email address"
+msgstr "邮件地址"
+
+# ae0690d61f774148a22980a6ed2d4c98
+#: ../../accounts.rst:293
+msgid "%n"
+msgstr "%n"
+
+# 5c8df2d1e58b4c88b7f6f76691f54e32
+#: ../../accounts.rst:293
+msgid "First and last name"
+msgstr "姓名"
+
+# fb24e5d77b0b4a369c988a18859c27b5
+#: ../../accounts.rst:296
+msgid ""
+"The following examples assume you are using Active Directory, and refer to "
+"user attributes from the Active Directory schema."
+msgstr "下面的示例假设你使用活动目录, 并从活动目录架构中获得用户属性."
+
+# 53d9ff57793f490ea016d5c0dd2235e1
+#: ../../accounts.rst:299
+msgid "If the CloudStack user name is the same as the LDAP user ID:"
+msgstr "如果 CloudStack 的用户名与LDAP中的用户ID一致:"
+
+# fe9b3901fa4c442dbba0966d900dc335
+#: ../../accounts.rst:305
+msgid "If the CloudStack user name is the LDAP display name:"
+msgstr "如果CloudStack的用户名是LDAP中的显示名字:"
+
+# 67bfee8945324987bfa2debd1cbd0f29
+#: ../../accounts.rst:311
+msgid "To find a user by email address:"
+msgstr "使用邮件地址查找用户:"
+
+# 0a2a4f3d28a447ccafdcade93acec26e
+#: ../../accounts.rst:318
+msgid "Search User Bind DN"
+msgstr "搜索用户绑定的DN"
+
+# 9d07ca9ffe4d45e1a14848570aad2f64
+#: ../../accounts.rst:320
+msgid ""
+"The bind DN is the user on the external LDAP server permitted to search the "
+"LDAP directory within the defined search base. When the DN is returned, the "
+"DN and passed password are used to authenticate the CloudStack user with an "
+"LDAP bind. A full discussion of bind DNs is outside the scope of our "
+"documentation. The following table shows some examples of bind DNs."
+msgstr "bind DN是位于外部被允许在定义的搜索基础目录中搜索LDAP目录的LDAP服务器上的用户。当DN返回值的时候,DN和通过的密码就与LDAPbind一起被用于验证CloudStack 用户。再深入完全的讨论bind DNs超出了文档的范围。下面的表格展示了一些bind DNs的实例。"
+
+# 3b0b6b5b036945e6bb5442cb94a46fcd
+#: ../../accounts.rst:328
+msgid "Example Bind DN"
+msgstr "绑定DN示例"
+
+# 1cd4f20b644c4fd68eb8a37ef35f7b47
+#: ../../accounts.rst:330
+msgid "CN=Administrator,DC=testing,OU=project,OU=org"
+msgstr "CN=Administrator,DC=testing,OU=project,OU=org"
+
+# 2e60a99cfddd494c9de480a48304dfe3
+#: ../../accounts.rst:331
+msgid "CN=Administrator, OU=testing, DC=company, DC=com"
+msgstr "CN=Administrator, OU=testing, DC=company, DC=com"
+
+# 16cd1707b0594271ae8a6ae3884ec80e
+#: ../../accounts.rst:336
+msgid "SSL Keystore Path and Password"
+msgstr "SSL 密钥库路径和密码"
+
+# 074f3d04369241be9e56096bb7dded79
+#: ../../accounts.rst:338
+msgid ""
+"If the LDAP server requires SSL, you need to enable it in the ldapConfig "
+"command by setting the parameters ssl, truststore, and truststorepass. "
+"Before enabling SSL for ldapConfig, you need to get the certificate which "
+"the LDAP server is using and add it to a trusted keystore. You will need to "
+"know the path to the keystore and the password."
+msgstr "如果LDAP 服务器要求SSL, 你需要在ldapConfig命令中通过设置参数ssl, truststore和truststorepass使其生效。在使SSL 对ldapConfig 生效之前,你需要得到LDAP服务器在使用的证书并把它加到被信任的密钥库中。你将需要知道到密钥库和密码的路径。"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/administration.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/administration.po b/source/locale/zh_CN/LC_MESSAGES/administration.po
new file mode 100644
index 0000000..b33ac83
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/administration.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 02:01+0000\n"
+"Last-Translator: darrentang <da...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 5782522e7a564a9caa1ecc02e0977696
+#: ../../administration.rst:19
+msgid "User Services"
+msgstr "用户服务"
+
+# 06114f8c3f954e45b8add1ef10ed3f6e
+#: ../../administration.rst:21
+msgid ""
+"In addition to the physical and logical infrastructure of your cloud and the"
+" CloudStack software and servers, you also need a layer of user services so "
+"that people can actually make use of the cloud. This means not just a user "
+"UI, but a set of options and resources that users can choose from, such as "
+"templates for creating virtual machines, disk storage, and more. If you are "
+"running a commercial service, you will be keeping track of what services and"
+" resources users are consuming and charging them for that usage. Even if you"
+" do not charge anything for people to use your cloud – say, if the users are"
+" strictly internal to your organization, or just friends who are sharing "
+"your cloud – you can still keep track of what services they use and how much"
+" of them."
+msgstr "除了云中的物理和逻辑基础设施以及CloudStack软件和服务器,你还需要一个用户服务层以便让人们能够真正利用云。这不仅仅意味这一个用户界面,而是一组用户可选择的选项和资源,如通过模版创建虚拟机,磁盘存储等等。如果您正在运行一个商业服务,您将可以跟踪服务和用户资源的使用以及使用计费情况。即使你不对使用云的人收费,-比如说,用户是你的内部组织,或只是你的朋友共享你的云 - 你仍然可以跟踪他们所使用的服务以及有多少人。"
+
+# 08b7862dbeb64d2d8c3e46cacc0a995d
+#: ../../administration.rst:34
+msgid "Service Offerings, Disk Offerings, Network Offerings, and Templates"
+msgstr "服务方案,磁盘方案,网络方案和模版"
+
+# f761dfbfdddc4df58bc4fb22ad4c4ada
+#: ../../administration.rst:36
+msgid ""
+"A user creating a new instance can make a variety of choices about its "
+"characteristics and capabilities. CloudStack provides several ways to "
+"present users with choices when creating a new instance:"
+msgstr "用户可以根据不同的功能和特性来创建新的实例,CloudStack提供了几种方法供用户选择以便创建一个新的实例:"
+
+# 46491c0220454387a6a1eaf3e9c62f68
+#: ../../administration.rst:42
+msgid ""
+"Service Offerings, defined by the CloudStack administrator, provide a choice"
+" of CPU speed, number of CPUs, RAM size, tags on the root disk, and other "
+"choices. See Creating a New Compute Offering."
+msgstr "服务方案,由CloudStack管理员定义,提供了CPU速率,CPU核数,内存大小,根磁盘标签等多种选项供选择。可参阅创建新的计算方案。"
+
+# 2739214a038842799d6315fc83f2d7b9
+#: ../../administration.rst:48
+msgid ""
+"Disk Offerings, defined by the CloudStack administrator, provide a choice of"
+" disk size and IOPS (Quality of Service) for primary data storage. See "
+"Creating a New Disk Offering."
+msgstr "磁盘方案,由CloudStack管理员定义,针对主数据存储提供磁盘大小和IOPS(QOS)等选项供选择。可参阅创建新的磁盘方案。"
+
+# 7b90ec0921524642a75fc2610c86c276
+#: ../../administration.rst:54
+msgid ""
+"Network Offerings, defined by the CloudStack administrator, describe the "
+"feature set that is available to end users from the virtual router or "
+"external networking devices on a given guest network. See Network Offerings."
+msgstr "网络方案,由CloudStack管理员定义,描述可用的功能集,通过虚拟路由器或给定的来宾网络中的外部网络设备提供给最终用户。参阅网络方案。"
+
+# b5a2bc83e71142d2b6133c4d6266cab9
+#: ../../administration.rst:61
+msgid ""
+"Templates, defined by the CloudStack administrator or by any CloudStack "
+"user, are the base OS images that the user can choose from when creating a "
+"new instance. For example, CloudStack includes CentOS as a template. See "
+"Working with Templates."
+msgstr "模版,由CloudStack管理员或其他CloudStack用户定义,用户创建新的实例时可选择的基本操作系统镜像。例如,CloudStack中包含的CentOS模版。可参阅使用模版。"
+
+# 2e2f04a2e3e449698ca4be2d9d1215fb
+#: ../../administration.rst:66
+msgid ""
+"In addition to these choices that are provided for users, there is another "
+"type of service offering which is available only to the CloudStack root "
+"administrator, and is used for configuring virtual infrastructure resources."
+" For more information, see Upgrading a Virtual Router with System Service "
+"Offerings."
+msgstr "除了给用户提供了这些选择,还有另一种类型的服务方案只提供给CloudStack管理员,用于配置虚拟基础设施资源。欲了解更多信息,请参阅使用系统服务方案升级虚拟路由器。"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/api.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/api.po b/source/locale/zh_CN/LC_MESSAGES/api.po
new file mode 100644
index 0000000..b16147b
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/api.po
@@ -0,0 +1,155 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-24 13:43+0000\n"
+"Last-Translator: darrentang <da...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# c9f373cc299e447998a4b0c51d6b30e1
+#: ../../api.rst:18
+msgid "CloudStack API"
+msgstr "CloudStack API"
+
+# 4f31f79497784c4eb83f19285c8fc8d4
+#: ../../api.rst:20
+msgid ""
+"The CloudStack API is a low level API that has been used to implement the "
+"CloudStack web UIs. It is also a good basis for implementing other popular "
+"APIs such as EC2/S3 and emerging DMTF standards."
+msgstr "CloudStack API 是可以被用来实现CloudStack Web UI的底层API。这是良好的基础使其提供比如EC2和S3和新兴的DMTF标准等受欢迎的API。"
+
+# 0484938f098f467e94ea20aa2d3de1f0
+#: ../../api.rst:24
+msgid ""
+"Many CloudStack API calls are asynchronous. These will return a Job ID "
+"immediately when called. This Job ID can be used to query the status of the "
+"job later. Also, status calls on impacted resources will provide some "
+"indication of their state."
+msgstr "大多CloudStack的API调用都是异步的. 在调用时它们将立即返回一个任务ID。这个任务ID稍后可以用于查询任务状态。此外,状态调用会在资源受影响时提供一些状态指示。"
+
+# 59bb256e7c6841a89ab8fd907a34f08a
+#: ../../api.rst:29
+msgid ""
+"The API has a REST-like query basis and returns results in XML or JSON."
+msgstr "API基于类似REST的查询, 可以返回XML或JSON格式."
+
+# 3f40f7f90a3b4dd2a8b4ddbb30340800
+#: ../../api.rst:31
+msgid ""
+"See `the Developer’s Guide "
+"<https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ "
+"and `the API Reference <http://cloudstack.apache.org/docs/api/>`_."
+msgstr "参阅  `开发指南 <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ 和 `参考API <http://cloudstack.apache.org/docs/api/>`_."
+
+# 850a1709dc05430b81c947813bf2c387
+#: ../../api.rst:35
+msgid "Provisioning and Authentication API"
+msgstr "配置和认证API"
+
+# 4b899aee7aa147bbb8cbe8cc3fdd3436
+#: ../../api.rst:37
+msgid ""
+"CloudStack expects that a customer will have their own user provisioning "
+"infrastructure. It provides APIs to integrate with these existing systems "
+"where the systems call out to CloudStack to add/remove users.."
+msgstr "CloudStack期望客户都会有自己的用户提供基础设施。它提供的API可与这些现有系统集成,通过外部调用CloudStack添加/删除用户。"
+
+# d1809ac4f63b4171bd2bf7449f9af520
+#: ../../api.rst:41
+msgid ""
+"CloudStack supports pluggable authenticators. By default, CloudStack assumes"
+" it is provisioned with the user’s password, and as a result authentication "
+"is done locally. However, external authentication is possible as well. For "
+"example, see Using an LDAP Server for User Authentication."
+msgstr "CloudStack支持插件类型的身份验证. 默认情况下, CloudStack假定自身提供用户密码,作为本地的验证方式. 但也可以使用外部验证。 例如, 参阅使用LDAP服务器进行用户验证。"
+
+# e0f1a61ca7404d2fbe4cfa7a466e23a6
+#: ../../api.rst:48
+msgid "User Data and Meta Data"
+msgstr "用户数据和元数据"
+
+# 4921f2bf02984bc0a308cc391af4cabf
+#: ../../api.rst:50
+msgid ""
+"CloudStack provides API access to attach up to 32KB of user data to a "
+"deployed VM. Deployed VMs also have access to instance metadata via the "
+"virtual router."
+msgstr "CloudStack提供的API访问在部署VM时可附加多达32KB的用户数据。部署虚拟机也可以通过虚拟路由器访问实例的元数据。"
+
+# 076533995e0345db90168c6278c3460b
+#: ../../api.rst:54
+msgid ""
+"User data can be accessed once the IP address of the virtual router is "
+"known. Once the IP address is known, use the following steps to access the "
+"user data:"
+msgstr "一旦得知虚拟路由的IP便可以访问用户数据。得到IP地址后使用如下步骤访问用户数据:"
+
+# cf43f38848f845f4a34393092ae8b81e
+#: ../../api.rst:58
+msgid "Run the following command to find the virtual router."
+msgstr "执行如下命令查找虚拟路由器。"
+
+# 6fff13e87cff49809caebf13b8fa61cb
+#: ../../api.rst:64
+msgid ""
+"Access user data by running the following command using the result of the "
+"above command"
+msgstr "通过上述命令的结果运行如下命令访问用户数据"
+
+# cd37cb5d158343c29780503c5bca4540
+#: ../../api.rst:71
+msgid ""
+"Meta Data can be accessed similarly, using a URL of the form "
+"http://10.1.1.1/latest/meta-data/{metadata type}. (For backwards "
+"compatibility, the previous URL http://10.1.1.1/latest/{metadata type} is "
+"also supported.) For metadata type, use one of the following:"
+msgstr "元数据同样可以被访问,使用URL表单 http://10.1.1.1/latest/meta-data/{元数据类型} 。 (为了向后兼容,之前的URL也同样支持 http://10.1.1.1/latest/{元数据类型} 。) 关于元数据类型,请使用以下方法之一:"
+
+# e84e13e6d81f41fda2e53325bcf8196b
+#: ../../api.rst:78
+msgid "service-offering. A description of the VMs service offering"
+msgstr "service-offering。VM服务方案的描述。"
+
+# 62048249f8d2494db34980c3b1862e5b
+#: ../../api.rst:82
+msgid "availability-zone. The Zone name"
+msgstr "availability-zone。区域名称"
+
+# 7463be88f12e49e8aac8925ca6a5884f
+#: ../../api.rst:86
+msgid "local-ipv4. The guest IP of the VM"
+msgstr "local-ipv4。VM的来宾地址"
+
+# ba16b21040764726a1202dde1d4e83d6
+#: ../../api.rst:90
+msgid "local-hostname. The hostname of the VM"
+msgstr "local-hostname。VM的主机名"
+
+# 363adc60e20b4bfcb51004281919f11e
+#: ../../api.rst:94
+msgid ""
+"public-ipv4. The first public IP for the router. (E.g. the first IP of eth2)"
+msgstr "public-ipv4。第一个IP为路由器的IP。 (E.g. eth2为第一个IP)"
+
+# 352781028d6f46f1b95f08adccbb1ff2
+#: ../../api.rst:99
+msgid "public-hostname. This is the same as public-ipv4"
+msgstr "public-hostname。与public-ipv4相同"
+
+# dc787ff8567442788d44cf46ab9a6462
+#: ../../api.rst:103
+msgid "instance-id. The instance name of the VM"
+msgstr "instance-id。VM实例的名称"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/events.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/events.po b/source/locale/zh_CN/LC_MESSAGES/events.po
new file mode 100644
index 0000000..b078580
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/events.po
@@ -0,0 +1,414 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+# morgan wang <mo...@gmail.com>, 2014
+# typuc <ty...@163.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-24 13:53+0000\n"
+"Last-Translator: darrentang <da...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 102ed2ffb3fb4c3bb6029d0c7eb905de
+#: ../../events.rst:18
+msgid "Event Notification"
+msgstr "事件通知"
+
+# afc241a8b0d0496a8744768e3563fbe8
+#: ../../events.rst:20
+msgid ""
+"An event is essentially a significant or meaningful change in the state of "
+"both virtual and physical resources associated with a cloud environment. "
+"Events are used by monitoring systems, usage and billing systems, or any "
+"other event-driven workflow systems to discern a pattern and make the right "
+"business decision. In CloudStack an event could be a state change of virtual"
+" or physical resources, an action performed by an user (action events), or "
+"policy based events (alerts)."
+msgstr "事件本质上是与云环境相关的虚拟和物理资源的状态显著或有意义的变化。事件用于监控系统,使用率和计费系统,或者是用于辨别模式和做出正确商业决定的其他任何事件驱动工作流系统。在 CloudStack 中的事件可以是虚拟或物理资源的状态变化,用户(操作事件)执行的操作,或基于策略的事件(警告)。"
+
+# 0fca00203fea49669148771eeedf55c3
+#: ../../events.rst:29
+msgid "Event Logs"
+msgstr "事件日志"
+
+# 1d21fa8ae81748baa8e52f31043facf7
+#: ../../events.rst:31
+msgid ""
+"There are two types of events logged in the CloudStack Event Log. Standard "
+"events log the success or failure of an event and can be used to identify "
+"jobs or processes that have failed. There are also long running job events. "
+"Events for asynchronous jobs log when a job is scheduled, when it starts, "
+"and when it completes. Other long running synchronous jobs log when a job "
+"starts, and when it completes. Long running synchronous and asynchronous "
+"event logs can be used to gain more information on the status of a pending "
+"job or can be used to identify a job that is hanging or has not started. The"
+" following sections provide more information on these events.."
+msgstr "这里有两种类型的事件记录在&PRODUCT;事件日志。标准事件记录一个事件的成功或失败,并且可以用于鉴别哪些是已经失败的任务或进程。这里也记录长时间运行任务事件。异步任务的制定,启动,完成这些事件都被记录。长时间运行的同步和异步事件日志可用于获取挂起任务更多的状态信息,也可以用来识别任务是被挂起或还未开始。以下各节提供有关这些事件的详细信息。"
+
+# 8a0c6176934d4aec840789a07a73084b
+#: ../../events.rst:43
+msgid "Notification"
+msgstr "通知"
+
+# 64816315eaa145ab8ad138648b2589e3
+#: ../../events.rst:45
+msgid ""
+"Event notification framework provides a means for the Management Server "
+"components to publish and subscribe to CloudStack events. Event notification"
+" is achieved by implementing the concept of event bus abstraction in the "
+"Management Server. An event bus is introduced in the Management Server that "
+"allows the CloudStack components and extension plug-ins to subscribe to the "
+"events by using the Advanced Message Queuing Protocol (AMQP) client. In "
+"CloudStack, a default implementation of event bus is provided as a plug-in "
+"that uses the RabbitMQ AMQP client. The AMQP client pushes the published "
+"events to a compatible AMQP server. Therefore all the CloudStack events are "
+"published to an exchange in the AMQP server."
+msgstr "事件通知框架提供一种手段来管理管理服务器组件来发布和订阅 CloudStack 中的事件。事件通知是通过实现事件总线抽象的管理服务器的概念来实现。事件总线的管理服务器,允许 CloudStack 中的组件和扩展插件通过使用高级消息队列协议(AMQP)客户端订阅事件的介绍。在 CloudStack 中,事件总线默认通过一个使用Rabbit MQAMQP 客户端 的插件实现。AMQP 客户端推送发布事件到兼容 AMQP 服务器。因此,所有的 CloudStack 中的事件发布到 AMQP 服务器中交换 。"
+
+# 69559e28bd3c4833a65e235470bd7ae9
+#: ../../events.rst:57
+msgid ""
+"A new event for state change, resource state change, is introduced as part "
+"of Event notification framework. Every resource, such as user VM, volume, "
+"NIC, network, public IP, snapshot, and template, is associated with a state "
+"machine and generates events as part of the state change. That implies that "
+"a change in the state of a resource results in a state change event, and the"
+" event is published in the corresponding state machine on the event bus. All"
+" the CloudStack events (alerts, action events, usage events) and the "
+"additional category of resource state change events, are published on to the"
+" events bus."
+msgstr "状态变化,资源状态变化的新事件作为事件通知架构的一部分被引入。每个资源,例如用户VM,卷VM,网卡,网络,公共IP,快照以及模板,使用机器状态和常规事件被关联起来作为状态变化的一部分。这意味着,一个资源状态的变化产生了一个状态变化事件,并且该事件被公布到相应的状态事件总线。所有的  CloudStack 事件(报警,动作事件,使用事件)和 资源状态变化事件的附加条目将被公布到事件总线。"
+
+# c7c4a9021bb94d0d8c8806bdc797abc7
+#: ../../events.rst:68
+msgid "Use Cases"
+msgstr "使用案例"
+
+# 2b32e72970d74bd3b50d67a5c2b25913
+#: ../../events.rst:70
+msgid "The following are some of the use cases:"
+msgstr "以下是一些使用场景:"
+
+# 785e64cd20c945e39b1fcd1248e29463
+#: ../../events.rst:74
+msgid ""
+"Usage or Billing Engines: A third-party cloud usage solution can implement a"
+" plug-in that can connects to CloudStack to subscribe to CloudStack events "
+"and generate usage data. The usage data is consumed by their usage software."
+msgstr "使用率或计费引擎:第三方云使用的解决方案可以实现一个插件,它可以连接到 CloudStack 中订阅 CloudStack 中的事件并产生使用率数据。使用率数据是它们的使用的软件消耗。"
+
+# 697fd51abda3475fbec2bfb2cf48eeee
+#: ../../events.rst:81
+msgid ""
+"AMQP plug-in can place all the events on the a message queue, then a AMQP "
+"message broker can provide topic-based notification to the subscribers."
+msgstr "AMQP的插件可以存放消息队列中的所有事件,然后一个AMQP消息代理可以提供基于主题的通知订阅者。"
+
+# 13d4c3bf275446aca6afcc5f13b12aa3
+#: ../../events.rst:87
+msgid ""
+"Publish and Subscribe notification service can be implemented as a pluggable"
+" service in CloudStack that can provide rich set of APIs for event "
+"notification, such as topics-based subscription and notification. "
+"Additionally, the pluggable service can deal with multi-tenancy, "
+"authentication, and authorization issues."
+msgstr "AMQP的插件可以存放所有事件在一个消息队列中,然后AMQP打乱的\n发布和订阅通知服务可以作为一个可插拔的服务,在CloudStack中该服务可以为事件通知提供丰富的API集,如主题为标题的主题和通知。此外,可插拔服务可以处理多租户,认证,授权issues.age代理,并提供基于主题的订阅通知。"
+
+# 1aedf09c5c0b4effa9dd9117fcf5a102
+#: ../../events.rst:94
+msgid "Configuration"
+msgstr "配置"
+
+# 1520275479c3459fb8bb45890eae9935
+#: ../../events.rst:96
+msgid ""
+"As a CloudStack administrator, perform the following one-time configuration "
+"to enable event notification framework. At run time no changes can control "
+"the behaviour."
+msgstr "作为一个  CloudStack 管理员,执行下列一次性配置启用事件通知框架。在运行时不能修改控件行为。"
+
+# e80abe3d28594327a0464339d8818c44
+#: ../../events.rst:102
+msgid "Open ``'componentContext.xml``."
+msgstr "打开 `` componentContext.xml ``."
+
+# 9df0be28f95041d19f82142547b7265b
+#: ../../events.rst:106
+msgid "Define a bean named ``eventNotificationBus`` as follows:"
+msgstr "按照以下实例顶一个叫做 “ eventNotificationBus ” 的实体: "
+
+# e46a3a197cc74df2a9eb8e5bd57ebf52
+#: ../../events.rst:110
+msgid "name : Specify a name for the bean."
+msgstr "名字:为实体指定一个名字。"
+
+# b203c95bc9f44afc81fbb8980802291e
+#: ../../events.rst:114
+msgid "server : The name or the IP address of the RabbitMQ AMQP server."
+msgstr "服务器: RabbitMQ AMQP 的名字或IP地址"
+
+# 6e8c151c2dd847f1a2a160d97c119e86
+#: ../../events.rst:118
+msgid "port : The port on which RabbitMQ server is running."
+msgstr "端口 : RabbitMQ服务器运行端口."
+
+# 42911e580f7a4f6fa5b5be87551390cb
+#: ../../events.rst:122
+msgid ""
+"username : The username associated with the account to access the RabbitMQ "
+"server."
+msgstr "用户名: 用户名关联访问 RabbitMQ 服务器的账号。"
+
+# 887fd9bc57b548f382e1c635c3dbb8a0
+#: ../../events.rst:127
+msgid ""
+"password : The password associated with the username of the account to "
+"access the RabbitMQ server."
+msgstr "密码: 密码关联访问 RabbitMQ 服务器账号的用户名。"
+
+# 4c518b7b80a941638553284affb8603e
+#: ../../events.rst:132
+msgid ""
+"exchange : The exchange name on the RabbitMQ server where CloudStack events "
+"are published."
+msgstr "交流:其中 CloudStack 中事件发布的 RabbitMQ 的服务器上的交流名称。"
+
+# f881113c3c1540c9a568b4bb01f37ff2
+#: ../../events.rst:135
+msgid "A sample bean is given below:"
+msgstr "下面给出一个实体实例:"
+
+# c88f66382e86471fa752a96e8c286e51
+#: ../../events.rst:148
+msgid ""
+"The ``eventNotificationBus`` bean represents the "
+"``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class."
+msgstr " `` eventNotificationBus ``  表示 ` `org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus ``  类"
+
+# 3c84696f04ae4ad58c0edfe8eee24a49
+#: ../../events.rst:153
+msgid "Restart the Management Server."
+msgstr "重启管理服务器。"
+
+# 34f2df7b30c8489690de80ca02292b43
+#: ../../events.rst:156
+msgid "Standard Events"
+msgstr "标准事件"
+
+# 658ab70617ca480387c4446d2df3f783
+# e43e53282a8743bc94e7a3f26dacfeed
+#: ../../events.rst:158 ../../events.rst:191
+msgid "The events log records three types of standard events."
+msgstr "事件日志记录三种类型的标准事件"
+
+# 9400dae867ab48dfb95e9a05e8949fdb
+# cb299fcbd64849a7a47486675d1f6477
+#: ../../events.rst:162 ../../events.rst:195
+msgid ""
+"INFO. This event is generated when an operation has been successfully "
+"performed."
+msgstr "通知:当一个操作被成功执行产生事件。"
+
+# 294607854e004c4fa685bb9760e11d2f
+# 26f912bd36f4415c9f6349109dbc880a
+#: ../../events.rst:167 ../../events.rst:200
+msgid "WARN. This event is generated in the following circumstances."
+msgstr "警告:以下状况产生该事件。"
+
+# 8f26ab07f1da41c5a67f35568dee82ae
+# a962175d5c794f9e88b25a995aa3fe1a
+#: ../../events.rst:171 ../../events.rst:204
+msgid "When a network is disconnected while monitoring a template download."
+msgstr "监控模板下载的同时网络被断开"
+
+# 41d6341dfbc74296aebd0eff9602f59a
+# 9bdea7d661d140718fea5fda4ae30615
+#: ../../events.rst:176 ../../events.rst:209
+msgid "When a template download is abandoned."
+msgstr "模板下载被放弃"
+
+# d2d6ebc19c2f42138e8698f89ee29c6f
+# 93031d47c5704fb383a9e8149b602855
+#: ../../events.rst:180 ../../events.rst:213
+msgid ""
+"When an issue on the storage server causes the volumes to fail over to the "
+"mirror storage server."
+msgstr "当存储服务器上的问题会导致卷故障转移到镜像存储服务器。"
+
+# 583a50a8c403401093490e43cbd95dfd
+# 52ea4911fdfe42a5af3cc9a97e48a987
+#: ../../events.rst:185 ../../events.rst:218
+msgid ""
+"ERROR. This event is generated when an operation has not been successfully "
+"performed"
+msgstr "错误:当操作没有成功执行产生该事件"
+
+# 5b8500630feb40f4afb3b8f9e29a53a3
+#: ../../events.rst:189
+msgid "Long Running Job Events"
+msgstr "长事件运行任务事件"
+
+# c379b57670384b0b9da909afafca7292
+#: ../../events.rst:222
+msgid "Event Log Queries"
+msgstr "事件记录查询"
+
+# 88a9f85fb3da4603bee07701eabb7806
+#: ../../events.rst:224
+msgid ""
+"Database logs can be queried from the user interface. The list of events "
+"captured by the system includes:"
+msgstr "可以通过用户接口查询数据库日志。系统收集了以下列表事件:"
+
+# cd15e4ae2eca4d55b7510293e7fd2bbd
+#: ../../events.rst:229
+msgid "Virtual machine creation, deletion, and on-going management operations"
+msgstr "虚拟机创建,删除,以及持续管理操作"
+
+# 2df022a424dc41b699e1367171be2d50
+#: ../../events.rst:234
+msgid "Virtual router creation, deletion, and on-going management operations"
+msgstr "虚拟路由器创建,删除,以及持续管理操作"
+
+# d36f900c99fb40fa94804d5e52af7822
+#: ../../events.rst:238
+msgid "Template creation and deletion"
+msgstr "模板创建和删除"
+
+# 2e97521ac7be4b15b4892a30073bc966
+#: ../../events.rst:242
+msgid "Network/load balancer rules creation and deletion"
+msgstr "网络/压力 负载规则创建和删除"
+
+# f59bcdcfa249464a800cad1cd97cfc0f
+#: ../../events.rst:246
+msgid "Storage volume creation and deletion"
+msgstr "存储卷创建和和删除"
+
+# 8bd53c90bb38449fbbadd472c0930466
+#: ../../events.rst:250
+msgid "User login and logout"
+msgstr "用户登录注销"
+
+# 1e928be3f4e54e8f8b6532879b4e5f7e
+#: ../../events.rst:253
+msgid "Deleting and Archiving Events and Alerts"
+msgstr "删除和归档事件警告"
+
+# 13275df9c48f45ccba383ca172df3874
+#: ../../events.rst:255
+msgid ""
+"CloudStack provides you the ability to delete or archive the existing alerts"
+" and events that you no longer want to implement. You can regularly delete "
+"or archive any alerts or events that you cannot, or do not want to resolve "
+"from the database."
+msgstr "CloudStack 提供你删除或归档那些再也不使用的现存警告和事件的能力。您可以定期删除或存档的任何那些您不能或不想从数据库来解决的警报或事件,"
+
+# 1371e435af2d4271b9db506b9e5c40aa
+#: ../../events.rst:260
+msgid ""
+"You can delete or archive individual alerts or events either directly by "
+"using the Quickview or by using the Details page. If you want to delete "
+"multiple alerts or events at the same time, you can use the respective "
+"context menu. You can delete alerts or events by category for a time period."
+" For example, you can select categories such as **USER.LOGOUT**, "
+"**VM.DESTROY**, **VM.AG.UPDATE**, **CONFIGURATION.VALUE.EDI**, and so on. "
+"You can also view the number of events or alerts archived or deleted."
+msgstr "您可以通过快速查看或详情页面直接删除或归档个别警报或事件。如果你想同时删除多个警报或事件,您可以分别使用相应的快捷菜单。您可以按类别删除某个时期的警报或事件。例如,您可以选择诸如 ** USER.LOGOUT**,** VM.DESTROY**,** VM.AG.UPDATE**,** CONFIGURATION.VALUE.EDI** 等类别,依此类推。您还可以查看事件和警报归档或删除的数量。"
+
+# c8695ccfaf37456c9fe6e0ec4d207a62
+#: ../../events.rst:269
+msgid ""
+"In order to support the delete or archive alerts, the following global "
+"parameters have been added:"
+msgstr "为了支持删除或归档报警,增加了以下全局参数:"
+
+# d437d10a6c5c4d4fac98d68635980067
+#: ../../events.rst:274
+msgid ""
+"**alert.purge.delay**: The alerts older than specified number of days are "
+"purged. Set the value to 0 to never purge alerts automatically."
+msgstr " **alert.purge.delay** : 指定报警大于多少天被销毁。设置值为0将永不自动销毁"
+
+# 368c17d62d6043429befbae6871a04c0
+#: ../../events.rst:279
+msgid ""
+"**alert.purge.interval**: The interval in seconds to wait before running the"
+" alert purge thread. The default is 86400 seconds (one day)."
+msgstr " **alert.purge.interval** : 执行销毁线程后等待间隔秒数. 默认值是86400秒 ( 1天 )."
+
+# 57dd9b95bbcf4bfd87ebf5cbaef78931
+#: ../../events.rst:283
+msgid ""
+"Archived alerts or events cannot be viewed in the UI or by using the API. "
+"They are maintained in the database for auditing or compliance purposes."
+msgstr "不能同通过UI 或 API 来归档报警或者事件。它们都存放在数据库中用于升级或其他目的。"
+
+# ec3e8f0b43514403afc0a9e47f381c0c
+#: ../../events.rst:288
+msgid "Permissions"
+msgstr "许可"
+
+# 7db5396af5d24382a51e418ced931fff
+#: ../../events.rst:290
+msgid "Consider the following:"
+msgstr "参考以下几点:"
+
+# 2814ee39c91e4c2e832d73a1a39839b5
+#: ../../events.rst:294
+msgid "The root admin can delete or archive one or multiple alerts or events."
+msgstr "root 管理 可以删除或归档一个或多个警告事件"
+
+# 01be1c88e97f4e9eae1e310e28045ae2
+#: ../../events.rst:299
+msgid ""
+"The domain admin or end user can delete or archive one or multiple events."
+msgstr "域关乎或终端用户可以删除或归档一个或多个警告事件"
+
+# 8d806f13fadd4080bae10069ad330bbc
+#: ../../events.rst:303
+msgid "Procedure"
+msgstr "步骤"
+
+# 0670181e1983452ab571f7ae6ce4d594
+#: ../../events.rst:307
+msgid "Log in as administrator to the CloudStack UI."
+msgstr "使用管理员登录到CloudStack管理界面。"
+
+# 3ab15d176fec4a14a47ed28c4e81a0bc
+#: ../../events.rst:311
+msgid "In the left navigation, click Events."
+msgstr "在左侧导航栏中,点击事件。"
+
+# 3dfc816afe4744f1a2b5aa030c3be966
+#: ../../events.rst:315
+msgid "Perform either of the following:"
+msgstr "请执行下列操作之一: "
+
+# 3308c260b9c8454bb6109c2b36420617
+#: ../../events.rst:319
+msgid ""
+"To archive events, click Archive Events, and specify event type and date."
+msgstr "归档事件,点击 归档事件,并指定事件类型和日期。"
+
+# 3563bec70a3f40aa9bfd26494bda8c93
+#: ../../events.rst:324
+msgid ""
+"To archive events, click Delete Events, and specify event type and date."
+msgstr "归档事件,点击  删除事件,并指定事件类型和日期。"
+
+# f0ab5197a41b478684c629f86f95fc12
+#: ../../events.rst:329
+msgid "Click OK."
+msgstr "点击确定。"


[04/40] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking_and_traffic.rst
----------------------------------------------------------------------
diff --git a/source/networking_and_traffic.rst b/source/networking_and_traffic.rst
new file mode 100644
index 0000000..f29ed3b
--- /dev/null
+++ b/source/networking_and_traffic.rst
@@ -0,0 +1,82 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Managing Networks and Traffic
+=============================
+
+In a CloudStack, guest VMs can communicate with each other using shared
+infrastructure with the security and user perception that the guests
+have a private LAN. The CloudStack virtual router is the main component
+providing networking features for guest traffic.
+
+.. include:: networking/guest_traffic.rst
+
+.. include:: networking/networking_in_pod.rst
+
+.. include:: networking/networking_in_zone.rst
+
+.. include:: networking/basic_zone_config.rst
+
+.. include:: networking/advanced_zone_config.rst
+
+.. include:: networking/multiple_guest_networks.rst
+
+.. include:: networking/ip_reservation_in_guest_networks.rst
+
+.. include:: networking/public_ips_and_vlans_for_accounts.rst
+
+.. include:: networking/multiple_ips_on_single_nic.rst
+
+.. include:: networking/multiple_ip_ranges.rst
+
+.. include:: networking/elastic_ips.rst
+
+.. include:: networking/portable_ips.rst
+
+.. include:: networking/multiple_subnets_in_shared_network.rst
+
+.. include:: networking/isolation_in_advanced_zone_with_vlan.rst
+
+.. include:: networking/security_groups.rst
+
+.. include:: networking/external_firewalls_and_load_balancers.rst
+
+.. include:: networking/global_server_load_balancing.rst
+
+.. include:: networking/guest_ip_ranges.rst
+
+.. include:: networking/acquiring_an_ip_address.rst
+
+.. include:: networking/releasing_an_ip_address.rst
+
+.. include:: networking/static_nat.rst
+
+.. include:: networking/ip_forwarding_and_firewalling.rst
+
+.. include:: networking/ip_load_balancing.rst
+
+.. include:: networking/dns_and_dhcp.rst
+
+.. include:: networking/remote_access_vpn.rst
+
+.. include:: networking/inter_vlan_routing.rst
+
+.. include:: networking/virtual_private_cloud_config.rst
+
+.. include:: networking/persistent_networks.rst
+
+.. include:: networking/palo_alto_config.rst
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/palo_alto_config.rst
----------------------------------------------------------------------
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
deleted file mode 100644
index 6c0aa46..0000000
--- a/source/palo_alto_config.rst
+++ /dev/null
@@ -1,282 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information#
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-
-
-
-Setup a Palo Alto Networks Firewall
------------------------------------
-
-
-Functionality Provided
-~~~~~~~~~~~~~~~~~~~~~~
-
-This implementation enable the orchestration of a Palo Alto Networks Firewall from within CloudStack UI and API.  
-
-**The following features are supported**:
-
-- List/Add/Delete Palo Alto Networks service provider
-- List/Add/Delete Palo Alto Networks network service offering
-- List/Add/Delete Palo Alto Networks network using the above service offering
-- Add an instance to a Palo Alto Networks network
-- Source NAT management on network create and delete
-- List/Add/Delete Ingress Firewall rule
-- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules supported)
-- List/Add/Delete Port Forwarding rule
-- List/Add/Delete Static NAT rule
-- Apply a Threat Profile to all firewall rules (more details in the Additional Features section)
-- Apply a Log Forwarding profile to all firewall rules (more details in the Additional Features section)
-
-
-
-Initial Palo Alto Networks Firewall Configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Anatomy of the Palo Alto Networks Firewall
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- In **'Network > Interfaces'** there is a list of physical interfaces as well as aggregated physical interfaces which are used for managing traffic in and out of the Palo Alto Networks Firewall device.
-- In **'Network > Zones'** there is a list of the different configuration zones.  This implementation will use two zones; a public (defaults to 'untrust') and private (defaults to 'trust') zone.
-- In **'Network > Virtual Routers'** there is a list of VRs which handle traffic routing for the Palo Alto Firewall.  We only use a single Virtual Router on the firewall and it is used to handle all the routing to the next network hop.
-- In **'Objects > Security Profile Groups'** there is a list of profiles which can be applied to firewall rules.  These profiles are used to better understand the types of traffic that is flowing through your network.  Configured when you add the firewall provider to CloudStack.
-- In **'Objects > Log Forwarding'** there is a list of profiles which can be applied to firewall rules.  These profiles are used to better track the logs generated by the firewall.  Configured when you add the firewall provider to CloudStack.
-- In **'Policies > Security'** there is a list of firewall rules that are currently configured.  You will not need to modify this section because it will be completely automated by CloudStack, but you can review the firewall rules which have been created here.
-- In **'Policies > NAT'** there is a list of the different NAT rules.  You will not need to modify this section because it will be completely automated by CloudStack, but you can review the different NAT rules that have been created here.  Source NAT, Static NAT and Destination NAT (Port Forwarding) rules will show up in this list.
-
-
-
-Configure the Public / Private Zones on the firewall
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-No manual configuration is required to setup these zones because CloudStack will configure them automatically when you add the Palo Alto Networks firewall device to CloudStack as a service provider.  This implementation depends on two zones, one for the public side and one for the private side of the firewall.  
-
-- The public zone (defaults to 'untrust') will contain all of the public interfaces and public IPs.
-- The private zone (defaults to 'trust') will contain all of the private interfaces and guest network gateways.
-
-The NAT and firewall rules will be configured between these zones.
-
-
-
-Configure the Public / Private Interfaces on the firewall
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This implementation supports standard physical interfaces as well as grouped physical interfaces called aggregated interfaces.  Both standard interfaces and aggregated interfaces are treated the same, so they can be used interchangeably. For this document, we will assume that we are using 'ethernet1/1' as the public interface and 'ethernet1/2' as the private interface.  If aggregated interfaces where used, you would use something like 'ae1' and 'ae2' as the interfaces.
-
-This implementation requires that the 'Interface Type' be set to 'Layer3' for both the public and private interfaces.  If you want to be able to use the 'Untagged' VLAN tag for public traffic in CloudStack, you will need to enable support for it in the public 'ethernet1/1' interface (details below).  
-
-**Steps to configure the Public Interface**:
-
-#. Log into Palo Alto Networks Firewall
-#. Navigate to 'Network > Interfaces'
-#. Click on 'ethernet1/1' (for aggregated ethernet, it will probably be called 'ae1')
-#. Select 'Layer3' from the 'Interface Type' list
-#. Click 'Advanced'
-#. Check the 'Untagged Subinterface' check-box
-#. Click 'OK'
-
-**Steps to configure the Private Interface**:
-
-#. Click on 'ethernet1/2' (for aggregated ethernet, it will probably be called 'ae2')
-#. Select 'Layer3' from the 'Interface Type' list
-#. Click 'OK'
-
-
-
-Configure a Virtual Router on the firewall
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The Virtual Router on the Palo Alto Networks Firewall is not to be confused with the Virtual Routers that CloudStack provisions.  For this implementation, the Virtual Router on the Palo Alto Networks Firewall will ONLY handle the upstream routing from the Firewall to the next hop.
-
-**Steps to configure the Virtual Router**:
-
-#. Log into Palo Alto Networks Firewall
-#. Navigate to 'Network > Virtual Routers'
-#. Select the 'default' Virtual Router or Add a new Virtual Router if there are none in the list
-
-   - If you added a new Virtual Router, you will need to give it a 'Name'
-
-#. Navigate to 'Static Routes > IPv4'
-#. 'Add' a new static route
-
-   - **Name**: next_hop (you can name it anything you want)
-   - **Destination**: 0.0.0.0/0 (send all traffic to this route)
-   - **Interface**: ethernet1/1 (or whatever you set your public interface as)
-   - **Next Hop**: (specify the gateway IP for the next hop in your network)
-   - Click 'OK'
-
-#. Click 'OK'
-
-
-
-Configure the default Public Subinterface
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The current implementation of the Palo Alto Networks firewall integration uses CIDRs in the form of 'w.x.y.z/32' for the public IP addresses that CloudStack provisions.  Because no broadcast or gateway IPs are in this single IP range, there is no way for the firewall to route the traffic for these IPs.  To route the traffic for these IPs, we create a single subinterface on the public interface with an IP and a CIDR which encapsulates the CloudStack public IP range.  This IP will need to be inside the subnet defined by the CloudStack public range netmask, but outside the CloudStack public IP range.  The CIDR should reflect the same subnet defined by the CloudStack public range netmask.  The name of the subinterface is determined by the VLAN configured for the public range in CloudStack.
-
-To clarify this concept, we will use the following example.
-
-**Example CloudStack Public Range Configuration**:
-
-- **Gateway**: 172.30.0.1
-- **Netmask**: 255.255.255.0
-- **IP Range**: 172.30.0.100 - 172.30.0.199
-- **VLAN**: Untagged
-
-**Configure the Public Subinterface**:
-
-#. Log into Palo Alto Networks Firewall
-#. Navigate to 'Network > Interfaces'
-#. Select the 'ethernet1/1' line (not clicking on the name)
-#. Click 'Add Subinterface' at the bottom of the window
-#. Enter 'Interface Name': 'ethernet1/1' . '9999' 
-
-   - 9999 is used if the CloudStack public range VLAN is 'Untagged'
-   - If the CloudStack public range VLAN is tagged (eg: 333), then the name will reflect that tag
-
-#. The 'Tag' is the VLAN tag that the traffic is sent to the next hop with, so set it accordingly.  If you are passing 'Untagged' traffic from CloudStack to your next hop, leave it blank.  If you want to pass tagged traffic from CloudStack, specify the tag.
-#. Select 'default' from the 'Config > Virtual Router' drop-down (assuming that is what your virtual router is called)
-#. Click the 'IPv4' tab
-#. Select 'Static' from the 'Type' radio options
-#. Click 'Add' in the 'IP' section
-#. Enter '172.30.0.254/24' in the new line
-
-   - The IP can be any IP outside the CloudStack public IP range, but inside the CloudStack public range netmask (it can NOT be the gateway IP)
-   - The subnet defined by the CIDR should match the CloudStack public range netmask
-   
-#. Click 'OK'
-
-
-Commit configuration on the Palo Alto Networks Firewall
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In order for all the changes we just made to take effect, we need to commit the changes.
-
-#. Click the 'Commit' link in the top right corner of the window
-#. Click 'OK' in the commit window overlay
-#. Click 'Close' to the resulting commit status window after the commit finishes
-
-
-
-Setup the Palo Alto Networks Firewall in CloudStack
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Add the Palo Alto Networks Firewall as a Service Provider
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. Navigate to 'Infrastructure > Zones > ZONE_NAME > Physical Network > NETWORK_NAME (guest) > Configure; Network Service Providers'
-#. Click on 'Palo Alto' in the list
-#. Click 'View Devices'
-#. Click 'Add Palo Alto Device'
-#. Enter your configuration in the overlay.  This example will reflect the details previously used in this guide.
-
-   - **IP Address**: (the IP of the Palo Alto Networks Firewall)
-   - **Username**: (the admin username for the firewall)
-   - **Password**: (the admin password for the firewall)
-   - **Type**: Palo Alto Firewall
-   - **Public Interface**: ethernet1/1 (use what you setup earlier as the public interface if it is different from my examples)
-   - **Private Interface**: ethernet1/2 (use what you setup earlier as the private interface if it is different from my examples)
-   - **Number of Retries**: 2 (the default is fine)
-   - **Timeout**: 300 (the default is fine) 
-   - **Public Network**: untrust (this is the public zone on the firewall and did not need to be configured)
-   - **Private Network**: trust (this is the private zone on the firewall and did not need to be configured)
-   - **Virtual Router**: default (this is the name of the Virtual Router we setup on the firewall)
-   - **Palo Alto Threat Profile**: (not required.  name of the 'Security Profile Groups' to apply.  more details in the 'Additional Features' section)
-   - **Palo Alto Log Profile**: (not required.  name of the 'Log Forwarding' profile to apply.  more details in the 'Additional Features' section)
-   - **Capacity**: (not required) 
-   - **Dedicated**: (not required)
-
-#. Click 'OK'
-#. Click on 'Palo Alto' in the breadcrumbs to go back one screen.
-#. Click on 'Enable Provider' (its the middle icon that looks like two plugs together)
-
-
-Add a Network Service Offering to use the new Provider
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-There are 6 'Supported Services' that need to be configured in the network service offering for this functionality.  They are DHCP, DNS, Firewall, Source NAT, Static NAT and Port Forwarding.  For the other settings, there are probably additional configurations which will work, but I will just document a common case.
-
-#. Navigate to 'Service Offerings'
-#. In the drop-down at the top, select 'Network Offerings'
-#. Click 'Add Network Offering'
-
-   - **Name**: (name it whatever you want)
-   - **Description**: (again, can be whatever you want)
-   - **Guest Type**: Isolated
-   - **Supported Services**:
-
-      - **DHCP**: Provided by 'VirtualRouter'
-      - **DNS**: Provided by 'VirtualRouter'
-      - **Firewall**: Provided by 'PaloAlto'
-      - **Source NAT**: Provided by 'PaloAlto'
-      - **Static NAT**: Provided by 'PaloAlto'
-      - **Port Forwarding**: Provided by 'PaloAlto'
-
-   - **System Offering for Router**: System Offering For Software Router
-   - **Supported Source NAT Type**: Per account (this is the only supported option)
-   - **Default egress policy**: (both 'Allow' and 'Deny' are supported)
-
-#. Click 'OK'
-#. Click on the newly created service offering
-#. Click 'Enable network offering' (the middle icon that looks like two plugs together)
-
-When adding networks in CloudStack, select this network offering to use the Palo Alto Networks firewall.
-
-
-Additional Features
-~~~~~~~~~~~~~~~~~~~
-
-In addition to the standard functionality exposed by CloudStack, we have added a couple additional features to this implementation.  We did not add any new screens to CloudStack, but we have added a couple fields to the 'Add Palo Alto Service Provider' screen which will add functionality globally for the device.
-
-
-Palo Alto Networks Threat Profile
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This feature allows you to specify a 'Security Profile Group' to be applied to all of the firewall rules which are created on the Palo Alto Networks firewall device.
-
-To create a 'Security Profile Group' on the Palo Alto Networks firewall, do the following: 
-
-#. Log into the Palo Alto Networks firewall
-#. Navigate to 'Objects > Security Profile Groups'
-#. Click 'Add' at the bottom of the page to add a new group
-#. Give the group a Name and specify the profiles you would like to include in the group
-#. Click 'OK'
-#. Click the 'Commit' link in the top right of the screen and follow the on screen instructions
-
-Once you have created a profile, you can reference it by Name in the 'Palo Alto Threat Profile' field in the 'Add the Palo Alto Networks Firewall as a Service Provider' step.
-
-
-Palo Alto Networks Log Forwarding Profile
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This feature allows you to specify a 'Log Forwarding' profile to better manage where the firewall logs are sent to.  This is helpful for keeping track of issues that can arise on the firewall.
-
-To create a 'Log Forwarding' profile on the Palo Alto Networks Firewall, do the following: 
-
-#. Log into the Palo Alto Networks firewall
-#. Navigate to 'Objects > Log Forwarding'
-#. Click 'Add' at the bottom of the page to add a new profile
-#. Give the profile a Name and specify the details you want for the traffic and threat settings
-#. Click 'OK'
-#. Click the 'Commit' link in the top right of the screen and follow the on screen instructions
-
-Once you have created a profile, you can reference it by Name in the 'Palo Alto Log Profile' field in the 'Add the Palo Alto Networks Firewall as a Service Provider' step.
-
-
-
-Limitations
-~~~~~~~~~~~
-
-- The implementation currently only supports a single public IP range in CloudStack
-- Usage tracking is not yet implemented
-

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/systemvm.rst
----------------------------------------------------------------------
diff --git a/source/systemvm.rst b/source/systemvm.rst
index a77408e..2eda853 100644
--- a/source/systemvm.rst
+++ b/source/systemvm.rst
@@ -221,7 +221,7 @@ proxy domain, SSL certificate, and private key:
    #. 
 
       Generate a new certificate CSR. Ensure the creation of a wildcard 
-      certificate, eg *.consoleproxy.company.com
+      certificate, eg ``*.consoleproxy.company.com``
 
       .. code:: bash
 
@@ -265,7 +265,7 @@ proxy domain, SSL certificate, and private key:
 
    -  
 
-      The desired domain name, prefixed with ``*.``; for example, *.consoleproxy.company.com
+      The desired domain name, prefixed with ``*.``; for example, ``*.consoleproxy.company.com``
 
      |update-ssl.png|
 
@@ -281,7 +281,7 @@ requests will be served with the new DNS domain name, certificate, and
 key.
 
 Load-balancing Console Proxies
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 An alternative to using dynamic DNS or creating a range of DNS entries 
 as described in the last section would be to create a SSL certificate
 for a specific domain name, configure CloudStack to use that particular
@@ -534,7 +534,7 @@ Supported Virtual Routers
    Redundant VR
 
 Upgrading Virtual Routers
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 #. 
 


[15/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/usage.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/usage.po b/source/locale/zh_CN/LC_MESSAGES/usage.po
new file mode 100644
index 0000000..ae8f954
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/usage.po
@@ -0,0 +1,1656 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# 语法盐 <um...@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-24 18:31+0000\n"
+"Last-Translator: 语法盐 <um...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 0337566b79334160ac7120790c9d0ac7
+#: ../../usage.rst:18
+msgid "Working with Usage"
+msgstr "使用服务"
+
+# ef6eee68a2ab4c3eb31cb3115bab6062
+#: ../../usage.rst:20
+msgid ""
+"The Usage Server is an optional, separately-installed part of CloudStack "
+"that provides aggregated usage records which you can use to create billing "
+"integration for CloudStack. The Usage Server works by taking data from the "
+"events log and creating summary usage records that you can access using the "
+"listUsageRecords API call."
+msgstr "使用服务器是CloudStack一个可选项,分别安装产品的一部分,提供了聚合使用记录您可以使用它来创建计费集成产品。使用服务器通过使用数据从事件日志和创建汇总使用记录,您可以访问使用listUsageRecords API调用。"
+
+# 3f5a5a7bc4cc4528840d66c404992c64
+#: ../../usage.rst:26
+msgid ""
+"The usage records show the amount of resources, such as VM run time or "
+"template storage space, consumed by guest instances."
+msgstr "使用记录显示数量的资源,比如虚拟机运行时间或模板存储空间,以被客人消耗为例。"
+
+# 7534ac8e2cf443e7801e747d7e156ec4
+#: ../../usage.rst:29
+msgid ""
+"The Usage Server runs at least once per day. It can be configured to run "
+"multiple times per day."
+msgstr "使用服务器运行至少每天一次。它可以被配置为每天多次运行。"
+
+# ea7f343f907540088f49db087d846e0c
+#: ../../usage.rst:33
+msgid "Configuring the Usage Server"
+msgstr "配置使用服务器"
+
+# 5aa6afef926b456384cf8fe5fef33e85
+#: ../../usage.rst:35
+msgid "To configure the usage server:"
+msgstr "配置使用服务器"
+
+# 4a2672643b7e4281babb6fa1f2c8f5c6
+#: ../../usage.rst:39
+msgid ""
+"Be sure the Usage Server has been installed. This requires extra steps "
+"beyond just installing the CloudStack software. See Installing the Usage "
+"Server (Optional) in the Advanced Installation Guide."
+msgstr "确定使用服务器已经被安装。它要求安装额外的CloudStack软件步骤。参见高级安装手册中的使用服务器(可选)。"
+
+# b81ee209e7eb43f2b4440774ee120d74
+#: ../../usage.rst:45
+msgid "Log in to the CloudStack UI as administrator."
+msgstr "作为管理员登录到CloudStack用户界面。"
+
+# b71109d7bf9b4edd8cb8b8b3c62c7375
+#: ../../usage.rst:49
+msgid "Click Global Settings."
+msgstr "单击全局设置"
+
+# d97b663ae09745498728fffc03e2f754
+#: ../../usage.rst:53
+msgid ""
+"In Search, type usage. Find the configuration parameter that controls the "
+"behavior you want to set. See the table below for a description of the "
+"available parameters."
+msgstr "在搜索栏输入 usage。找到no需要改变的配置参数。下表是这些参数的详细描述。"
+
+# b0484803860b4b1a99bb5c37475c7246
+#: ../../usage.rst:59
+msgid "In Actions, click the Edit icon."
+msgstr "在操作栏点击编辑图标。"
+
+# 704d9670a22a4b81b84bd8f2aa97bb9a
+#: ../../usage.rst:63
+msgid "Type the desired value and click the Save icon."
+msgstr "输入数值点击保存图标。"
+
+# f01266ae6922418997f31eb79d697cab
+#: ../../usage.rst:67
+msgid ""
+"Restart the Management Server (as usual with any global configuration "
+"change) and also the Usage Server:"
+msgstr "重新启动管理服务器(通常在改变了全局配置之后都要进行这步)并重启使用服务器。"
+
+# 7b5da1780fc444d2b67d97b1a97eabb7
+#: ../../usage.rst:75
+msgid ""
+"The following table shows the global configuration settings that control the"
+" behavior of the Usage Server."
+msgstr "下表列出了全局配置中控制使用服务器的配置项。"
+
+# 0ca8d699a2cd4e91b01369666cbcb2ca
+#: ../../usage.rst:78
+msgid "Parameter Name  Description"
+msgstr "参数名描述"
+
+# a6789ec8fc34419ba8e0cc40f94d7f67
+#: ../../usage.rst:80
+msgid "enable.usage.server  Whether the Usage Server is active."
+msgstr "enable.usage.server是否开启使用服务器。"
+
+# f437a7fb1872449e9caf308fcfa5526f
+#: ../../usage.rst:82
+msgid "usage.aggregation.timezone"
+msgstr "usage.aggregation.timezone"
+
+# 002d5b3110bb405a8848871cde0b96d5
+#: ../../usage.rst:84
+msgid ""
+"Time zone of usage records. Set this if the usage records and daily job "
+"execution are in different time zones. For example, with the following "
+"settings, the usage job will run at PST 00:15 and generate usage records for"
+" the 24 hours from 00:00:00 GMT to 23:59:59 GMT:"
+msgstr "记录使用信息所用的时区。如果使用记录和日程工作执行在不同的时区时进行设置。例如,进行下列设置,使用任务运行在PST 00:15和24小时内产生的从00:00:00GMT到23:59:59GMT的使用记录:"
+
+# c7f851a818984dcd81e65157bc3432f4
+#: ../../usage.rst:95
+msgid ""
+"Valid values for the time zone are specified in `Appendix A, *Time Zones* "
+"<http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones"
+"#time-zones>`_"
+msgstr "时间域的有效值已经被具体化到 `Appendix A, *Time Zones* 中 <http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones#time-zones>`_"
+
+# 40b92c7b30364a0893e6e3026b182ae8
+#: ../../usage.rst:97
+msgid "Default: GMT"
+msgstr "默认:GMT"
+
+# 7fa13665f2e44fc28418dc803fdee1b0
+#: ../../usage.rst:99
+msgid "usage.execution.timezone"
+msgstr "usage.execution.timezone"
+
+# 03ddf36a6b6a42a891a0c341c43056f6
+#: ../../usage.rst:101
+msgid ""
+"The time zone of usage.stats.job.exec.time. Valid values for the time zone "
+"are specified in `Appendix A, *Time Zones* "
+"<http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones"
+"#time-zones>`_"
+msgstr "域时间项usage.stats.job.exec.time。时间域的有效值被具体化在`Appendix A, *Time Zones* <http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones#time-zones>`_"
+
+# e638a1f3e44e48da83a97b95361fe670
+#: ../../usage.rst:104
+msgid "Default: The time zone of the management server."
+msgstr "默认时区是管理服务器的时区。"
+
+# 336418dd41ec4a81934459e2c042fbf7
+#: ../../usage.rst:106
+msgid "usage.sanity.check.interval"
+msgstr "usage.sanity.check.interval"
+
+# 6db1762ecd314edeae225d23b32a5155
+#: ../../usage.rst:108
+msgid ""
+"The number of days between sanity checks. Set this in order to periodically "
+"search for records with erroneous data before issuing customer invoices. For"
+" example, this checks for VM usage records created after the VM was "
+"destroyed, and similar checks for templates, volumes, and so on. It also "
+"checks for usage times longer than the aggregation range. If any issue is "
+"found, the alert ALERT\\_TYPE\\_USAGE\\_SANITY\\_RESULT = 21 is sent."
+msgstr "完整性检查时间间隔。设置此值来定期在生成用户账单之前检查出错误的数据。比如,他能检查虚拟机被销毁之后的使用记录和模板,卷等的类似记录。还会检查超过聚合时间的使用时间。如果发生了错误就会发送ALERT_TYPE_USAGE_SANITY_RESULT = 21 警告。"
+
+# 6e8167cad8334e6db1221cfc494f72ff
+#: ../../usage.rst:116
+msgid "usage.stats.job.aggregation.range"
+msgstr "usage.stats.job.aggregation.range"
+
+# e01e74ee70b744fe8f79e8f35126362f
+#: ../../usage.rst:118
+msgid ""
+"The time period in minutes between Usage Server processing jobs. For "
+"example, if you set it to 1440, the Usage Server will run once per day. If "
+"you set it to 600, it will run every ten hours. In general, when a Usage "
+"Server job runs, it processes all events generated since usage was last run."
+msgstr "使用服务器执行任务时间间隔(分钟为单位)。比如,如果你将此值设为1440,使用服务器将每天执行一次。如果你将此值设为600,则会10小时执行一次。一般情况下使用服务器执行任务时会继续在上次的使用统计基础上处理所有事件。"
+
+# 72a14011c979446c83c67f906fbbd35e
+#: ../../usage.rst:124
+msgid ""
+"There is special handling for the case of 1440 (once per day). In this case "
+"the Usage Server does not necessarily process all records since Usage was "
+"last run. CloudStack assumes that you require processing once per day for "
+"the previous, complete day’s records. For example, if the current day is "
+"October 7, then it is assumed you would like to process records for October "
+"6, from midnight to midnight. CloudStack assumes this “midnight to midnight”"
+" is relative to the usage.execution.timezone."
+msgstr "当值为1440(一天一次)时有点特殊。该情况下,用量服务器并不需要处理上次运行之后的所有事件。&PRODUCT;假定您要一天一次处理昨天的,完成每日记录。例如,如果今天是10月7号,会假定您要处理6号的记录,从0点到24点。CloudStack假定的0点到24点采用的时区为 usage.execution.timezone的值。"
+
+# fff2920912c74d6ea4ecfe9d04f4326c
+#: ../../usage.rst:132
+msgid "Default: 1440"
+msgstr "默认:1440"
+
+# dcb0cd40eeb94e38b3f968e426612b3d
+#: ../../usage.rst:134
+msgid "usage.stats.job.exec.time"
+msgstr "usage.stats.job.exec.time"
+
+# a6a0f4fad3a14d5eadb8f19ebb248c50
+#: ../../usage.rst:136
+msgid ""
+"The time when the Usage Server processing will start. It is specified in "
+"24-hour format (HH:MM) in the time zone of the server, which should be GMT. "
+"For example, to start the Usage job at 10:30 GMT, enter “10:30”."
+msgstr "使用服务器处理任务的启动时间。采用24小时格式 (HH:MM),时区为服务器的时区,应该为GMT。比如要在GMT时区10:30 启动用量任务,请输入“10:30”"
+
+# 4d07c9c85f514d65bf442bf13e109864
+#: ../../usage.rst:140
+msgid ""
+"If usage.stats.job.aggregation.range is also set, and its value is not 1440,"
+" then its value will be added to usage.stats.job.exec.time to get the time "
+"to run the Usage Server job again. This is repeated until 24 hours have "
+"elapsed, and the next day's processing begins again at "
+"usage.stats.job.exec.time."
+msgstr "如果同时设置了usage.stats.job.aggregation.range参数,并且该参数值不是1440,这个值将被添加到usage.stats.job.exec.time到时再次运行使用服务器任务。重复此过程,直到24小时已经过去,第二天到达 usage.stats.job.exec.time处理任务开始。"
+
+# 5111f12513a84c968c37d5b3255f5661
+#: ../../usage.rst:146
+msgid "Default: 00:15."
+msgstr "默认:00:15。"
+
+# 691a7dadec4449ab885c9903e9de6d4d
+#: ../../usage.rst:148
+msgid ""
+"For example, suppose that your server is in GMT, your user population is "
+"predominantly in the East Coast of the United States, and you would like to "
+"process usage records every night at 2 AM local (EST) time. Choose these "
+"settings:"
+msgstr "比如,假设你服务器时区是GMT,你的用户主要在美国东海岸,而你有打算在当地时间(EST)每天凌晨两点执行使用记录统计。选择这些选项:"
+
+# 854380bcaa4d4944a2e420a412fdd458
+#: ../../usage.rst:155
+msgid "enable.usage.server = true"
+msgstr "enable.usage.server = true"
+
+# 9552647831c040ddaf47d5c8fc277756
+#: ../../usage.rst:159
+msgid "usage.execution.timezone = America/New\\_York"
+msgstr "usage.execution.timezone = America/New\\_York"
+
+# 1aa8ef9c65f04460a33aba6389e20164
+#: ../../usage.rst:163
+msgid ""
+"usage.stats.job.exec.time = 07:00. This will run the Usage job at 2:00 AM "
+"EST. Note that this will shift by an hour as the East Coast of the U.S. "
+"enters and exits Daylight Savings Time."
+msgstr "usage.stats.job.exec.time = 07:00。这将会在东部时间2:00执行使用任务。注意考虑进出白昼保存时间在将时间迁移大U.S.东海岸。"
+
+# 11423a0b34ff4d9c9197b18830cdb91f
+#: ../../usage.rst:169
+msgid "usage.stats.job.aggregation.range = 1440"
+msgstr "usage.stats.job.aggregation.range = 1440"
+
+# 45bcb1eac33046019e58feb7bc0457a1
+#: ../../usage.rst:171
+msgid ""
+"With this configuration, the Usage job will run every night at 2 AM EST and "
+"will process records for the previous day’s midnight-midnight as defined by "
+"the EST (America/New\\_York) time zone."
+msgstr "在这种配置下,使用任务 会在东部时间每天2 AM执行,同时会如定义的一样以东部时间(美国纽约时间)统计前一天的“午夜到午夜使用记录。”"
+
+# 40a9e9e40a5747bc89152657465138c2
+#: ../../usage.rst:176
+msgid ""
+"Because the special value 1440 has been used for "
+"usage.stats.job.aggregation.range, the Usage Server will ignore the data "
+"between midnight and 2 AM. That data will be included in the next day's run."
+msgstr "由于在usage.stats.job.aggregation.range中使用特殊值1440,用量服务器将忽略午夜到凌晨2:00之间的数据。这些数据将会包含在第二天的统计中。"
+
+# 8859130b1f4e4118a9a83a2ecac3cf43
+#: ../../usage.rst:182
+msgid "Setting Usage Limits"
+msgstr "设置使用限制"
+
+# 67183fba4b79465a918f40539a1af8de
+#: ../../usage.rst:184
+msgid ""
+"CloudStack provides several administrator control points for capping "
+"resource usage by users. Some of these limits are global configuration "
+"parameters. Others are applied at the ROOT domain and may be overridden on a"
+" per-account basis."
+msgstr "CloudStack提供多个管理员控制点以便控制用户资源使用。其中一些限制是全局配置参数。其他一些应用在root域,并且会覆盖每个账号的基本配置"
+
+# 4aac553e7c064eeab7acf5f41532e597
+#: ../../usage.rst:190
+msgid "Globally Configured Limits"
+msgstr "全局配置限制"
+
+# 37ace931a09a4cbb8686c2f6a35a51e2
+#: ../../usage.rst:192
+msgid ""
+"In a zone, the guest virtual network has a 24 bit CIDR by default. This "
+"limits the guest virtual network to 254 running instances. It can be "
+"adjusted as needed, but this must be done before any instances are created "
+"in the zone. For example, 10.1.1.0/22 would provide for ~1000 addresses."
+msgstr "在一个域中,客户虚拟网络默认有24位CIDR.它限制了客户网络运行上线是254个实例。它可以根据需求调节,但必须在域中实例创建之前。例如,10.1.1.0/22 将提供 ~1000 地址。"
+
+# ae098636d8e648f3a914678156700e14
+#: ../../usage.rst:198
+msgid "The following table lists limits set in the Global Configuration:"
+msgstr "下表列出了设置全局配置的限制:"
+
+# 4eb4df145b8e419e88f38cc31ce59ec5
+# 88da6c4bbb414d48a70762e6a87a8239
+# fd92835d48cb40a88c4fcd1120b360c8
+# ed9e4fe39d504bbfabc315a12eeb4f81
+#: ../../usage.rst:201 ../../usage.rst:264 ../../usage.rst:393
+#: ../../usage.rst:475
+msgid "Parameter Name"
+msgstr "参数名称"
+
+# 6ab99d8d306a4f868671e875f1e9686d
+#: ../../usage.rst:201
+msgid "Definition"
+msgstr "定义"
+
+# 3181f7c34e2546de868e6a8c49b343cb
+#: ../../usage.rst:203
+msgid "max.account.public.ips"
+msgstr "max.account.public.ips"
+
+# 52580eeb30b0494aacd46547a9a70f06
+#: ../../usage.rst:203
+msgid "Number of public IP addresses that can be owned by an account"
+msgstr "账户可拥有的公用IP地址个数"
+
+# fb78fccf0cab4d608f3a9a4b50afc7de
+#: ../../usage.rst:205
+msgid "max.account.snapshots"
+msgstr "max.account.snapshots"
+
+# 1f04bedfc70946aab381d1442e177e8b
+#: ../../usage.rst:205
+msgid "Number of snapshots that can exist for an account"
+msgstr "快照的数量存在于一个记述中"
+
+# eb091b2e7bc947318a0dc0eeb27fd55a
+#: ../../usage.rst:207
+msgid "max.account.templates"
+msgstr "max.account.templates"
+
+# 2900cbdf57044d8d849e01b90d7b484f
+#: ../../usage.rst:207
+msgid "Number of templates that can exist for an account"
+msgstr "模板的数量可能存于一个记述中"
+
+# e470b1824d0448d0bcaaef0003e0e758
+#: ../../usage.rst:209
+msgid "max.account.user.vms"
+msgstr "max.account.user.vms"
+
+# 45fc3b15f0f74fd9af1cfd0e3b57140e
+#: ../../usage.rst:209
+msgid "Number of virtual machine instances that can exist for an account"
+msgstr "虚拟机实例的数量也可能存在于一个记述中"
+
+# f552a012a4504f6a841f24ad45d78c4a
+#: ../../usage.rst:211
+msgid "max.account.volumes"
+msgstr "max.account.volumes"
+
+# 14bb2f91823c4d258090722dfff1a485
+#: ../../usage.rst:211
+msgid "Number of disk volumes that can exist for an account"
+msgstr "磁盘卷的数量也可能存于一个记述中"
+
+# 050c07868c484da0ac186174142b1a02
+#: ../../usage.rst:213
+msgid "max.template.iso.size"
+msgstr "max.template.iso.size"
+
+# ae347d4cccf446ee8db6e10db1ffbbe5
+#: ../../usage.rst:213
+msgid "Maximum size for a downloaded template or ISO in GB"
+msgstr "下载的模板或ISO最大的单位是GB"
+
+# 8873afe317eb48ebad10fb3d4fad05bb
+#: ../../usage.rst:215
+msgid "max.volume.size.gb"
+msgstr "max.volume.size.gb"
+
+# 292847e00d914fe9a87ed2fc6cb35196
+#: ../../usage.rst:215
+msgid "Maximum size for a volume in GB"
+msgstr "卷的最大单位是GB"
+
+# ad2a43dbb1674c4c89fd570d1d61adea
+#: ../../usage.rst:217
+msgid "network.throttling.rate"
+msgstr "网络调节比率"
+
+# 3acfdadda9ab43c685d660013eb62877
+#: ../../usage.rst:217
+msgid ""
+"Default data transfer rate in megabits per second allowed per user "
+"(supported on XenServer)"
+msgstr "默认的传输速率是允许用户按照Mb每秒(支持XenServer)"
+
+# d1cb00d8c3ff4620a4118ee8a249bc92
+#: ../../usage.rst:219
+msgid "snapshot.max.hourly"
+msgstr "snapshot.max.hourly"
+
+# d9d7ab38671b42a2a3a0317c58782ced
+#: ../../usage.rst:219
+msgid ""
+"Maximum recurring hourly snapshots to be retained for a volume. If the limit"
+" is reached, early snapshots from the start of the hour are deleted so that "
+"newer ones can be saved. This limit does not apply to manual snapshots. If "
+"set to 0, recurring hourly snapshots can not be scheduled"
+msgstr "最大的可再现时时性快照可以保存在卷中。如果数量的限制达到,早期的来自开始阶段的快照就会被删除以使新的快照可以被存储。这种限制方法不支持手工快照。若设为0,可再现性时时快照将没有保存。"
+
+# b1f9cffb6fe647ad92ea2c6d5d289791
+#: ../../usage.rst:221
+msgid "snapshot.max.daily"
+msgstr "snapshot.max.daily"
+
+# 704f71e544f345d09065347025c7cde4
+#: ../../usage.rst:221
+msgid ""
+"Maximum recurring daily snapshots to be retained for a volume. If the limit "
+"is reached, snapshots from the start of the day are deleted so that newer "
+"ones can be saved. This limit does not apply to manual snapshots. If set to "
+"0, recurring daily snapshots can not be scheduled"
+msgstr "最大的可再现时时性快照可以保存在卷中。如果数量的限制达到,早期的来自开始阶段的快照就会被删除以使新的快照可以被存储。这种限制方法不支持手工快照。若设为0,可再现性时时快照将没有保存。"
+
+# 601336d47b0f418780ce30ebd5a32095
+#: ../../usage.rst:223
+msgid "snapshot.max.weekly"
+msgstr "snapshot.max.weekly"
+
+# 5640652f34584cbb8e42774ff9737df1
+#: ../../usage.rst:223
+msgid ""
+"Maximum recurring weekly snapshots to be retained for a volume. If the limit"
+" is reached, snapshots from the beginning of the week are deleted so that "
+"newer ones can be saved. This limit does not apply to manual snapshots. If "
+"set to 0, recurring weekly snapshots can not be scheduled"
+msgstr "最大的可再现时时性快照可以保存在卷中。如果数量的限制达到,早期的来自开始阶段的快照就会被删除以使新的快照可以被存储。这种限制方法不支持手工快照。若设为0,可再现性时时快照将没有保存。"
+
+# b2ef6f891d434c94a29c4965b9c39566
+#: ../../usage.rst:225
+msgid "snapshot.max.monthly"
+msgstr "snapshot.max.monthly"
+
+# a5cad05dc86f49a38f79efa242145811
+#: ../../usage.rst:225
+msgid ""
+"Maximum recurring monthly snapshots to be retained for a volume. If the "
+"limit is reached, snapshots from the beginning of the month are deleted so "
+"that newer ones can be saved. This limit does not apply to manual snapshots."
+" If set to 0, recurring monthly snapshots can not be scheduled."
+msgstr "最大的可再现时时性快照可以保存在卷中。如果数量的限制达到,早期的来自开始阶段的快照就会被删除以使新的快照可以被存储。这种限制方法不支持手工快照。若设为0,可再现性时时快照将没有保存。"
+
+# a9bb337b48804353bf8145ab56aadc02
+#: ../../usage.rst:228
+msgid ""
+"To modify global configuration parameters, use the global configuration "
+"screen in the CloudStack UI. See Setting Global Configuration Parameters"
+msgstr "使用CloudStack中的用户界面中的全局配置界面可以修改全局配置参数。"
+
+# 19348124e5c641fd87314245b0b13f1c
+#: ../../usage.rst:233
+msgid "Limiting Resource Usage"
+msgstr "限制资源使用"
+
+# 79afe19dfc844449944f0572513152de
+#: ../../usage.rst:235
+msgid ""
+"CloudStack allows you to control resource usage based on the types of "
+"resources, such as CPU, RAM, Primary storage, and Secondary storage. A new "
+"set of resource types has been added to the existing pool of resources to "
+"support the new customization model—need-basis usage, such as large VM or "
+"small VM. The new resource types are now broadly classified as CPU, RAM, "
+"Primary storage, and Secondary storage. The root administrator is able to "
+"impose resource usage limit by the following resource types for Domain, "
+"Project, and Accounts."
+msgstr "CloudStack允许根据资源类型控制资源使用,例如CPU,RAM,主存储,辅助存储。一个新的资源类型集已经被添加到了已经存在的支持新通俗模型的资源池-基于需要使用,例如大型VM或者小型VM.新的资源类型被广泛分类在如CPU,RAM,主存储和辅助存储中。超级管理员能够利用下列资源的使用限制,例如域,项目或者账户。"
+
+# a9ae7f3a467e463eab0552d8f074f9bb
+#: ../../usage.rst:246
+msgid "CPUs"
+msgstr "CPUs"
+
+# d1e8543092ca4e278cb463f77f1d2d2d
+#: ../../usage.rst:250
+msgid "Memory (RAM)"
+msgstr "Memory (RAM)"
+
+# 9bc201d30c4f454aa76e9ea96d490920
+#: ../../usage.rst:254
+msgid "Primary Storage (Volumes)"
+msgstr "主存储(卷)"
+
+# 2eb3b21cf5ff4e0c9db68b1d2027d48a
+#: ../../usage.rst:258
+msgid "Secondary Storage (Snapshots, Templates, ISOs)"
+msgstr "辅助存储(快照,模板,ISOs)"
+
+# ba99ec918f874b8082b08d81454b8fca
+#: ../../usage.rst:260
+msgid ""
+"To control the behaviour of this feature, the following configuration "
+"parameters have been added:"
+msgstr "为了控制该特征的行为,以下配置参数已经添加:"
+
+# 701e7e16a99445b99fc60cffc35a1613
+# 895a22fc7c014f04bd420cec4b2209d1
+# 191142d4e5a34f1a981be02aab78a4e9
+# f2dd174ed4ca4418983cfaa634ead8a3
+#: ../../usage.rst:264 ../../usage.rst:395 ../../usage.rst:477
+#: ../../usage.rst:1006
+msgid "Description"
+msgstr "描述"
+
+# c9b3ff00335343b584b50bb9d670e66b
+#: ../../usage.rst:266
+msgid "max.account.cpus"
+msgstr "max.account.cpus"
+
+# 808381505f1949dcbe071d0118def06a
+# e576ee036df54d8fb5e8e54071303efb
+#: ../../usage.rst:266 ../../usage.rst:274
+msgid ""
+"Maximum number of CPU cores that can be used for an account. Default is 40."
+msgstr "最大的可以被账户使用的CPU核心个数。默认是40."
+
+# 6babe6b036e849c1935af0fdb317a503
+#: ../../usage.rst:268
+msgid "max.account.ram (MB)"
+msgstr "max.account.ram (MB)"
+
+# 0d3c447ef2b44034ac9f10ef0a6cf757
+# 83ccac909d944ba784f4c8286642b875
+#: ../../usage.rst:268 ../../usage.rst:276
+msgid "Maximum RAM that can be used for an account. Default is 40960."
+msgstr "最大的可以被账户使用的RMA容量。默认值是40960。"
+
+# 7ff408b8265a47cfaf763eb727c7f173
+#: ../../usage.rst:270
+msgid "max.account.primary.storage (GB)"
+msgstr "max.account.primary.storage (GB)"
+
+# 91e413d1b9bb4711b508311ddd9347c6
+# 20a5043887eb49b1a52d77e4cc334412
+#: ../../usage.rst:270 ../../usage.rst:278
+msgid ""
+"Maximum primary storage space that can be used for an account. Default is "
+"200."
+msgstr "最大的可以被账户使用的主存储个数。默认是200。"
+
+# 5f6df194148e43a7b3c27106ce4b7ae9
+#: ../../usage.rst:272
+msgid "max.account.secondary.storage (GB)"
+msgstr "max.account.secondary.storage (GB)"
+
+# 694920973fbe4b3a9c30a8be9d0bed46
+# 97892a16f5464907b6ecdee7beac3914
+#: ../../usage.rst:272 ../../usage.rst:280
+msgid ""
+"Maximum secondary storage space that can be used for an account. Default is "
+"400."
+msgstr "最大的可被账户使用的辅助存储空间。默认是400。"
+
+# 145cd18bd90944c29a70a7031636b807
+#: ../../usage.rst:274
+msgid "max.project.cpus"
+msgstr "max.project.cpus"
+
+# c40411dfaeb04da3867c26ce7f18cf93
+#: ../../usage.rst:276
+msgid "max.project.ram (MB)"
+msgstr "max.project.ram (MB)"
+
+# 472152eee1784c32878c18418221acdb
+#: ../../usage.rst:278
+msgid "max.project.primary.storage (GB)"
+msgstr "max.project.primary.storage (GB)"
+
+# e7351bedf5464f369b0c6475fc3826bb
+#: ../../usage.rst:280
+msgid "max.project.secondary.storage (GB)"
+msgstr "max.project.secondary.storage (GB)"
+
+# fc4d573c924648f3b8d5cfb5701bfe79
+#: ../../usage.rst:285
+msgid "User Permission"
+msgstr "用户许可"
+
+# 992a6cf60f4d464eaa582363722fe802
+#: ../../usage.rst:287
+msgid ""
+"The root administrator, domain administrators and users are able to list "
+"resources. Ensure that proper logs are maintained in the ``vmops.log`` and "
+"``api.log`` files."
+msgstr "超级管理员,域管理员和用户能够列出资源。确保合适的属性日至保存在 ``vmops.log`` 和 ``api.log``文件中。"
+
+# 41185d18c788495bb86298b0d85badd0
+#: ../../usage.rst:293
+msgid ""
+"The root admin will have the privilege to list and update resource limits."
+msgstr "超级管理员将有列出和升级资源限制的特权。"
+
+# 76a4aba5c62647b4b43b704d8cfdb5ea
+#: ../../usage.rst:298
+msgid ""
+"The domain administrators are allowed to list and change these resource "
+"limits only for the sub-domains and accounts under their own domain or the "
+"sub-domains."
+msgstr "域管理员仅允许列出和改变在其拥有的域或者子域的子域和账户的资源限制。"
+
+# a87d4ac1c2e346ffa3b116567c1a2d0a
+#: ../../usage.rst:304
+msgid ""
+"The end users will the privilege to list resource limits. Use the "
+"listResourceLimits API."
+msgstr "终端用户拥有改变列出资源限制的特权。使用listResourceLimits API.。"
+
+# aca61571889f482e9ae39fde99d3d2c6
+#: ../../usage.rst:308
+msgid "Limit Usage Considerations"
+msgstr "限制使用注意事项:"
+
+# 96374a37482c4635afc8f21dd613d978
+#: ../../usage.rst:312
+msgid ""
+"Primary or Secondary storage space refers to the stated size of the volume "
+"and not the physical size— the actual consumed size on disk in case of thin "
+"provisioning."
+msgstr "主存储或者辅助存储空间参考启动的容器大小而不是物理容量,实际使用的物理空间要小于提供的空间。"
+
+# 8ebf7be7aceb49d9abe430f6d3214d7f
+#: ../../usage.rst:318
+msgid ""
+"If the admin reduces the resource limit for an account and set it to less "
+"than the resources that are currently being consumed, the existing "
+"VMs/templates/volumes are not destroyed. Limits are imposed only if the user"
+" under that account tries to execute a new operation using any of these "
+"resources. For example, the existing behavior in the case of a VM are:"
+msgstr "如果管理员为账户减少资源限制,并设置少于目前设定的资源数,已经存在的VM/模板/卷也不会破坏。限制仅在账户中的用户试图使用这些资源执行新的操作时表现出来。例如,在一个VM中倘若存在下列行为:"
+
+# 89e003933f074f23bbc0599f15cdff5f
+#: ../../usage.rst:327
+msgid ""
+"migrateVirtualMachine: The users under that account will be able to migrate "
+"the running VM into any other host without facing any limit issue."
+msgstr "迁移虚拟机:在账户中的用户试图迁移一个正在运行的VM到任何不面临限制问题的主机。"
+
+# 4adef6c4f48a4141b8994845fa47579d
+#: ../../usage.rst:333
+msgid "recoverVirtualMachine: Destroyed VMs cannot be recovered."
+msgstr "恢复虚拟机:破坏的VM不能被修复。"
+
+# bc957aef4ad4410aac019444739d39a4
+#: ../../usage.rst:337
+msgid ""
+"For any resource type, if a domain has limit X, sub-domains or accounts "
+"under that domain can have there own limits. However, the sum of resource "
+"allocated to a sub-domain or accounts under the domain at any point of time "
+"should not exceed the value X."
+msgstr "对于更多资源类型,如果一个域存在限制X,这个域的子域或者账户也能也有它们自身的限制。尽管如此,一个子域允许分配的资源总和或者域中账户在任何时间点都不能执行X限制。"
+
+# 24a983cb8b67474abde79f6889217547
+#: ../../usage.rst:342
+msgid ""
+"For example, if a domain has the CPU limit of 40 and the sub-domain D1 and "
+"account A1 can have limits of 30 each, but at any point of time the resource"
+" allocated to D1 and A1 should not exceed the limit of 40."
+msgstr "例如,当一个域有CPU的限制数量为40,其子域D1和账户A1可以有每个30的限制,但是任何时候分配给D1和A1的资源都不能超过限制40."
+
+# 30fe62ee367f4359a9a57e89756d466d
+#: ../../usage.rst:349
+msgid ""
+"If any operation needs to pass through two of more resource limit check, "
+"then the lower of 2 limits will be enforced, For example: if an account has "
+"the VM limit of 10 and CPU limit of 20, and a user under that account "
+"requests 5 VMs of 4 CPUs each. The user can deploy 5 more VMs because VM "
+"limit is 10. However, the user cannot deploy any more instances because the "
+"CPU limit has been exhausted."
+msgstr "如果一些操作需要通过两个或更多的资源限制核查,最少的两个限制将被执行,例如:如果一个账户有10个限制VM和20个限制CPU,用户在账户中申请每4个CPU5个VM。用户可以部署5个或更多的VM,因为VM的限制个数是10。尽管如此,用户不能部署任何实例,因为CPU的限制已经用尽。"
+
+# e2ebbbc8967b45cc9998475e4dbd9d24
+#: ../../usage.rst:357
+msgid "Limiting Resource Usage in a Domain"
+msgstr "在一个域中限制资源使用"
+
+# bb8ae3e9878c46f89162dc7fdc092f1b
+#: ../../usage.rst:359
+msgid ""
+"CloudStack allows the configuration of limits on a domain basis. With a "
+"domain limit in place, all users still have their account limits. They are "
+"additionally limited, as a group, to not exceed the resource limits set on "
+"their domain. Domain limits aggregate the usage of all accounts in the "
+"domain as well as all the accounts in all the sub-domains of that domain. "
+"Limits set at the root domain level apply to the sum of resource usage by "
+"the accounts in all the domains and sub-domains below that root domain."
+msgstr "CloudStack允许在一个域基础上配置限制。使用域限制的地点是所有的用户都有其账户的的限制。它们有额外的限制,例如群组,不能执行设置在它们域上的资源限制。域限制聚集了任何域中使用的账户和任何账户的所有域的子域。限制设定在根域层次应用于所有域的账户和子域使用的资源综合都低于根域的限制。"
+
+# 103a30006f7741ac9db713d266a5260a
+#: ../../usage.rst:368
+msgid "To set a domain limit:"
+msgstr "设定一个域限制:"
+
+# 70f50a6779ea4f7594118e18b47895fe
+# 48c0bb0248954742bd447c868ebdf0a8
+#: ../../usage.rst:372 ../../usage.rst:454
+msgid "Log in to the CloudStack UI."
+msgstr "登录到CloudStack的界面"
+
+# b2c05194969c4e2e8ad740be41b6d06d
+#: ../../usage.rst:376
+msgid "In the left navigation tree, click Domains."
+msgstr "在导航栏左侧树中,单击域。"
+
+# 7011345e6a9840ce90707e5370d8b01c
+#: ../../usage.rst:380
+msgid ""
+"Select the domain you want to modify. The current domain limits are "
+"displayed."
+msgstr "选择你想修改的域。当前域限制将被显示出来。"
+
+# 6aeb808f62f34735a7d07e7d86d372a2
+# 30925ced880840748118903c27bffadd
+#: ../../usage.rst:383 ../../usage.rst:465
+msgid "A value of -1 shows that there is no limit in place."
+msgstr "值为-1表明此处没有任何限制。"
+
+# d45e49e7b252469a978dfaade17de643
+#: ../../usage.rst:387
+msgid "Click the Edit button |editbutton.png|"
+msgstr "单击编辑按钮 |editbutton.png|"
+
+# 3644e560828a437a8efd7294c1146c57
+# dcb185144b264299ada24bfd162ca230
+#: ../../usage.rst:391 ../../usage.rst:473
+msgid "Edit the following as per your requirement:"
+msgstr "编辑下列每一条要求:"
+
+# 0e98068650894afca9c4cad2ba57d012
+# d99b60d3d6cc4a2ebc4bb48e70492e46
+#: ../../usage.rst:397 ../../usage.rst:479
+msgid "Instance Limits"
+msgstr "实例限制:"
+
+# 1490bec5c5af4b6aac1977fae7406bd9
+#: ../../usage.rst:399
+msgid "The number of instances that can be used in a domain."
+msgstr "可以被用在域中的实例的个数"
+
+# 6b1b4dc40c63424a9bee7ff075229e64
+# 6b59062ccedf4877b9bcbf68577231ac
+#: ../../usage.rst:401 ../../usage.rst:485
+msgid "Public IP Limits"
+msgstr "公共IP限制"
+
+# ad257ba8e044423d828023c39de3ad02
+#: ../../usage.rst:403
+msgid "The number of public IP addresses that can be used in a domain."
+msgstr "可以被用在域中的公共IP地址的个数。"
+
+# dcdfcfad513b4222b5331ce5736ef137
+# d9ca60a77d4849b193ae25ff879389d0
+#: ../../usage.rst:405 ../../usage.rst:491
+msgid "Volume Limits"
+msgstr "卷限制"
+
+# 1eb1867ffda449a6bb66c6ec8f065967
+#: ../../usage.rst:407
+msgid "The number of disk volumes that can be created in a domain."
+msgstr "可以被创建在雨中的磁盘卷的个数"
+
+# b6f42f973d934cb999c41c20e433d8fe
+# 10261a1b88ae4d2a8e58d52c1de12d25
+#: ../../usage.rst:409 ../../usage.rst:497
+msgid "Snapshot Limits"
+msgstr "快照限制"
+
+# 4b257bf3dce344af8eadcef3141b57b9
+#: ../../usage.rst:411
+msgid "The number of snapshots that can be created in a domain."
+msgstr "可以被创建在域中的快照个数"
+
+# b7ee911b551c44f7919c853b78b4425f
+# 86f76db28bb548458cb440dba9aa78cc
+#: ../../usage.rst:413 ../../usage.rst:503
+msgid "Template Limits"
+msgstr "模板限制"
+
+# 420b972a03034c3f8eb40442e16f668a
+#: ../../usage.rst:415
+msgid "The number of templates that can be registered in a domain."
+msgstr "可以在域中注册的模板数量"
+
+# 3e038058f17d4b0da96787cea06872d7
+# be00e5ab52c04e94a69c4a70e2881d6c
+#: ../../usage.rst:417 ../../usage.rst:509
+msgid "VPC limits"
+msgstr "VPC限制"
+
+# b7d308b327c04f1ab4e8b5f302af61ab
+#: ../../usage.rst:419
+msgid "The number of VPCs that can be created in a domain."
+msgstr "可以被创建在域中的VPC的个数"
+
+# fce16fe529af4a7293745ff0c030b9cb
+# 443d6a522d9840e2a18dd44f0289166f
+#: ../../usage.rst:421 ../../usage.rst:515
+msgid "CPU limits"
+msgstr "CPU限制"
+
+# d71cdb39c26d44ce8f7dc1d458970d6f
+#: ../../usage.rst:423
+msgid "The number of CPU cores that can be used for a domain."
+msgstr "可以在域中使用的CPU核心数。"
+
+# 636111c4340a4e8d81ea9a1408617fff
+# 8cd52cd9a5764bb0b4e8df8a94c725ab
+#: ../../usage.rst:425 ../../usage.rst:521
+msgid "Memory limits (MB)"
+msgstr "内存限制(MB)"
+
+# 3b5d06b9763040d885a0698e6fbdbb6a
+#: ../../usage.rst:427
+msgid "The number of RAM that can be used for a domain."
+msgstr "可以在域中使用的RAM数量。"
+
+# c6b3a361e0414c88a4d5c44b76a273ea
+# d77e6bda798a4106ab33783525f2e4f2
+#: ../../usage.rst:429 ../../usage.rst:527
+msgid "Primary Storage limits (GB)"
+msgstr "主存储限制(GB)"
+
+# 9fd1366af3c34b8ebc3569a0ee410c57
+#: ../../usage.rst:431
+msgid "The primary storage space that can be used for a domain."
+msgstr "在域中可以使用的主存储空间大小。"
+
+# 7a3d9175a9a24b8aaa8450632df0a763
+# 172a382bbcdf4f84bb58871b61c9425b
+#: ../../usage.rst:433 ../../usage.rst:533
+msgid "Secondary Storage limits (GB)"
+msgstr "辅助存储限制(GB)"
+
+# 141ca6b4f0ff49fb83194c64faaa2785
+#: ../../usage.rst:435
+msgid "The secondary storage space that can be used for a domain."
+msgstr "在域中可使用的辅助存储空间大小。"
+
+# 05f0937c41c248c2a42d5b01086833af
+# a30d9a7a173147dfad893988bb11c62c
+#: ../../usage.rst:439 ../../usage.rst:541
+msgid "Click Apply."
+msgstr "点击应用"
+
+# e64546c23abc46f69e958e6ba2f6a45e
+#: ../../usage.rst:442
+msgid "Default Account Resource Limits"
+msgstr "默认账户资源限制"
+
+# d39e8db38abb47f7bb88354317f3c717
+#: ../../usage.rst:444
+msgid ""
+"You can limit resource use by accounts. The default limits are set by using "
+"Global configuration parameters, and they affect all accounts within a "
+"cloud. The relevant parameters are those beginning with max.account, for "
+"example: max.account.snapshots."
+msgstr "你可以限制账户使用的资源。默认限制通过全局配置参数设置,它们影响在云中的所有账户。其相关参数开始于max.account,例如:max.account.snapshots。"
+
+# 785d6083ab194768bf8fd0e111052af4
+#: ../../usage.rst:449
+msgid ""
+"To override a default limit for a particular account, set a per-account "
+"resource limit."
+msgstr "对于覆盖一个默认限制的特殊账户,设置per-account资源限制。"
+
+# 234f93b230d546038672b7b7fabb3bb6
+#: ../../usage.rst:458
+msgid "In the left navigation tree, click Accounts."
+msgstr "在导航树左侧,单击账户。"
+
+# c46ae3c1e44c48eb8b3c1b418b6dd7a6
+#: ../../usage.rst:462
+msgid ""
+"Select the account you want to modify. The current limits are displayed."
+msgstr "选择你想修改的账户。当前限制将显示出来。"
+
+# 6ef5ea22b14643cca72f87c8f6f3ec87
+#: ../../usage.rst:469
+msgid "Click the Edit button. |editbutton.png|"
+msgstr "单击编辑按钮。|editbutton.png|"
+
+# bcacb6c61c5643d59e3f18626a386e80
+#: ../../usage.rst:481
+msgid "The number of instances that can be used in an account."
+msgstr "在一个账户中可以适用的实例个数。"
+
+# 5219fe5416b143daad66670634c102c4
+# 3a80e105e27b4fe1aa28988ee3df905b
+# 3c1d4c98816f438b948a9ba94bac3dff
+# 71f315d93a394970a010d89c3b8cd47b
+# da4f44de38794f3ba45677eab7816383
+# cc29ea692bbe4e10ac190932bb654c87
+#: ../../usage.rst:483 ../../usage.rst:489 ../../usage.rst:495
+#: ../../usage.rst:501 ../../usage.rst:507 ../../usage.rst:513
+msgid "The default is 20."
+msgstr "默认是20个。"
+
+# 2975c69d82ae46719fe87557b9340482
+#: ../../usage.rst:487
+msgid "The number of public IP addresses that can be used in an account."
+msgstr "在账户中可以使用的公共IP地址个数。"
+
+# cb4700fde09a4bf393a2e6f7f2368957
+#: ../../usage.rst:493
+msgid "The number of disk volumes that can be created in an account."
+msgstr "在账户中可以创建的磁盘卷个数。"
+
+# dc40e0f30ee94e799f0206e7c1e8e07e
+#: ../../usage.rst:499
+msgid "The number of snapshots that can be created in an account."
+msgstr "在账户中可以创建的快照数量。"
+
+# 853d74cbd7dd482f8df89f4b8dce104a
+#: ../../usage.rst:505
+msgid "The number of templates that can be registered in an account."
+msgstr "在账户中可以注册的模板数量。"
+
+# 288f9071013747059feb9d3da84c2355
+#: ../../usage.rst:511
+msgid "The number of VPCs that can be created in an account."
+msgstr "在账户中可以创建的VPC数量。"
+
+# 3f289b8a9f0448ea9c4e5da62d340a93
+#: ../../usage.rst:517
+msgid "The number of CPU cores that can be used for an account."
+msgstr "在账户中可以使用的CPU内核的个数。"
+
+# 38ebe4cd1c664c47a588d311025f7d69
+#: ../../usage.rst:519
+msgid "The default is 40."
+msgstr "默认是40。"
+
+# 696083649ee5486b9a14674a296d3994
+#: ../../usage.rst:523
+msgid "The number of RAM that can be used for an account."
+msgstr "在账户中可以使用的RAM数量。"
+
+# 920dfc71a5b14a5fa400d697dfb7cc6f
+#: ../../usage.rst:525
+msgid "The default is 40960."
+msgstr "默认值是40960。"
+
+# b2455dd2cd2e4e6193381252d5c91530
+#: ../../usage.rst:529
+msgid "The primary storage space that can be used for an account."
+msgstr "在账户中可以使用的主存储空间。"
+
+# 99fcd0a0086c4a25940fafc2e2f61f29
+#: ../../usage.rst:531
+msgid "The default is 200."
+msgstr "默认是200。"
+
+# a491b8aa13c54bfd9ba29c7e0f5510c2
+#: ../../usage.rst:535
+msgid "The secondary storage space that can be used for an account."
+msgstr "在账户中可以使用的辅助存储空间。"
+
+# b38daf6fd3f54c9fb4aca46e83dd6d05
+#: ../../usage.rst:537
+msgid "The default is 400."
+msgstr "默认是400。"
+
+# 3b7fd66c0dbe4d9395e99d3fda42744f
+#: ../../usage.rst:545
+msgid "Usage Record Format"
+msgstr "使用记录格式"
+
+# 23e146a6c80f40faad4f402fb96f69d3
+#: ../../usage.rst:548
+msgid "Virtual Machine Usage Record Format"
+msgstr "虚拟机使用记录格式"
+
+# b18a9612524b4defa9435bd2af0808fa
+#: ../../usage.rst:550
+msgid ""
+"For running and allocated virtual machine usage, the following fields exist "
+"in a usage record:"
+msgstr "对运行或者已分配虚拟机使用,下列字段存在于使用记录中:"
+
+# b7e355e1118447e2ab1db44f43eb678e
+# f7b98329db784060812bbff8bf46b00e
+# 8d470f7dd5d243da9c56213943473ecf
+# 6069dd2ad3aa4c408d1048d2f3fa005e
+# 37b469072184449b94d3535ae468bffe
+# 7c8f0dc188cb45309cc91a5c67b6b9a3
+#: ../../usage.rst:555 ../../usage.rst:625 ../../usage.rst:726
+#: ../../usage.rst:787 ../../usage.rst:894 ../../usage.rst:955
+msgid "account – name of the account"
+msgstr "account--账户的名字"
+
+# e1e34a37ba1d498585eaab30e2351742
+# 026f620f0e294b169c97fdb92ba57ecf
+# 30917b31f13c40179982bf003c13d5b2
+# b78545017e5b4064903c7f09ff6cd401
+# acfd26101a794b8e9a48f436dbbd01a9
+# b3a301e04b424468a2b699c872d1ff3a
+#: ../../usage.rst:559 ../../usage.rst:629 ../../usage.rst:730
+#: ../../usage.rst:791 ../../usage.rst:898 ../../usage.rst:959
+msgid "accountid – ID of the account"
+msgstr "accountid--账户的ID"
+
+# 15be8f85307f42a0b06f5e97b57c4e7f
+# cd486a947a304246a98f9893e3e00557
+# 79d393b3b1f14871bf02b50c422421f9
+# bf901bb97d6f47f5b916b329cac5ce26
+# cf82083852df4a67b8f82a8b17ff8d38
+# 271309f9bfab4620acc24e2f5a375f2d
+#: ../../usage.rst:563 ../../usage.rst:633 ../../usage.rst:734
+#: ../../usage.rst:795 ../../usage.rst:902 ../../usage.rst:963
+msgid "domainid – ID of the domain in which this account resides"
+msgstr "domainid --在此账户存在的域的 ID"
+
+# 1ac00861f5ac4e1f9e6c74777a6a6eca
+# 18ab3268a73d453195129ad3a1bd3dab
+# ba80f684ac1e4667b879233f20723c3d
+# 4384bfa6f64146438dc81cfbe82e8987
+# 06a1afeaa8664be5944707d630da307d
+# a2ce895fafd04583ac774cf156786df2
+#: ../../usage.rst:567 ../../usage.rst:637 ../../usage.rst:738
+#: ../../usage.rst:799 ../../usage.rst:906 ../../usage.rst:967
+msgid "zoneid – Zone where the usage occurred"
+msgstr "zoneid – 使用资源域的ID号"
+
+# 4e304294d1424ed787da24b1cbe632bf
+# 9b796d3f857b4c298c92d93c80d31584
+# 7fdfbfc30a354983b9c12308e1976ef3
+# 688751ec77e249f4bf58e1ad0cba8768
+# fe7cdd70966543dca1a3cc526ee07500
+# 0c59a00f82af422babd5a77980e812ec
+#: ../../usage.rst:571 ../../usage.rst:641 ../../usage.rst:742
+#: ../../usage.rst:803 ../../usage.rst:910 ../../usage.rst:971
+msgid "description – A string describing what the usage record is tracking"
+msgstr "description – 字符描述,用于追查使用量的记录"
+
+# 9bef56bf42ff4bec9ff2e9bb16072e4c
+#: ../../usage.rst:575
+msgid ""
+"usage – String representation of the usage, including the units of usage "
+"(e.g. 'Hrs' for VM running time)"
+msgstr "usage – 代表使用量的文字,包括使用量的单位(如 'Hrs'代表虚机运行时间)"
+
+# e639456f21ae4b7294943056663a4b83
+# 78fc89b23a9241f784b08190352c8f17
+# fea2f14a640c406d8639087c670a0a59
+# 734f38e6f69c41d3959da554e5e174bb
+# 2c43f4b99f624f0694765d97d03a3133
+# 2009c00147bd45b6904fd38e30dc7bbf
+# b3dd2416c8cf4a7b847db345892636b9
+# a8ab363fa03b4e0bac77a4d12f9d84df
+#: ../../usage.rst:580 ../../usage.rst:645 ../../usage.rst:751
+#: ../../usage.rst:812 ../../usage.rst:919 ../../usage.rst:931
+#: ../../usage.rst:980 ../../usage.rst:992
+msgid "usagetype – A number representing the usage type (see Usage Types)"
+msgstr "usagetype – 代表使用量类型的数字 (参见使用量类型)"
+
+# fa25ba78790940ce9c81f39bf7771531
+# 94514edf37854f9281d8bd02aa335609
+# acd0fa0b9e3642638023b78708ba7d52
+# 688683e918054191b46f54f1173303bc
+# 40bc7564d68946fa9702312b5692111e
+# ea864a184c9f4400a0a2f754fedd82f3
+#: ../../usage.rst:584 ../../usage.rst:649 ../../usage.rst:755
+#: ../../usage.rst:816 ../../usage.rst:923 ../../usage.rst:984
+msgid "rawusage – A number representing the actual usage in hours"
+msgstr "rawusage – 代表以小时为单位实时使用量的数字"
+
+# b3bf8f9450024875b00dffc676334381
+# 72dc579445cf44438333e64d076dd4db
+# 6e37cc43677a4185befdfb76040dd76b
+#: ../../usage.rst:588 ../../usage.rst:939 ../../usage.rst:943
+msgid "virtualMachineId – The ID of the virtual machine"
+msgstr "virtualMachineId – 虚拟服务器的ID号"
+
+# f7235acfed7044978392f3d934ece97b
+#: ../../usage.rst:592
+msgid "name – The name of the virtual machine"
+msgstr "name - 虚机名称"
+
+# 2df0848f8a4f42568e119c9d7d29a727
+#: ../../usage.rst:596
+msgid "offeringid – The ID of the service offering"
+msgstr "offeringid - 计算方案的ID"
+
+# 5bd83bab0e0a4f6ba6c55054e85c83eb
+#: ../../usage.rst:600
+msgid ""
+"templateid – The ID of the template or the ID of the parent template. The "
+"parent template value is present when the current template was created from "
+"a volume."
+msgstr "templateid – 模版或父模版的ID。当模版是从磁盘卷创建时,此处会使用父模版的ID。"
+
+# b623aaa31f4a41609d3a766dbbc266a7
+#: ../../usage.rst:606
+msgid "usageid – Virtual machine"
+msgstr "usageid -- 虚拟机"
+
+# 6a34753a5ffe4b88987b17fe58117df1
+# c577b82ea72f485cbd49efa5aa440607
+#: ../../usage.rst:610 ../../usage.rst:767
+msgid "type – Hypervisor"
+msgstr "type - 虚拟化平台"
+
+# a2b44295f13e4ba98617f6459e465a37
+# dcc85c1318a74646ab89f15fae94e929
+# e8c7e84d490e44d78444e65214200082
+# 9770ba4689364876ba4ef9372159e7c9
+# 1ce8c0863df3409e8857338c5a87d0d8
+# 7a0a24dd0d2f44eaa688daabf2da6e9c
+#: ../../usage.rst:614 ../../usage.rst:661 ../../usage.rst:779
+#: ../../usage.rst:837 ../../usage.rst:947 ../../usage.rst:996
+msgid ""
+"startdate, enddate – The range of time for which the usage is aggregated; "
+"see Dates in the Usage Record"
+msgstr "startdate, enddate –一定时间内的使用量总和; 参见 使用量记录中的日期"
+
+# 87c6f3a716f94e7ab8419c6a0e40665f
+#: ../../usage.rst:618
+msgid "Network Usage Record Format"
+msgstr "网络用量记录格式"
+
+# caa3dfd36b9846c8b39e6ee4109f3f60
+#: ../../usage.rst:620
+msgid ""
+"For network usage (bytes sent/received), the following fields exist in a "
+"usage record."
+msgstr "网络用量(发送/接收字节数)记录中存在以下字段:"
+
+# 35da263687c546ef981a6184c650e0b1
+#: ../../usage.rst:653
+msgid "usageid – Device ID (virtual router ID or external device ID)"
+msgstr "usageid - 设备ID(虚拟路由器ID或外部设备ID)"
+
+# 4f07d5b20ad64f2f98ee95b228e8bc2d
+#: ../../usage.rst:657
+msgid "type – Device type (domain router, external load balancer, etc.)"
+msgstr "type - 设备类型(虚拟路由器、外部负载均衡等)"
+
+# de5e410ac9ac4c0e95cbf32877b38e3b
+#: ../../usage.rst:665
+msgid "IP Address Usage Record Format"
+msgstr "IP地址使用记录格式"
+
+# 78c0ae94aad9451fbc17b139ac592178
+#: ../../usage.rst:667
+msgid "For IP address usage the following fields exist in a usage record."
+msgstr "对于IP地址使用下列字段存在于使用记录中。"
+
+# 1001f3ef83a3471599363668140e611c
+# 87506d34d23849e999f41a90f0e0585d
+#: ../../usage.rst:671 ../../usage.rst:845
+msgid "account - name of the account"
+msgstr "account - 账户的名称"
+
+# 0a347a476a6f4465adc7648b145d9e13
+# 45147a5415414feaa29f4adf0867a62c
+#: ../../usage.rst:675 ../../usage.rst:849
+msgid "accountid - ID of the account"
+msgstr "accountid-账户的ID"
+
+# bdce765bf0ef41df9a40c8a859c79485
+# e8c3fbe59cbb429894c293078923df6c
+#: ../../usage.rst:679 ../../usage.rst:853
+msgid "domainid - ID of the domain in which this account resides"
+msgstr "domainid-本账户具有的鱼的ID"
+
+# 700974b57fd44957b826e34572177ab7
+# c21235c6b75d438d85b8057cb2d0a501
+#: ../../usage.rst:683 ../../usage.rst:857
+msgid "zoneid - Zone where the usage occurred"
+msgstr "zoneid-已经使用的域ID"
+
+# b6586df549a74fd1b4afa690b0e12ac8
+# 3f9507fea4424e28a5053bc9de564425
+#: ../../usage.rst:687 ../../usage.rst:861
+msgid "description - A string describing what the usage record is tracking"
+msgstr "description – 字符描述追查用量记录"
+
+# e452ef9c4fe94507b8101ce28484e653
+#: ../../usage.rst:691
+msgid ""
+"usage - String representation of the usage, including the units of usage"
+msgstr "usage – 代表使用量的字符串,包括使用量的单位 "
+
+# b6cb74da5c8b4f119df10d28162abdaf
+# 476d4b86321e419fb217ec240a902e5c
+# 9ea53be1624442bfa13824d94cc10c97
+#: ../../usage.rst:696 ../../usage.rst:870 ../../usage.rst:882
+msgid "usagetype - A number representing the usage type (see Usage Types)"
+msgstr "usagetype – 代表使用量类型的数字 (参见使用量类型)"
+
+# ab04998bb97140f9869fc42034d21075
+# e9cf568981ba4cdda04c84338e7cf7cb
+#: ../../usage.rst:700 ../../usage.rst:874
+msgid "rawusage - A number representing the actual usage in hours"
+msgstr "rawusage – 代表以小时为单位实时使用量的数字"
+
+# c4dd2f456c2c41a09936672e513ca634
+#: ../../usage.rst:704
+msgid "usageid - IP address ID"
+msgstr "usageid-IP地址ID"
+
+# 374f362f0e62453f9a1e286a4098b80c
+# 9d53d00bcf374d8a965d7bdb030e03a0
+#: ../../usage.rst:708 ../../usage.rst:886
+msgid ""
+"startdate, enddate - The range of time for which the usage is aggregated; "
+"see Dates in the Usage Record"
+msgstr "startdate, enddate – 一定时间范围内的用量总和; 参见 用量记录中的日期"
+
+# e0fedba7f0d44912b8b66044224e26a9
+#: ../../usage.rst:713
+msgid "issourcenat - Whether source NAT is enabled for the IP address"
+msgstr "issourcenat - IP地址的NAT资源是否有效"
+
+# 54327477db6a4fc0a5edc3ebe3bece46
+#: ../../usage.rst:717
+msgid "iselastic - True if the IP address is elastic."
+msgstr "iselastic - 如果IP地址是弹性的为True"
+
+# e6f2bace17244b43af803f2dda9c3068
+#: ../../usage.rst:720
+msgid "Disk Volume Usage Record Format"
+msgstr "磁盘用量记录格式"
+
+# 0c0c23e5bf654ac49834841997c2f6bb
+#: ../../usage.rst:722
+msgid "For disk volumes, the following fields exist in a usage record."
+msgstr "对于磁盘,用量记录存在下列字段。"
+
+# be28f6050bb94084bb656efc502ac189
+# 2d215ba8acb44195bea83a442070fbbd
+# e7cf1890be9c4bed99ef1a6ff8cb5c4b
+# 84493a2ef1494522a1f9761ed36de673
+#: ../../usage.rst:746 ../../usage.rst:807 ../../usage.rst:914
+#: ../../usage.rst:975
+msgid ""
+"usage – String representation of the usage, including the units of usage "
+"(e.g. 'Hrs' for hours)"
+msgstr "usage – 代表使用量的文字,包括使用量的单位 (如 'Hrs'是小时)"
+
+# b1e806b2412543a9ac138c0bceed3ac7
+#: ../../usage.rst:759
+msgid "usageid – The volume ID"
+msgstr "usageid - 磁盘ID"
+
+# ba95fc6f138d4d6d9eee73ac54807567
+# 447cf10b356f43b583376cb3762a49e2
+#: ../../usage.rst:763 ../../usage.rst:824
+msgid "offeringid – The ID of the disk offering"
+msgstr "offeringid - 磁盘方案的ID"
+
+# 4f952183cc3944d6b58d2764e2b3483e
+#: ../../usage.rst:771
+msgid "templateid – ROOT template ID"
+msgstr "templateid - 根模版ID"
+
+# 6239c472f1174d7486c4373f3f91b852
+#: ../../usage.rst:775
+msgid "size – The amount of storage allocated"
+msgstr "size - 分配的存储大小"
+
+# 0b8e217bf8664b26910d0336284d2685
+#: ../../usage.rst:783
+msgid "Template, ISO, and Snapshot Usage Record Format"
+msgstr "模版、ISO和快照用量记录格式"
+
+# 8e86814eb5504fd7aabdd42b9ecd30dc
+#: ../../usage.rst:820
+msgid "usageid – The ID of the the template, ISO, or snapshot"
+msgstr "usageid - 模版、ISO或快照的ID"
+
+# b62090bf985a4410b04c8cdebd58f05e
+#: ../../usage.rst:828
+msgid ""
+"templateid – – Included only for templates (usage type 7). Source template "
+"ID."
+msgstr "templateid -- 仅模版(用量类型为7)时包括。源模版ID。"
+
+# 3b4e511d50554530abbc0f26a25b931a
+#: ../../usage.rst:833
+msgid "size – Size of the template, ISO, or snapshot"
+msgstr "size - 模版、ISO或快照的大小"
+
+# 03cd150724624caab3641ef9a3fde274
+#: ../../usage.rst:841
+msgid "Load Balancer Policy or Port Forwarding Rule Usage Record Format"
+msgstr "负载均衡策略或端口导向规则用量记录格式"
+
+# 1988ac276c19468ab601b81781e1529c
+#: ../../usage.rst:865
+msgid ""
+"usage - String representation of the usage, including the units of usage "
+"(e.g. 'Hrs' for hours)"
+msgstr "usage – 代表使用量的字符串,包括使用量的单位 (如 'Hrs'是小时)"
+
+# 0bb591c7914846548e7b36b597a37b90
+#: ../../usage.rst:878
+msgid "usageid - ID of the load balancer policy or port forwarding rule"
+msgstr "usageid -负载均衡或端口导向规则ID"
+
+# 5b356b33fefd4c119e70c313d74e255b
+#: ../../usage.rst:890
+msgid "Network Offering Usage Record Format"
+msgstr "网络服务方案用量记录格式"
+
+# 4080c653f1fa4ac2b72572385a12cc7c
+#: ../../usage.rst:927
+msgid "usageid – ID of the network offering"
+msgstr "usageid – 网络服务方案的ID"
+
+# df1d1f4e37554d8998d72b642a45e94c
+#: ../../usage.rst:935
+msgid "offeringid – Network offering ID"
+msgstr "offeringid – 网络服务方案的ID"
+
+# e4e67d8c23ed4921811a4a624f9fca5d
+#: ../../usage.rst:951
+msgid "VPN User Usage Record Format"
+msgstr "VPN用户用量记录格式"
+
+# 8b9aa4e21f1d4e7cac5643ff605c5b70
+#: ../../usage.rst:988
+msgid "usageid – VPN user ID"
+msgstr "usageid - VPN用户ID"
+
+# 48f6a187d7534e2aad5d1126010a8dd7
+#: ../../usage.rst:1001
+msgid "Usage Types"
+msgstr "用量类型"
+
+# f951beabc0db44fb826fb17761d72ca0
+#: ../../usage.rst:1003
+msgid "The following table shows all usage types."
+msgstr "下表显示了所有的用量类型。"
+
+# ae77cdba18f94b57a8941a2844af363d
+#: ../../usage.rst:1006
+msgid "Type ID"
+msgstr "类型ID"
+
+# b40f4bfeab6f4b7d82c8df177efc5494
+#: ../../usage.rst:1006
+msgid "Type Name"
+msgstr "类型名称"
+
+# 2e79133f6c254a3ea34f062b3b00adfe
+#: ../../usage.rst:1008
+msgid "1"
+msgstr "1"
+
+# 6fc25c417b3c4e73a34a2f6127a5526d
+#: ../../usage.rst:1008
+msgid "RUNNING\\_VM"
+msgstr "RUNNING\\_VM"
+
+# 553837efadde440abfa7687270684afa
+#: ../../usage.rst:1008
+msgid ""
+"Tracks the total running time of a VM per usage record period. If the VM is "
+"upgraded during the usage period, you will get a separate Usage Record for "
+"the new upgraded VM."
+msgstr "追踪VM每个用量记录时期所有运行时间总和。如果VM在用量时期升级,你将会获得新升级后的VM单独的用量记录。"
+
+# 6b2ede664c0940b99b0572bae4a790b9
+#: ../../usage.rst:1018
+msgid "2"
+msgstr "2"
+
+# 80b324130a704587aff102829b0c6426
+#: ../../usage.rst:1018
+msgid "ALLOCATED\\_VM"
+msgstr "ALLOCATED\\_VM"
+
+# 95f4ba653c114aaca66ccbf6ad5575a1
+#: ../../usage.rst:1018
+msgid ""
+"Tracks the total time the VM has been created to the time when it has been "
+"destroyed. This usage type is also useful in determining usage for specific "
+"templates such as Windows-based templates."
+msgstr "追踪VM从创建到销毁的所有时间总和。这个用量类型也是在终止例如 Windows-based模板这样的具体模板用量上是有用的。"
+
+# 70ee8dc453b44a559e3611d4905431eb
+#: ../../usage.rst:1030
+msgid "3"
+msgstr "3"
+
+# 384d4585b8d94f55a0c45b67e9a8c681
+#: ../../usage.rst:1030
+msgid "IP\\_ADDRESS"
+msgstr "IP\\_ADDRESS"
+
+# 3edd301131ca4260b92e5eae2d72a822
+#: ../../usage.rst:1030
+msgid "Tracks the public IP address owned by the account."
+msgstr "追踪拥有公共IP地址的账户"
+
+# 9bbb8b348a364049b6b15d3e160ab7c9
+#: ../../usage.rst:1034
+msgid "4"
+msgstr "4"
+
+# 62cac7d5101249369ba98a37698c3545
+#: ../../usage.rst:1034
+msgid "NETWORK\\_BYTES\\_SENT"
+msgstr "NETWORK\\_BYTES\\_SENT"
+
+# 58fa7365227e461ba6b9a1d6f922e939
+#: ../../usage.rst:1034
+msgid ""
+"Tracks the total number of bytes sent by all the VMs for an account. "
+"Cloud.com does not currently track network traffic per VM."
+msgstr "追踪一个账户发送所有VM的比特的总时间。Cloud.com不仅追踪当前网络传输时的每个VM。"
+
+# 0c96ae6238c149b28be7bb9f9ad262a6
+#: ../../usage.rst:1042
+msgid "5"
+msgstr "5"
+
+# 8a0cb74bfd7347ba92b20d2d362c4c21
+#: ../../usage.rst:1042
+msgid "NETWORK\\_BYTES\\_RECEIVED"
+msgstr "NETWORK\\_BYTES\\_RECEIVED"
+
+# b7299005f8554e048e5ccf902d01381f
+#: ../../usage.rst:1042
+msgid ""
+"Tracks the total number of bytes received by all the VMs for an account. "
+"Cloud.com does not currently track network traffic per VM."
+msgstr "追踪一个账户接受所有VM的比特的总时间。Cloud.com不仅追踪当前网络传输时的每个VM。"
+
+# 7bb40a3d83364d27abda2ddee3127c13
+#: ../../usage.rst:1051
+msgid "6"
+msgstr "6"
+
+# eb746069f1d94e08922bb968616c8aa6
+#: ../../usage.rst:1051
+msgid "VOLUME"
+msgstr "VOLUME"
+
+# e9368a4fb8534f63ba8424870d3075f3
+#: ../../usage.rst:1051
+msgid ""
+"Tracks the total time a disk volume has been created to the time when it has"
+" been destroyed."
+msgstr "追踪磁盘从创建到销毁的总时间。"
+
+# 24d7abf2ee5a4c609bad7caab9af4a62
+#: ../../usage.rst:1057
+msgid "7"
+msgstr "7"
+
+# a9213fe9713049ae96283bcf490d4308
+#: ../../usage.rst:1057
+msgid "TEMPLATE"
+msgstr "TEMPLATE"
+
+# 8c5b8c19ee504e05bb60ec1609708714
+#: ../../usage.rst:1057
+msgid ""
+"Tracks the total time a template (either created from a snapshot or uploaded"
+" to the cloud) has been created to the time it has been destroyed. The size "
+"of the template is also returned."
+msgstr "追踪模板(包含从快照中创建的或是已经上传到云的)从创建到销毁的总时间。模板的大小也被返回。"
+
+# c2abf324066b4e4cab56b7216871a359
+#: ../../usage.rst:1068
+msgid "8"
+msgstr "8"
+
+# 2a3df63ab62844d0a3726eb47b69e9d4
+#: ../../usage.rst:1068
+msgid "ISO"
+msgstr "ISO"
+
+# 9ae612e4f42b4ea5b61a1e0019f6cb83
+#: ../../usage.rst:1068
+msgid ""
+"Tracks the total time an ISO has been uploaded to the time it has been "
+"removed from the cloud. The size of the ISO is also returned."
+msgstr "追踪ISO在云中从上传到移除的总时间。ISO的大小也被返回。"
+
+# 5004f945801c4d21b59b522676de23c3
+#: ../../usage.rst:1076
+msgid "9"
+msgstr "9"
+
+# 7cbcaf5ded5f4812b51f49dce1c44b64
+#: ../../usage.rst:1076
+msgid "SNAPSHOT"
+msgstr "SNAPSHOT"
+
+# aa3ea6e95b98436f9ccc3d0dd076e294
+#: ../../usage.rst:1076
+msgid ""
+"Tracks the total time from when a snapshot has been created to the time it "
+"have been destroyed."
+msgstr "追踪快照从创建到销毁的总时间。"
+
+# b64bb9ece22e4adebc65e6a42b82e2cc
+#: ../../usage.rst:1082
+msgid "11"
+msgstr "11"
+
+# f4c8701f91d54e6a9481feae36f73a77
+#: ../../usage.rst:1082
+msgid "LOAD\\_BALANCER\\_POLICY"
+msgstr "LOAD\\_BALANCER\\_POLICY"
+
+# 5c8b784f8c9947fb87a3d39c29ef5947
+#: ../../usage.rst:1082
+msgid ""
+"Tracks the total time a load balancer policy has been created to the time it"
+" has been removed. Cloud.com does not track whether a VM has been assigned "
+"to a policy."
+msgstr "追踪负载均衡策略从创建到移除的总时间。Cloud.com不追踪VM是否已经分配到了的策略。"
+
+# 492651ba27f04885a8b3a8e8b4faa817
+#: ../../usage.rst:1092
+msgid "12"
+msgstr "12"
+
+# 55510ef40e1344ada16cdea064718be6
+#: ../../usage.rst:1092
+msgid "PORT\\_FORWARDING\\_RULE"
+msgstr "PORT\\_FORWARDING\\_RULE"
+
+# 0ec6b93728df42439989a39dfd6ee1ba
+#: ../../usage.rst:1092
+msgid ""
+"Tracks the time from when a port forwarding rule was created until the time "
+"it was removed."
+msgstr "追踪端口导向规则从创建到移除的时间。"
+
+# 695922a0cadf4a5ea3e7c57d0667b4f3
+#: ../../usage.rst:1098
+msgid "13"
+msgstr "13"
+
+# 7a50f4ca25a542b89e077cc7ab8af9fe
+#: ../../usage.rst:1098
+msgid "NETWORK\\_OFFERING"
+msgstr "NETWORK\\_OFFERING"
+
+# 286a423ed17c4338b633f9bb54d9e1e5
+#: ../../usage.rst:1098
+msgid ""
+"The time from when a network offering was assigned to a VM until it is "
+"removed."
+msgstr "从网络方案分配到VM到移除的时间。"
+
+# a60708e3e8594601a4b1b2105134c5aa
+#: ../../usage.rst:1103
+msgid "14"
+msgstr "14"
+
+# 15ae51ac66614bc287c41414f7c09109
+#: ../../usage.rst:1103
+msgid "VPN\\_USERS"
+msgstr "VPN\\_USERS"
+
+# a7fa63344c7a4ca4bce4e5f2fc4db7c2
+#: ../../usage.rst:1103
+msgid "The time from when a VPN user is created until it is removed."
+msgstr "计时从VPN用户创建时开始,移除时结束。"
+
+# 086989197eba4ea0b04de3d594e67f9a
+#: ../../usage.rst:1110
+msgid "Example response from listUsageRecords"
+msgstr "listUsageRecords指令的反应示例:"
+
+# 6186119d4c2442f3b774acb989e55d89
+#: ../../usage.rst:1112
+msgid ""
+"All CloudStack API requests are submitted in the form of a HTTP GET/POST "
+"with an associated command and any parameters. A request is composed of the "
+"following whether in HTTP or HTTPS:"
+msgstr "所有CloudStack API请求都是以HTTP GET/POST形式提交, 同时附上相关的命令和参数. 无论是HTTP或HTTPS, 一个请求都有以下内容组成:"
+
+# fa32f5bc7d9043b69396e40e9c707274
+#: ../../usage.rst:1143
+msgid "Dates in the Usage Record"
+msgstr "在使用记录中的数据"
+
+# d6aaa516cd40419c9be627b88a616e2c
+#: ../../usage.rst:1145
+msgid ""
+"Usage records include a start date and an end date. These dates define the "
+"period of time for which the raw usage number was calculated. If daily "
+"aggregation is used, the start date is midnight on the day in question and "
+"the end date is 23:59:59 on the day in question (with one exception; see "
+"below). A virtual machine could have been deployed at noon on that day, "
+"stopped at 6pm on that day, then started up again at 11pm. When usage is "
+"calculated on that day, there will be 7 hours of running VM usage (usage "
+"type 1) and 12 hours of allocated VM usage (usage type 2). If the same "
+"virtual machine runs for the entire next day, there will 24 hours of both "
+"running VM usage (type 1) and allocated VM usage (type 2)."
+msgstr "用量记录包含了开始日期和结束日期。这些日期定义了原始用量数字的统计时间阶段。如果每天统计被使用,开始日期是问题出现的的当天午夜,结束日期是问题(关于异常,参见本内容)出现的当天23:59:59。虚拟机可以被部署到当天正午,在次日6pm,然后在11pm重启。在用量统计的当天,将有7小时运行VM用量(用量类型1)和12个小时分配VM用量(用量类型2)。如果同一个VM完全运行到下一天,将会有24小时的运行VM用量(类型1)和已分配用量(类型2)。"
+
+# e3fe8feb8604460f9930592cef0bc680
+#: ../../usage.rst:1157
+msgid ""
+"Note: The start date is not the time a virtual machine was started, and the "
+"end date is not the time when a virtual machine was stopped. The start and "
+"end dates give the time range within which usage was calculated."
+msgstr "注意:开始日期不是虚拟机启动时间,结束日期不是虚拟机停止时间。开始日期和结束日期在用量统计的给定范围内。"
+
+# 50f292d2f9ac4b3f880517d684fe569e
+#: ../../usage.rst:1162
+msgid ""
+"For network usage, the start date and end date again define the range in "
+"which the number of bytes transferred was calculated. If a user downloads 10"
+" MB and uploads 1 MB in one day, there will be two records, one showing the "
+"10 megabytes received and one showing the 1 megabyte sent."
+msgstr "对于网络用量,开始日期和结束日期定义为一定数量的比特传输统计的时间范围。如果用户一天内下载10MB并上传1M,将会有两个记录,一个显示10MB接受和一个显示1MB发送。"
+
+# 629cfc1088724d7ea55ee7b728cb3b32
+#: ../../usage.rst:1168
+msgid ""
+"There is one case where the start date and end date do not correspond to "
+"midnight and 11:59:59pm when daily aggregation is used. This occurs only for"
+" network usage records. When the usage server has more than one day's worth "
+"of unprocessed data, the old data will be included in the aggregation "
+"period. The start date in the usage record will show the date and time of "
+"the earliest event. For other types of usage, such as IP addresses and VMs, "
+"the old unprocessed data is not included in daily aggregation."
+msgstr "当每日统计使用时,只有一种情况开始日期和结束日期不响应午夜到11:59:59。它仅发生在网络用量记录。当用量记录服务器有超过一天的未处理数据时,旧数据将被包含在统计区间内。用量记录中的开始日期将显示最早的事件的日期和时间。对于其它类型的用量,例如IP地址和VM,旧的未处理数据是不包含在每日统计中的。"


[11/40] Fixed formatting by Will stevens

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/projects.rst
----------------------------------------------------------------------
diff --git a/source/projects.rst b/source/projects.rst
index 7d8d766..8cdefee 100644
--- a/source/projects.rst
+++ b/source/projects.rst
@@ -68,6 +68,7 @@ project can use any service offering or disk offering available in its
 domain; however, you can not create private service and disk offerings
 at the project level..
 
+
 Configuring Projects
 --------------------
 
@@ -76,6 +77,7 @@ administrator must set up various systems to support them, including
 membership invitations, limits on project resources, and controls on who
 can create projects.
 
+
 Setting Up Invitations
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -86,22 +88,14 @@ by email or through the user’s CloudStack account. If you want
 administrators to use invitations to add members to projects, turn on
 and set up the invitations feature in CloudStack.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
-
-   In the left navigation, click Global Settings.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Global Settings.
 
-   In the search box, type project and click the search button.
+#. In the search box, type project and click the search button.
    |Searches projects|
 
-#. 
-
-   In the search results, you can see a few other parameters you need to
+#. In the search results, you can see a few other parameters you need to
    set to control how invitations behave. The table below shows global
    configuration parameters related to project invitations. Click the
    edit button to set each parameter.
@@ -126,13 +120,11 @@ and set up the invitations feature in CloudStack.
    | project.smtp.username      | (Optional) User name required by the SMTP server for authentication. You must also set project.smtp.password and set project.smtp.useAuth to true..   |
    +----------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------+
 
-#. 
-
-   Restart the Management Server:
+#. Restart the Management Server:
 
    .. code:: bash
 
-       service cloudstack-management restart
+      service cloudstack-management restart
 
 Setting Resource Limits for Projects
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -163,53 +155,32 @@ new maximum, the resources are not affected; however, the project can
 not add any new resources of that type until the total drops below the
 new limit.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
+#. Log in as administrator to the CloudStack UI.
 
-   In the left navigation, click Projects.
+#. In the left navigation, click Projects.
 
-#. 
+#. In Select View, choose Projects.
 
-   In Select View, choose Projects.
+#. Click the name of the project you want to work with.
 
-#. 
-
-   Click the name of the project you want to work with.
-
-#. 
-
-   Click the Resources tab. This tab lists the current maximum amount
+#. Click the Resources tab. This tab lists the current maximum amount
    that the project is allowed to own for each type of resource.
 
-#. 
+#. Type new values for one or more resources.
 
-   Type new values for one or more resources.
+#. Click Apply.
 
-#. 
-
-   Click Apply.
 
 Setting the Global Project Resource Limits
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Global Settings.
 
-   In the left navigation, click Global Settings.
+#. In the search box, type max.projects and click the search button.
 
-#. 
-
-   In the search box, type max.projects and click the search button.
-
-#. 
-
-   In the search results, you will see the parameters you can use to set
+#. In the search results, you will see the parameters you can use to set
    per-project maximum resource amounts that apply to all projects in
    the cloud. No project can have more resources, but an individual
    project can have lower limits. Click the edit button to set each
@@ -228,13 +199,11 @@ Setting the Global Project Resource Limits
    +--------------------------+------------------------------------------------------------------------------------------------------------------------------+
 
 
-#. 
-
-   Restart the Management Server.
+#. Restart the Management Server.
 
    .. code:: bash
 
-       # service cloudstack-management restart
+      # service cloudstack-management restart
 
 Setting Project Creator Permissions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -242,21 +211,13 @@ Setting Project Creator Permissions
 You can configure CloudStack to allow any user to create a new project,
 or you can restrict that ability to just CloudStack administrators.
 
-#. 
+#. Log in as administrator to the CloudStack UI.
 
-   Log in as administrator to the CloudStack UI.
+#. In the left navigation, click Global Settings.
 
-#. 
+#. In the search box, type allow.user.create.projects.
 
-   In the left navigation, click Global Settings.
-
-#. 
-
-   In the search box, type allow.user.create.projects.
-
-#. 
-
-   Click the edit button to set the parameter. |Edits parameters|
+#. Click the edit button to set the parameter. |Edits parameters|
 
    ``allow.user.create.projects``
 
@@ -264,13 +225,12 @@ or you can restrict that ability to just CloudStack administrators.
    you want only the CloudStack root administrator and domain
    administrators to create projects.
 
-#. 
-
-   Restart the Management Server.
+#. Restart the Management Server.
 
    .. code:: bash
 
-       # service cloudstack-management restart
+      # service cloudstack-management restart
+
 
 Creating a New Project
 ----------------------
@@ -279,35 +239,22 @@ CloudStack administrators and domain administrators can create projects.
 If the global configuration parameter allow.user.create.projects is set
 to true, end users can also create projects.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
-
-   In the left navigation, click Projects.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Projects.
 
-   In Select view, click Projects.
+#. In Select view, click Projects.
 
-#. 
+#. Click New Project.
 
-   Click New Project.
-
-#. 
-
-   Give the project a name and description for display to users, then
+#. Give the project a name and description for display to users, then
    click Create Project.
 
-#. 
-
-   A screen appears where you can immediately add more members to the
+#. A screen appears where you can immediately add more members to the
    project. This is optional. Click Next when you are ready to move on.
 
-#. 
+#. Click Save.
 
-   Click Save.
 
 Adding Members to a Project
 ---------------------------
@@ -317,16 +264,13 @@ the domain administrator of the domain where the project resides or any
 parent domain, or the CloudStack root administrator. There are two ways
 to add members in CloudStack, but only one way is enabled at a time:
 
--  
-
-   If invitations have been enabled, you can send invitations to new
+-  If invitations have been enabled, you can send invitations to new
    members.
 
--  
-
-   If invitations are not enabled, you can add members directly through
+-  If invitations are not enabled, you can add members directly through
    the UI.
 
+
 Sending Project Membership Invitations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -335,59 +279,40 @@ feature is enabled in the cloud as described in `“Setting
 Up Invitations” <#setting-up-invitations>`_. If the invitations feature is
 not turned on, use the procedure in Adding Project Members From the UI.
 
-#. 
-
-   Log in to the CloudStack UI.
-
-#. 
+#. Log in to the CloudStack UI.
 
-   In the left navigation, click Projects.
+#. In the left navigation, click Projects.
 
-#. 
+#. In Select View, choose Projects.
 
-   In Select View, choose Projects.
+#. Click the name of the project you want to work with.
 
-#. 
+#. Click the Invitations tab.
 
-   Click the name of the project you want to work with.
+#. In Add by, select one of the following:
 
-#. 
-
-   Click the Invitations tab.
-
-#. 
-
-   In Add by, select one of the following:
-
-   #. 
-
-      Account – The invitation will appear in the user’s Invitations tab
+   #. Account – The invitation will appear in the user’s Invitations tab
       in the Project View. See Using the Project View.
 
-   #. 
-
-      Email – The invitation will be sent to the user’s email address.
+   #. Email – The invitation will be sent to the user’s email address.
       Each emailed invitation includes a unique code called a token
       which the recipient will provide back to CloudStack when accepting
       the invitation. Email invitations will work only if the global
       parameters related to the SMTP server have been set. See
       `“Setting Up Invitations” <#setting-up-invitations>`_.
 
-#. 
-
-   Type the user name or email address of the new member you want to
+#. Type the user name or email address of the new member you want to
    add, and click Invite. Type the CloudStack user name if you chose
    Account in the previous step. If you chose Email, type the email
    address. You can invite only people who have an account in this cloud
    within the same domain as the project. However, you can send the
    invitation to any email address.
 
-#. 
-
-   To view and manage the invitations you have sent, return to this tab.
+#. To view and manage the invitations you have sent, return to this tab.
    When an invitation is accepted, the new member will appear in the
    project’s Accounts tab.
 
+
 Adding Project Members From the UI
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -398,63 +323,43 @@ Invitations” <#setting-up-invitations>`_, use the procedure in
 `“Sending Project Membership
 Invitations” <#sending-project-membership-invitations>`_.
 
-#. 
+#. Log in to the CloudStack UI.
 
-   Log in to the CloudStack UI.
+#. In the left navigation, click Projects.
 
-#. 
+#. In Select View, choose Projects.
 
-   In the left navigation, click Projects.
+#. Click the name of the project you want to work with.
 
-#. 
-
-   In Select View, choose Projects.
-
-#. 
-
-   Click the name of the project you want to work with.
-
-#. 
-
-   Click the Accounts tab. The current members of the project are
+#. Click the Accounts tab. The current members of the project are
    listed.
 
-#. 
-
-   Type the account name of the new member you want to add, and click
+#. Type the account name of the new member you want to add, and click
    Add Account. You can add only people who have an account in this
    cloud and within the same domain as the project.
 
+
 Accepting a Membership Invitation
 ---------------------------------
 
 If you have received an invitation to join a CloudStack project, and you
 want to accept the invitation, follow these steps:
 
-#. 
-
-   Log in to the CloudStack UI.
+#. Log in to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Projects.
 
-   In the left navigation, click Projects.
+#. In Select View, choose Invitations.
 
-#. 
-
-   In Select View, choose Invitations.
-
-#. 
-
-   If you see the invitation listed onscreen, click the Accept button.
+#. If you see the invitation listed onscreen, click the Accept button.
 
    Invitations listed on screen were sent to you using your CloudStack
    account name.
 
-#. 
-
-   If you received an email invitation, click the Enter Token button,
+#. If you received an email invitation, click the Enter Token button,
    and provide the project ID and unique ID code (token) from the email.
 
+
 Suspending or Deleting a Project
 --------------------------------
 
@@ -470,30 +375,21 @@ A project can be suspended or deleted by the project administrator, the
 domain administrator of the domain the project belongs to or of its
 parent domain, or the CloudStack root administrator.
 
-#. 
-
-   Log in to the CloudStack UI.
-
-#. 
-
-   In the left navigation, click Projects.
-
-#. 
+#. Log in to the CloudStack UI.
 
-   In Select View, choose Projects.
+#. In the left navigation, click Projects.
 
-#. 
+#. In Select View, choose Projects.
 
-   Click the name of the project.
+#. Click the name of the project.
 
-#. 
-
-   Click one of the buttons:
+#. Click one of the buttons:
 
    To delete, use |Removes a project|
 
    To suspend, use |Suspends a project|
 
+
 Using the Project View
 ----------------------
 
@@ -503,37 +399,28 @@ shows only information related to one project. It is a useful way to
 filter out other information so you can concentrate on a project status
 and resources.
 
-#. 
-
-   Log in to the CloudStack UI.
-
-#. 
+#. Log in to the CloudStack UI.
 
-   Click Project View.
+#. Click Project View.
 
-#. 
-
-   The project dashboard appears, showing the project’s VMs, volumes,
+#. The project dashboard appears, showing the project’s VMs, volumes,
    users, events, network settings, and more. From the dashboard, you
    can:
 
-   -  
-
-      Click the Accounts tab to view and manage project members. If you
+   -  Click the Accounts tab to view and manage project members. If you
       are the project administrator, you can add new members, remove
       members, or change the role of a member from user to admin. Only
       one member at a time can have the admin role, so if you set
       another user’s role to admin, your role will change to regular
       user.
 
-   -  
-
-      (If invitations are enabled) Click the Invitations tab to view and
+   -  (If invitations are enabled) Click the Invitations tab to view and
       manage invitations that have been sent to new project members but
       not yet accepted. Pending invitations will remain in this list
       until the new member accepts, the invitation timeout is reached,
       or you cancel the invitation.
 
+
 .. |Edits Parameters| image:: _static/images/edit-icon.png
 .. |Searches projects| image:: _static/images/search-button.png
 .. |Removes a project| image:: _static/images/delete-button.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/reliability.rst
----------------------------------------------------------------------
diff --git a/source/reliability.rst b/source/reliability.rst
index 7293867..e134142 100644
--- a/source/reliability.rst
+++ b/source/reliability.rst
@@ -32,6 +32,7 @@ When the Management Server is down, no new VMs can be created, and the
 end user and admin UI, API, dynamic load distribution, and HA will cease
 to work.
 
+
 Management Server Load Balancing
 --------------------------------
 
@@ -59,6 +60,7 @@ VIP for Port 8250 and one of your management servers crashes, the UI is
 still available but the system VMs will not be able to contact the
 management server.
 
+
 HA-Enabled Virtual Machines
 ---------------------------
 
@@ -75,6 +77,7 @@ Host in the same cluster.
 HA features work with iSCSI or NFS primary storage. HA with local
 storage is not supported.
 
+
 HA for Hosts
 ------------
 
@@ -91,6 +94,7 @@ Host in the same cluster.
 HA features work with iSCSI or NFS primary storage. HA with local
 storage is not supported.
 
+
 Dedicated HA Hosts
 ~~~~~~~~~~~~~~~~~~
 
@@ -99,17 +103,13 @@ are restarting due to a host failure. Setting up a pool of such
 dedicated HA hosts as the recovery destination for all HA-enabled VMs is
 useful to:
 
--  
-
-   Make it easier to determine which VMs have been restarted as part of
+-  Make it easier to determine which VMs have been restarted as part of
    the CloudStack high-availability function. If a VM is running on a
    dedicated HA host, then it must be an HA-enabled VM whose original
    host failed. (With one exception: It is possible for an administrator
    to manually migrate any VM to a dedicated HA host.).
 
--  
-
-   Keep HA-enabled VMs from restarting on hosts which may be reserved
+-  Keep HA-enabled VMs from restarting on hosts which may be reserved
    for other purposes.
 
 The dedicated HA option is set through a special host tag when the host
@@ -120,7 +120,11 @@ Server. Enter the value in the Host Tags field when adding the host(s)
 that you want to dedicate to HA-enabled VMs.
 
 .. note:: 
-   If you set ha.tag, be sure to actually use that tag on at least one host in your cloud. If the tag specified in ha.tag is not set for any host in the cloud, the HA-enabled VMs will fail to restart after a crash.
+   If you set ha.tag, be sure to actually use that tag on at least one 
+   host in your cloud. If the tag specified in ha.tag is not set for 
+   any host in the cloud, the HA-enabled VMs will fail to restart after 
+   a crash.
+
 
 Primary Storage Outage and Data Loss
 ------------------------------------
@@ -135,6 +139,7 @@ connectivity is restored.Primary storage is not designed to be backed
 up. Individual volumes in primary storage can be backed up using
 snapshots.
 
+
 Secondary Storage Outage and Data Loss
 --------------------------------------
 
@@ -150,6 +155,7 @@ including templates, snapshots, and ISO images. Secondary storage should
 be backed up periodically. Multiple secondary storage servers can be
 provisioned within each zone to increase the scalability of the system.
 
+
 Database High Availability
 --------------------------
 
@@ -159,6 +165,7 @@ covers both the main CloudStack database and the Usage database.
 Replication is achieved using the MySQL connector parameters and two-way
 replication. Tested with MySQL 5.1 and 5.5.
 
+
 How to Set Up Database Replication
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -176,13 +183,10 @@ the additional nodes.
 
 References:
 
--  
-
-   `http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html <http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html>`_
+-  `http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html <http://dev.mysql.com/doc/refman/5.0/en/replication-howto.html>`_
 
--  
+-  `https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server <https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server>`_
 
-   `https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server <https://wikis.oracle.com/display/CommSuite/MySQL+High+Availability+and+Replication+Information+For+Calendar+Server>`_
 
 Configuring Database High Availability
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -195,25 +199,19 @@ configuration settings in the file
 
 Be sure you have set the following in db.properties:
 
--  
-
-   ``db.ha.enabled``: set to true if you want to use the replication
+-  ``db.ha.enabled``: set to true if you want to use the replication
    feature.
 
    Example: ``db.ha.enabled=true``
 
--  
-
-   ``db.cloud.slaves``: set to a comma-delimited set of slave hosts for the
+-  ``db.cloud.slaves``: set to a comma-delimited set of slave hosts for the
    cloud database. This is the list of nodes set up with replication.
    The master node is not in the list, since it is already mentioned
    elsewhere in the properties file.
 
    Example: ``db.cloud.slaves=node2,node3,node4``
 
--  
-
-   ``db.usage.slaves``: set to a comma-delimited set of slave hosts for the
+-  ``db.usage.slaves``: set to a comma-delimited set of slave hosts for the
    usage database. This is the list of nodes set up with replication.
    The master node is not in the list, since it is already mentioned
    elsewhere in the properties file.
@@ -226,49 +224,38 @@ The following settings must be present in db.properties, but you are not
 required to change the default values unless you wish to do so for
 tuning purposes:
 
--  
-
-   ``db.cloud.secondsBeforeRetryMaster``: The number of seconds the MySQL
+-  ``db.cloud.secondsBeforeRetryMaster``: The number of seconds the MySQL
    connector should wait before trying again to connect to the master
    after the master went down. Default is 1 hour. The retry might happen
    sooner if db.cloud.queriesBeforeRetryMaster is reached first.
 
    Example: ``db.cloud.secondsBeforeRetryMaster=3600``
 
--  
-
-   ``db.cloud.queriesBeforeRetryMaster``: The minimum number of queries to
+-  ``db.cloud.queriesBeforeRetryMaster``: The minimum number of queries to
    be sent to the database before trying again to connect to the master
    after the master went down. Default is 5000. The retry might happen
    sooner if db.cloud.secondsBeforeRetryMaster is reached first.
 
    Example: ``db.cloud.queriesBeforeRetryMaster=5000``
 
--  
-
-   ``db.cloud.initialTimeout``: Initial time the MySQL connector should wait
+-  ``db.cloud.initialTimeout``: Initial time the MySQL connector should wait
    before trying again to connect to the master. Default is 3600.
 
    Example: ``db.cloud.initialTimeout=3600``
 
+
 Limitations on Database High Availability
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following limitations exist in the current implementation of this
 feature.
 
--  
-
-   Slave hosts can not be monitored through CloudStack. You will need to
+-  Slave hosts can not be monitored through CloudStack. You will need to
    have a separate means of monitoring.
 
--  
-
-   Events from the database side are not integrated with the CloudStack
+-  Events from the database side are not integrated with the CloudStack
    Management Server events system.
 
--  
-
-   You must periodically perform manual clean-up of bin log files
+-  You must periodically perform manual clean-up of bin log files
    generated by replication on database nodes. If you do not clean up
    the log files, the disk can become full.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/service_offerings.rst
----------------------------------------------------------------------
diff --git a/source/service_offerings.rst b/source/service_offerings.rst
index e053f6a..34316d1 100644
--- a/source/service_offerings.rst
+++ b/source/service_offerings.rst
@@ -29,6 +29,7 @@ cloud – say, if the users are strictly internal to your organization, or
 just friends who are sharing your cloud – you can still keep track of
 what services they use and how much of them.
 
+
 Service Offerings, Disk Offerings, Network Offerings, and Templates
 -------------------------------------------------------------------
 
@@ -114,6 +115,7 @@ The disk offering specifies:
 
 -  Tags on the data disk
 
+
 Custom Compute Offering
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -150,45 +152,27 @@ Creating a New Compute Offering
 
 To create a new compute offering:
 
-#. 
-
-   Log in with admin privileges to the CloudStack UI.
-
-#. 
-
-   In the left navigation bar, click Service Offerings.
+#. Log in with admin privileges to the CloudStack UI.
 
-#. 
+#. In the left navigation bar, click Service Offerings.
 
-   In Select Offering, choose Compute Offering.
+#. In Select Offering, choose Compute Offering.
 
-#. 
+#. Click Add Compute Offering.
 
-   Click Add Compute Offering.
+#. In the dialog, make the following choices:
 
-#. 
+   -  **Name**: Any desired name for the service offering.
 
-   In the dialog, make the following choices:
-
-   -  
-
-      **Name**: Any desired name for the service offering.
-
-   -  
-
-      **Description**: A short description of the offering that can be
+   -  **Description**: A short description of the offering that can be
       displayed to users
 
-   -  
-
-      **Storage type**: The type of disk that should be allocated. Local
+   -  **Storage type**: The type of disk that should be allocated. Local
       allocates from storage attached directly to the host where the
       system VM is running. Shared allocates from storage accessible via
       NFS.
 
-   -  
-
-      **Custom**: Custom compute offerings can be used in following
+   -  **Custom**: Custom compute offerings can be used in following
       cases: deploying a VM, changing the compute offering of a stopped
       VM and running VMs, which is nothing but scaling up.
 
@@ -197,84 +181,54 @@ To create a new compute offering:
       using a custom compute offering. When you check this box, those
       three input fields are hidden in the dialog box.
 
-   -  
-
-      **# of CPU cores**: The number of cores which should be allocated
+   -  **# of CPU cores**: The number of cores which should be allocated
       to a system VM with this offering. If Custom is checked, this
       field does not appear.
 
-   -  
-
-      **CPU (in MHz)**: The CPU speed of the cores that the system VM is
+   -  **CPU (in MHz)**: The CPU speed of the cores that the system VM is
       allocated. For example, “2000” would provide for a 2 GHz clock. If
       Custom is checked, this field does not appear.
 
-   -  
-
-      **Memory (in MB)**: The amount of memory in megabytes that the
+   -  **Memory (in MB)**: The amount of memory in megabytes that the
       system VM should be allocated. For example, “2048” would provide
       for a 2 GB RAM allocation. If Custom is checked, this field does
       not appear.
 
-   -  
-
-      **Network Rate**: Allowed data transfer rate in MB per second.
+   -  **Network Rate**: Allowed data transfer rate in MB per second.
 
-   -  
+   -  **Disk Read Rate**: Allowed disk read rate in bits per second.
 
-      **Disk Read Rate**: Allowed disk read rate in bits per second.
+   -  **Disk Write Rate**: Allowed disk write rate in bits per second.
 
-   -  
-
-      **Disk Write Rate**: Allowed disk write rate in bits per second.
-
-   -  
-
-      **Disk Read Rate**: Allowed disk read rate in IOPS (input/output
+   -  **Disk Read Rate**: Allowed disk read rate in IOPS (input/output
       operations per second).
 
-   -  
-
-      **Disk Write Rate**: Allowed disk write rate in IOPS (input/output
+   -  **Disk Write Rate**: Allowed disk write rate in IOPS (input/output
       operations per second).
 
-   -  
-
-      **Offer HA**: If yes, the administrator can choose to have the
+   -  **Offer HA**: If yes, the administrator can choose to have the
       system VM be monitored and as highly available as possible.
 
-   -  
-
-      **Storage Tags**: The tags that should be associated with the
+   -  **Storage Tags**: The tags that should be associated with the
       primary storage used by the system VM.
 
-   -  
-
-      **Host Tags**: (Optional) Any tags that you use to organize your
+   -  **Host Tags**: (Optional) Any tags that you use to organize your
       hosts
 
-   -  
-
-      **CPU cap**: Whether to limit the level of CPU usage even if spare
+   -  **CPU cap**: Whether to limit the level of CPU usage even if spare
       capacity is available.
 
-   -  
-
-      **Public**: Indicate whether the service offering should be
+   -  **Public**: Indicate whether the service offering should be
       available all domains or only some domains. Choose Yes to make it
       available to all domains. Choose No to limit the scope to a
       subdomain; CloudStack will then prompt for the subdomain's name.
 
-   -  
-
-      **isVolatile**: If checked, VMs created from this service offering
+   -  **isVolatile**: If checked, VMs created from this service offering
       will have their root disks reset upon reboot. This is useful for
       secure environments that need a fresh start on every boot and for
       desktops that should not retain state.
 
-   -  
-
-      **Deployment Planner**: Choose the technique that you would like
+   -  **Deployment Planner**: Choose the technique that you would like
       CloudStack to use when deploying VMs based on this service
       offering.
 
@@ -290,15 +244,13 @@ To create a new compute offering:
       Implicit Dedication will deploy VMs on private infrastructure that
       is dedicated to a specific domain or account. If you choose this
       planner, then you must also pick a value for Planner Mode. See
-      `“Dedicating Resources to Accounts and
-      Domains” <accounts.html#dedicating-resources-to-accounts-and-domains>`_.
+      `“Dedicating Resources to Accounts and Domains” 
+      <accounts.html#dedicating-resources-to-accounts-and-domains>`_.
 
       Bare Metal is used with bare metal hosts. See Bare Metal
       Installation in the Installation Guide.
 
-   -  
-
-      **Planner Mode**: Used when ImplicitDedicationPlanner is selected
+   -  **Planner Mode**: Used when ImplicitDedicationPlanner is selected
       in the previous field. The planner mode determines how VMs will be
       deployed on private infrastructure that is dedicated to a single
       domain or account.
@@ -313,87 +265,58 @@ To create a new compute offering:
       possible. Otherwise, the VM can be deployed in shared
       infrastructure.
 
-#. 
+#. Click Add.
 
-   Click Add.
 
 Creating a New Disk Offering
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To create a new disk offering:
 
-#. 
-
-   Log in with admin privileges to the CloudStack UI.
-
-#. 
+#. Log in with admin privileges to the CloudStack UI.
 
-   In the left navigation bar, click Service Offerings.
+#. In the left navigation bar, click Service Offerings.
 
-#. 
+#. In Select Offering, choose Disk Offering.
 
-   In Select Offering, choose Disk Offering.
+#. Click Add Disk Offering.
 
-#. 
+#. In the dialog, make the following choices:
 
-   Click Add Disk Offering.
+   -  Name. Any desired name for the disk offering.
 
-#. 
-
-   In the dialog, make the following choices:
-
-   -  
-
-      Name. Any desired name for the disk offering.
-
-   -  
-
-      Description. A short description of the offering that can be
+   -  Description. A short description of the offering that can be
       displayed to users
 
-   -  
-
-      Custom Disk Size. If checked, the user can set their own disk
+   -  Custom Disk Size. If checked, the user can set their own disk
       size. If not checked, the root administrator must define a value
       in Disk Size.
 
-   -  
-
-      Disk Size. Appears only if Custom Disk Size is not selected.
+   -  Disk Size. Appears only if Custom Disk Size is not selected.
       Define the volume size in GB.
 
-   -  
-
-      QoS Type. Three options: Empty (no Quality of Service), hypervisor
+   -  QoS Type. Three options: Empty (no Quality of Service), hypervisor
       (rate limiting enforced on the hypervisor side), and storage
       (guaranteed minimum and maximum IOPS enforced on the storage
       side). If leveraging QoS, make sure that the hypervisor or storage
       system supports this feature.
 
-   -  
-
-      Custom IOPS. If checked, the user can set their own IOPS. If not
+   -  Custom IOPS. If checked, the user can set their own IOPS. If not
       checked, the root administrator can define values. If the root
       admin does not set values when using storage QoS, default values
       are used (the defauls can be overridden if the proper parameters
       are passed into CloudStack when creating the primary storage in
       question).
 
-   -  
-
-      Min IOPS. Appears only if storage QoS is to be used. Set a
+   -  Min IOPS. Appears only if storage QoS is to be used. Set a
       guaranteed minimum number of IOPS to be enforced on the storage
       side.
 
-   -  
-
-      Max IOPS. Appears only if storage QoS is to be used. Set a maximum
+   -  Max IOPS. Appears only if storage QoS is to be used. Set a maximum
       number of IOPS to be enforced on the storage side (the system may
       go above this limit in certain circumstances for short intervals).
 
-   -  
-
-      (Optional)Storage Tags. The tags that should be associated with
+   -  (Optional)Storage Tags. The tags that should be associated with
       the primary storage for this disk. Tags are a comma separated list
       of attributes of the storage. For example "ssd,blue". Tags are
       also added on Primary Storage. CloudStack matches tags on a disk
@@ -402,16 +325,13 @@ To create a new disk offering:
       Storage for the volume to be provisioned. If no such primary
       storage exists, allocation from the disk offering will fail..
 
-   -  
-
-      Public. Indicate whether the service offering should be available
+   -  Public. Indicate whether the service offering should be available
       all domains or only some domains. Choose Yes to make it available
       to all domains. Choose No to limit the scope to a subdomain;
       CloudStack will then prompt for the subdomain's name.
 
-#. 
+#. Click Add.
 
-   Click Add.
 
 Modifying or Deleting a Service Offering
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -426,6 +346,7 @@ referencing it have been deleted. After deletion by the administrator, a
 service offering will not be available to end users that are creating
 new instances.
 
+
 System Service Offerings
 ------------------------
 
@@ -445,101 +366,65 @@ of the virtual router by applying a new network offering that contains a
 different system service offering. All virtual routers in that network
 will begin using the settings from the new service offering.
 
+
 Creating a New System Service Offering
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To create a system service offering:
 
-#. 
-
-   Log in with admin privileges to the CloudStack UI.
-
-#. 
-
-   In the left navigation bar, click Service Offerings.
-
-#. 
+#. Log in with admin privileges to the CloudStack UI.
 
-   In Select Offering, choose System Offering.
+#. In the left navigation bar, click Service Offerings.
 
-#. 
+#. In Select Offering, choose System Offering.
 
-   Click Add System Service Offering.
+#. Click Add System Service Offering.
 
-#. 
+#. In the dialog, make the following choices:
 
-   In the dialog, make the following choices:
+   -  Name. Any desired name for the system offering.
 
-   -  
-
-      Name. Any desired name for the system offering.
-
-   -  
-
-      Description. A short description of the offering that can be
+   -  Description. A short description of the offering that can be
       displayed to users
 
-   -  
-
-      System VM Type. Select the type of system virtual machine that
+   -  System VM Type. Select the type of system virtual machine that
       this offering is intended to support.
 
-   -  
-
-      Storage type. The type of disk that should be allocated. Local
+   -  Storage type. The type of disk that should be allocated. Local
       allocates from storage attached directly to the host where the
       system VM is running. Shared allocates from storage accessible via
       NFS.
 
-   -  
-
-      # of CPU cores. The number of cores which should be allocated to a
+   -  # of CPU cores. The number of cores which should be allocated to a
       system VM with this offering
 
-   -  
-
-      CPU (in MHz). The CPU speed of the cores that the system VM is
+   -  CPU (in MHz). The CPU speed of the cores that the system VM is
       allocated. For example, "2000" would provide for a 2 GHz clock.
 
-   -  
-
-      Memory (in MB). The amount of memory in megabytes that the system
+   -  Memory (in MB). The amount of memory in megabytes that the system
       VM should be allocated. For example, "2048" would provide for a 2
       GB RAM allocation.
 
-   -  
-
-      Network Rate. Allowed data transfer rate in MB per second.
+   -  Network Rate. Allowed data transfer rate in MB per second.
 
-   -  
-
-      Offer HA. If yes, the administrator can choose to have the system
+   -  Offer HA. If yes, the administrator can choose to have the system
       VM be monitored and as highly available as possible.
 
-   -  
-
-      Storage Tags. The tags that should be associated with the primary
+   -  Storage Tags. The tags that should be associated with the primary
       storage used by the system VM.
 
-   -  
-
-      Host Tags. (Optional) Any tags that you use to organize your hosts
+   -  Host Tags. (Optional) Any tags that you use to organize your hosts
 
-   -  
-
-      CPU cap. Whether to limit the level of CPU usage even if spare
+   -  CPU cap. Whether to limit the level of CPU usage even if spare
       capacity is available.
 
-   -  
-
-      Public. Indicate whether the service offering should be available
+   -  Public. Indicate whether the service offering should be available
       all domains or only some domains. Choose Yes to make it available
       to all domains. Choose No to limit the scope to a subdomain;
       CloudStack will then prompt for the subdomain's name.
 
-#. 
+#. Click Add.
 
-   Click Add.
 
 Network Throttling
 ------------------
@@ -557,17 +442,11 @@ a certain limit for some accounts, or to control network congestion in a
 large cloud environment. The network rate for your cloud can be
 configured on the following:
 
--  
+-  Network Offering
 
-   Network Offering
+-  Service Offering
 
--  
-
-   Service Offering
-
--  
-
-   Global parameter
+-  Global parameter
 
 If network rate is set to NULL in service offering, the value provided
 in the vm.network.throttling.rate global parameter is applied. If the
@@ -600,7 +479,6 @@ Default network of a guest VM                   Compute Offering
 Additional networks of a guest VM               Corresponding Network Offerings
 =============================================== ===============================
 
-
 A guest VM must have a default network, and can also have many
 additional networks. Depending on various parameters, such as the host
 and virtual switch used, you can observe a difference in the network
@@ -645,6 +523,7 @@ while egress traffic will be limited to 200 Mbps. In an isolated
 network, ingress traffic will be limited to 10 Mbps and egress to 200
 Mbps.
 
+
 Changing the Default System Offering for System VMs
 ---------------------------------------------------
 
@@ -652,57 +531,43 @@ You can manually change the system offering for a particular System VM.
 Additionally, as a CloudStack administrator, you can also change the
 default system offering used for System VMs.
 
-#. 
-
-   Create a new system offering.
+#. Create a new system offering.
 
    For more information, see Creating a New System Service Offering.
 
-#. 
-
-   Back up the database:
+#. Back up the database:
 
    .. code:: bash
 
-       mysqldump -u root -p cloud | bzip2 > cloud_backup.sql.bz2
-
-#. 
+      mysqldump -u root -p cloud | bzip2 > cloud_backup.sql.bz2
 
-   Open an MySQL prompt:
+#. Open an MySQL prompt:
 
    .. code:: bash
 
-       mysql -u cloud -p cloud
-
-#. 
-
-   Run the following queries on the cloud database.
+      mysql -u cloud -p cloud
 
-   #. 
+#. Run the following queries on the cloud database.
 
-      In the disk\_offering table, identify the original default
+   #. In the disk\_offering table, identify the original default
       offering and the new offering you want to use by default.
 
       Take a note of the ID of the new offering.
 
       .. code:: bash
 
-          select id,name,unique_name,type from disk_offering;
+         select id,name,unique_name,type from disk_offering;
 
-   #. 
-
-      For the original default offering, set the value of unique\_name
+   #. For the original default offering, set the value of unique\_name
       to NULL.
 
       .. code:: bash
 
-          # update disk_offering set unique_name = NULL where id = 10;
+         # update disk_offering set unique_name = NULL where id = 10;
 
       Ensure that you use the correct value for the ID.
 
-   #. 
-
-      For the new offering that you want to use by default, set the
+   #. For the new offering that you want to use by default, set the
       value of unique\_name as follows:
 
       For the default Console Proxy VM (CPVM) offering,set unique\_name
@@ -712,19 +577,15 @@ default system offering used for System VMs.
 
       .. code:: bash
 
-          update disk_offering set unique_name = 'Cloud.com-ConsoleProxy' where id = 16;
+         update disk_offering set unique_name = 'Cloud.com-ConsoleProxy' where id = 16;
 
-#. 
-
-   Restart CloudStack Management Server. Restarting is required because
+#. Restart CloudStack Management Server. Restarting is required because
    the default offerings are loaded into the memory at startup.
 
    .. code:: bash
 
-       service cloudstack-management restart
-
-#. 
+      service cloudstack-management restart
 
-   Destroy the existing CPVM or SSVM offerings and wait for them to be
+#. Destroy the existing CPVM or SSVM offerings and wait for them to be
    recreated. The new CPVM or SSVM are configured with the new offering.
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/storage.rst
----------------------------------------------------------------------
diff --git a/source/storage.rst b/source/storage.rst
index e8193ae..30cbad2 100644
--- a/source/storage.rst
+++ b/source/storage.rst
@@ -28,6 +28,7 @@ always accessed using NFS.
 There is no ephemeral storage in CloudStack. All volumes on all nodes
 are persistent.
 
+
 Primary Storage
 ---------------
 
@@ -37,18 +38,15 @@ primary storage through the CloudStack UI, see the Installation Guide.
 
 `“About Primary Storage” <http://docs.cloudstack.apache.org/en/latest/concepts.html#about-primary-storage>`_
 
+
 Best Practices for Primary Storage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   The speed of primary storage will impact guest performance. If
+-  The speed of primary storage will impact guest performance. If
    possible, choose smaller, higher RPM drives or SSDs for primary
    storage.
 
--  
-
-   There are two ways CloudStack can leverage primary storage:
+-  There are two ways CloudStack can leverage primary storage:
 
    Static: This is CloudStack's traditional way of handling storage. In
    this model, a preallocated amount of storage (ex. a volume from a
@@ -67,6 +65,7 @@ Best Practices for Primary Storage
    Service. Currently this feature is supported for data disks (Disk
    Offerings).
 
+
 Runtime Behavior of Primary Storage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -91,6 +90,7 @@ on and space is taken from that storage (either from preallocated
 storage or from a storage system (ex. a SAN), depending on how the
 primary storage was added to CloudStack).
 
+
 Hypervisor Support for Primary Storage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -140,6 +140,7 @@ example, you could provision 2 NFS servers in primary storage. Or you
 could provision 1 iSCSI LUN initially and then add a second iSCSI LUN
 when the first approaches capacity.
 
+
 Storage Tags
 ~~~~~~~~~~~~
 
@@ -161,6 +162,7 @@ same set of tags on the primary storage for all clusters in a pod. Even
 if different devices are used to present those tags, the set of exposed
 tags can be the same.
 
+
 Maintenance Mode for Primary Storage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -175,6 +177,7 @@ The CloudStack will bring the device back online and attempt to start
 all guests that were running at the time of the entry into maintenance
 mode.
 
+
 Secondary Storage
 -----------------
 
@@ -185,6 +188,7 @@ Installation Guide.
 
 `“About Secondary Storage” <http://docs.cloudstack.apache.org/en/latest/concepts.html#about-secondary-storage>`_
 
+
 Working With Volumes
 --------------------
 
@@ -210,7 +214,10 @@ template creation. Volumes are hypervisor-specific: a volume from one
 hypervisor type may not be used on a guest of another hypervisor type.
 
 .. note:: 
-   CloudStack supports attaching up to 13 data disks to a VM on XenServer hypervisor versions 6.0 and above. For the VMs on other hypervisor types, the data disk limit is 6.
+   CloudStack supports attaching up to 13 data disks to a VM on 
+   XenServer hypervisor versions 6.0 and above. For the VMs on other 
+   hypervisor types, the data disk limit is 6.
+
 
 Creating a New Volume
 ~~~~~~~~~~~~~~~~~~~~~
@@ -223,6 +230,7 @@ are not allocated on the physical storage device until you attach the
 volume. This optimization allows the CloudStack to provision the volume
 nearest to the guest that will use it when the first attachment is made.
 
+
 Using Local Storage for Data Volumes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -248,46 +256,32 @@ different host, nor migrate the volume itself away to a different host.
 If you want to put a host into maintenance mode, you must first stop any
 VMs with local data volumes on that host.
 
+
 To Create a New Volume
 ^^^^^^^^^^^^^^^^^^^^^^
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
-
-#. 
+#. Log in to the CloudStack UI as a user or admin.
 
-   In the left navigation bar, click Storage.
+#. In the left navigation bar, click Storage.
 
-#. 
+#. In Select View, choose Volumes.
 
-   In Select View, choose Volumes.
-
-#. 
-
-   To create a new volume, click Add Volume, provide the following
+#. To create a new volume, click Add Volume, provide the following
    details, and click OK.
 
-   -  
-
-      Name. Give the volume a unique name so you can find it later.
+   -  Name. Give the volume a unique name so you can find it later.
 
-   -  
-
-      Availability Zone. Where do you want the storage to reside? This
+   -  Availability Zone. Where do you want the storage to reside? This
       should be close to the VM that will use the volume.
 
-   -  
-
-      Disk Offering. Choose the characteristics of the storage.
+   -  Disk Offering. Choose the characteristics of the storage.
 
    The new volume appears in the list of volumes with the state
    “Allocated.” The volume data is stored in CloudStack, but the volume
    is not yet ready for use
 
-#. 
+#. To start using the volume, continue to Attaching a Volume
 
-   To start using the volume, continue to Attaching a Volume
 
 Uploading an Existing Volume to a Virtual Machine
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -309,41 +303,25 @@ Setting Usage Limits
 
 To upload a volume:
 
-#. 
-
-   (Optional) Create an MD5 hash (checksum) of the disk image file that
+#. (Optional) Create an MD5 hash (checksum) of the disk image file that
    you are going to upload. After uploading the data disk, CloudStack
    will use this value to verify that no data corruption has occurred.
 
-#. 
-
-   Log in to the CloudStack UI as an administrator or user
-
-#. 
+#. Log in to the CloudStack UI as an administrator or user
 
-   In the left navigation bar, click Storage.
+#. In the left navigation bar, click Storage.
 
-#. 
+#. Click Upload Volume.
 
-   Click Upload Volume.
+#. Provide the following:
 
-#. 
-
-   Provide the following:
-
-   -  
-
-      Name and Description. Any desired name and a brief description
+   -  Name and Description. Any desired name and a brief description
       that can be shown in the UI.
 
-   -  
-
-      Availability Zone. Choose the zone where you want to store the
+   -  Availability Zone. Choose the zone where you want to store the
       volume. VMs running on hosts in this zone can attach the volume.
 
-   -  
-
-      Format. Choose one of the following to indicate the disk image
+   -  Format. Choose one of the following to indicate the disk image
       format of the volume.
 
       ==========  =================
@@ -354,25 +332,20 @@ To upload a volume:
       KVM         QCOW2
       ==========  =================
 
-   -  
-
-      URL. The secure HTTP or HTTPS URL that CloudStack can use to
+   -  URL. The secure HTTP or HTTPS URL that CloudStack can use to
       access your disk. The type of file at the URL must match the value
       chosen in Format. For example, if Format is VHD, the URL might
       look like the following:
 
       ``http://yourFileServerIP/userdata/myDataDisk.vhd``
 
-   -  
+   -  MD5 checksum. (Optional) Use the hash that you created in step 1.
 
-      MD5 checksum. (Optional) Use the hash that you created in step 1.
-
-#. 
-
-   Wait until the status of the volume shows that the upload is
+#. Wait until the status of the volume shows that the upload is
    complete. Click Instances - Volumes, find the name you specified in
    step 5, and make sure the status is Uploaded.
 
+
 Attaching a Volume
 ~~~~~~~~~~~~~~~~~~
 
@@ -381,40 +354,31 @@ Attach a volume when you first create a new volume, when you are moving
 an existing volume from one VM to another, or after you have migrated a
 volume from one storage pool to another.
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
-
-#. 
+#. Log in to the CloudStack UI as a user or admin.
 
-   In the left navigation, click Storage.
+#. In the left navigation, click Storage.
 
-#. 
+#. In Select View, choose Volumes.
 
-   In Select View, choose Volumes.
-
-#. 
-
-   Click the volume name in the Volumes list, then click the Attach Disk
+#. Click the volume name in the Volumes list, then click the Attach Disk
    button |AttachDiskButton.png|
 
-#. 
-
-   In the Instance popup, choose the VM to which you want to attach the
+#. In the Instance popup, choose the VM to which you want to attach the
    volume. You will only see instances to which you are allowed to
    attach volumes; for example, a user will see only instances created
    by that user, but the administrator will have more choices.
 
-#. 
-
-   When the volume has been attached, you should be able to see it by
+#. When the volume has been attached, you should be able to see it by
    clicking Instances, the instance name, and View Volumes.
 
+
 Detaching and Moving Volumes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. note:: 
-   This procedure is different from moving volumes from one storage pool to another as described in `“VM Storage Migration” <#vm-storage-migration>`_.
+   This procedure is different from moving volumes from one storage pool 
+   to another as described in `“VM Storage Migration” 
+   <#vm-storage-migration>`_.
 
 A volume can be detached from a guest VM and attached to another guest.
 Both CloudStack administrators and users can detach volumes from VMs and
@@ -423,34 +387,29 @@ move them to other VMs.
 If the two VMs are in different clusters, and the volume is large, it
 may take several minutes for the volume to be moved to the new VM.
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
+#. Log in to the CloudStack UI as a user or admin.
 
-#. 
-
-   In the left navigation bar, click Storage, and choose Volumes in
+#. In the left navigation bar, click Storage, and choose Volumes in
    Select View. Alternatively, if you know which VM the volume is
    attached to, you can click Instances, click the VM name, and click
    View Volumes.
 
-#. 
-
-   Click the name of the volume you want to detach, then click the
+#. Click the name of the volume you want to detach, then click the
    Detach Disk button. |DetachDiskButton.png|
 
-#. 
-
-   To move the volume to another VM, follow the steps in
+#. To move the volume to another VM, follow the steps in
    `“Attaching a Volume” <#attaching-a-volume>`_.
 
+
 VM Storage Migration
 ~~~~~~~~~~~~~~~~~~~~
 
 Supported in XenServer, KVM, and VMware.
 
 .. note:: 
-   This procedure is different from moving disk volumes from one VM to another as described in `“Detaching and Moving Volumes” <#detaching-and-moving-volumes>`_.
+   This procedure is different from moving disk volumes from one VM to 
+   another as described in `“Detaching and Moving Volumes” 
+   <#detaching-and-moving-volumes>`_.
 
 You can migrate a virtual machine’s root disk volume or any additional
 data disk volume from one storage pool to another in the same zone.
@@ -471,86 +430,69 @@ migrate a VM’s disks from one storage repository to another, all while
 the VM is running.
 
 .. note:: 
-   Because of a limitation in VMware, live migration of storage for a VM is allowed only if the source and target storage pool are accessible to the source host; that is, the host where the VM is running when the live migration operation is requested.
+   Because of a limitation in VMware, live migration of storage for a 
+   VM is allowed only if the source and target storage pool are 
+   accessible to the source host; that is, the host where the VM is 
+   running when the live migration operation is requested.
+
 
 Migrating a Data Volume to a New Storage Pool
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 There are two situations when you might want to migrate a disk:
 
--  
-
-   Move the disk to new storage, but leave it attached to the same
+-  Move the disk to new storage, but leave it attached to the same
    running VM.
 
--  
-
-   Detach the disk from its current VM, move it to new storage, and
+-  Detach the disk from its current VM, move it to new storage, and
    attach it to a new VM.
 
+
 Migrating Storage For a Running VM
 ''''''''''''''''''''''''''''''''''
 
 (Supported on XenServer and VMware)
 
-#. 
+#. Log in to the CloudStack UI as a user or admin.
 
-   Log in to the CloudStack UI as a user or admin.
-
-#. 
-
-   In the left navigation bar, click Instances, click the VM name, and
+#. In the left navigation bar, click Instances, click the VM name, and
    click View Volumes.
 
-#. 
-
-   Click the volume you want to migrate.
+#. Click the volume you want to migrate.
 
-#. 
-
-   Detach the disk from the VM. See `“Detaching and
+#. Detach the disk from the VM. See `“Detaching and
    Moving Volumes” <#detaching-and-moving-volumes>`_ but skip the “reattach”
    step at the end. You will do that after migrating to new storage.
 
-#. 
-
-   Click the Migrate Volume button |Migrateinstance.png| and choose the destination from the dropdown list.
-
-#. 
+#. Click the Migrate Volume button |Migrateinstance.png| and choose the 
+   destination from the dropdown list.
 
-   Watch for the volume status to change to Migrating, then back to
+#. Watch for the volume status to change to Migrating, then back to
    Ready.
 
+
 Migrating Storage and Attaching to a Different VM
 '''''''''''''''''''''''''''''''''''''''''''''''''
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
+#. Log in to the CloudStack UI as a user or admin.
 
-#. 
-
-   Detach the disk from the VM. See `“Detaching and
+#. Detach the disk from the VM. See `“Detaching and
    Moving Volumes” <#detaching-and-moving-volumes>`_ but skip the “reattach”
    step at the end. You will do that after migrating to new storage.
 
-#. 
-
-   Click the Migrate Volume button |Migrateinstance.png| and choose the destination from the dropdown list.
-
-#. 
+#. Click the Migrate Volume button |Migrateinstance.png| and choose the 
+   destination from the dropdown list.
 
-   Watch for the volume status to change to Migrating, then back to
+#. Watch for the volume status to change to Migrating, then back to
    Ready. You can find the volume by clicking Storage in the left
    navigation bar. Make sure that Volumes is displayed at the top of the
    window, in the Select View dropdown.
 
-#. 
-
-   Attach the volume to any desired VM running in the same cluster as
+#. Attach the volume to any desired VM running in the same cluster as
    the new storage server. See `“Attaching a
    Volume” <#attaching-a-volume>`_
 
+
 Migrating a VM Root Volume to a New Storage Pool
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -561,33 +503,25 @@ storage pool to another, without stopping the VM first.
 and users can not access the VM. After migration is complete, the VM can
 be restarted.
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
+#. Log in to the CloudStack UI as a user or admin.
 
-#. 
+#. In the left navigation bar, click Instances, and click the VM name.
 
-   In the left navigation bar, click Instances, and click the VM name.
+#. (KVM only) Stop the VM.
 
-#. 
-
-   (KVM only) Stop the VM.
-
-#. 
-
-   Click the Migrate button |Migrateinstance.png| and choose the destination from the dropdown list.
+#. Click the Migrate button |Migrateinstance.png| and choose the 
+   destination from the dropdown list.
 
    .. note:: 
-      If the VM's storage has to be migrated along with the VM, this will be noted in the host list. CloudStack will take care of the storage migration for you.
+      If the VM's storage has to be migrated along with the VM, this will 
+      be noted in the host list. CloudStack will take care of the storage 
+      migration for you.
 
-#. 
-
-   Watch for the volume status to change to Migrating, then back to
+#. Watch for the volume status to change to Migrating, then back to
    Running (or Stopped, in the case of KVM). This can take some time.
 
-#. 
+#. (KVM only) Restart the VM.
 
-   (KVM only) Restart the VM.
 
 Resizing Volumes
 ~~~~~~~~~~~~~~~~
@@ -614,63 +548,42 @@ shrinking volumes is not supported on VMware hosts.
 
 Before you try to resize a volume, consider the following:
 
--  
-
-   The VMs associated with the volume are stopped.
+-  The VMs associated with the volume are stopped.
 
--  
+-  The data disks associated with the volume are removed.
 
-   The data disks associated with the volume are removed.
-
--  
-
-   When a volume is shrunk, the disk associated with it is simply
+-  When a volume is shrunk, the disk associated with it is simply
    truncated, and doing so would put its content at risk of data loss.
    Therefore, resize any partitions or file systems before you shrink a
    data disk so that all the data is moved off from that disk.
 
 To resize a volume:
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
-
-#. 
-
-   In the left navigation bar, click Storage.
-
-#. 
+#. Log in to the CloudStack UI as a user or admin.
 
-   In Select View, choose Volumes.
+#. In the left navigation bar, click Storage.
 
-#. 
+#. In Select View, choose Volumes.
 
-   Select the volume name in the Volumes list, then click the Resize
+#. Select the volume name in the Volumes list, then click the Resize
    Volume button |resize-volume-icon.png|
 
-#. 
-
-   In the Resize Volume pop-up, choose desired characteristics for the
+#. In the Resize Volume pop-up, choose desired characteristics for the
    storage.
 
    |resize-volume.png|
 
-   #. 
-
-      If you select Custom Disk, specify a custom size.
-
-   #. 
+   #. If you select Custom Disk, specify a custom size.
 
-      Click Shrink OK to confirm that you are reducing the size of a
+   #. Click Shrink OK to confirm that you are reducing the size of a
       volume.
 
       This parameter protects against inadvertent shrinking of a disk,
       which might lead to the risk of data loss. You must sign off that
       you know what you are doing.
 
-#. 
+#. Click OK.
 
-   Click OK.
 
 Reset VM to New Root Disk on Reboot
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -688,6 +601,7 @@ True. VMs created from this service offering will have their disks reset
 upon reboot. See `“Creating a New Compute
 Offering” <service_offerings.html#creating-a-new-compute-offering>`_.
 
+
 Volume Deletion and Garbage Collection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -701,19 +615,16 @@ Volumes are permanently destroyed using a garbage collection process.
 The global configuration variables expunge.delay and expunge.interval
 determine when the physical deletion of volumes will occur.
 
--  
-
-   `expunge.delay`: determines how old the volume must be before it is
+-  `expunge.delay`: determines how old the volume must be before it is
    destroyed, in seconds
 
--  
-
-   `expunge.interval`: determines how often to run the garbage collection
+-  `expunge.interval`: determines how often to run the garbage collection
    check
 
 Administrators should adjust these values depending on site policies
 around data retention.
 
+
 Working with Volume Snapshots
 -----------------------------
 
@@ -744,28 +655,20 @@ to a VM.
 A completed snapshot is copied from primary storage to secondary
 storage, where it is stored until deleted or purged by newer snapshot.
 
+
 How to Snapshot a Volume
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-#. 
-
-   Log in to the CloudStack UI as a user or administrator.
-
-#. 
-
-   In the left navigation bar, click Storage.
+#. Log in to the CloudStack UI as a user or administrator.
 
-#. 
+#. In the left navigation bar, click Storage.
 
-   In Select View, be sure Volumes is selected.
+#. In Select View, be sure Volumes is selected.
 
-#. 
+#. Click the name of the volume you want to snapshot.
 
-   Click the name of the volume you want to snapshot.
+#. Click the Snapshot button. |SnapshotButton.png|
 
-#. 
-
-   Click the Snapshot button. |SnapshotButton.png|
 
 Automatic Snapshot Creation and Retention
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -784,11 +687,12 @@ scheduled snapshots to be retained. Older snapshots that exceed the
 retention limit are automatically deleted. This user-defined limit must
 be equal to or lower than the global limit set by the CloudStack
 administrator. See `“Globally Configured
-Limits” <usage.html#globally-configured-limits>`_. The limit applies only to
-those snapshots that are taken as part of an automatic recurring
+Limits” <usage.html#globally-configured-limits>`_. The limit applies only
+to those snapshots that are taken as part of an automatic recurring
 snapshot policy. Additional manual snapshots can be created and
 retained.
 
+
 Incremental Snapshots and Backup
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -821,6 +725,7 @@ inactive.
 When a snapshot is taken manually, a snapshot is always created
 regardless of whether a volume has been active or not.
 
+
 Snapshot Restore
 ~~~~~~~~~~~~~~~~
 
@@ -830,6 +735,7 @@ recovered as needed. Alternatively, a template may be created from the
 snapshot of a root disk. The user can then boot a VM from this template
 to effect recovery of the root disk.
 
+
 Snapshot Job Throttling
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -859,6 +765,7 @@ The admin can also set job.expire.minutes to place a maximum on how long
 a snapshot request will wait in the queue. If this limit is reached, the
 snapshot request fails and returns an error message.
 
+
 VMware Volume Snapshot Performance
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -874,7 +781,10 @@ properties file (\*.ova.meta) which it stored along with the original
 snapshot data.
 
 .. note:: 
-   For upgrading customers: This process applies only to newly created snapshots after upgrade to CloudStack 4.2. Snapshots that have already been taken and stored in OVA format will continue to exist in that format, and will continue to work as expected.
+   For upgrading customers: This process applies only to newly created 
+   snapshots after upgrade to CloudStack 4.2. Snapshots that have already 
+   been taken and stored in OVA format will continue to exist in that 
+   format, and will continue to work as expected.
 
 
 .. |AttachDiskButton.png| image:: _static/images/attach-disk-icon.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/systemvm.rst
----------------------------------------------------------------------
diff --git a/source/systemvm.rst b/source/systemvm.rst
index 2eda853..31318ca 100644
--- a/source/systemvm.rst
+++ b/source/systemvm.rst
@@ -23,45 +23,33 @@ creates, starts, and stops them as needed based on scale and immediate
 needs. However, the administrator should be aware of them and their
 roles to assist in debugging issues.
 
+
 The System VM Template
 ----------------------
 
 The System VMs come from a single template. The System VM has the
 following characteristics:
 
--  
-
-   Debian 6.0 ("Squeeze"), 2.6.32 kernel with the latest security
+-  Debian 6.0 ("Squeeze"), 2.6.32 kernel with the latest security
    patches from the Debian security APT repository
 
--  
-
-   Has a minimal set of packages installed thereby reducing the attack
+-  Has a minimal set of packages installed thereby reducing the attack
    surface
 
--  
+-  32-bit for enhanced performance on Xen/VMWare
 
-   32-bit for enhanced performance on Xen/VMWare
-
--  
-
-   pvops kernel with Xen PV drivers, KVM virtio drivers, and VMware
+-  pvops kernel with Xen PV drivers, KVM virtio drivers, and VMware
    tools for optimum performance on all hypervisors
 
--  
-
-   Xen tools inclusion allows performance monitoring
+-  Xen tools inclusion allows performance monitoring
 
--  
-
-   Latest versions of HAProxy, iptables, IPsec, and Apache from debian
+-  Latest versions of HAProxy, iptables, IPsec, and Apache from debian
    repository ensures improved security and speed
 
--  
-
-   Latest version of JRE from Sun/Oracle ensures improved security and
+-  Latest version of JRE from Sun/Oracle ensures improved security and
    speed
 
+
 Changing the Default System VM Template
 ---------------------------------------
 
@@ -69,9 +57,7 @@ CloudStack allows you to change the default 32-bit System VM template to
 64-bit one. Using the 64-bit template, upgrade the virtual router to
 manage larger number of connection in your network.
 
-#. 
-
-   Based on the hypervisor you use, download the 64-bit template from
+#. Based on the hypervisor you use, download the 64-bit template from
    the following location:
 
    ==========  ================================================================================================
@@ -81,27 +67,17 @@ manage larger number of connection in your network.
    KVM         http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2
    ==========  ================================================================================================
 
-#. 
-
-   As an administrator, log in to the CloudStack UI
+#. As an administrator, log in to the CloudStack UI
 
-#. 
-
-   Register the 64 bit template.
+#. Register the 64 bit template.
 
    For example: KVM64bitTemplate
 
-#. 
-
-   While registering the template, select Routing.
-
-#. 
+#. While registering the template, select Routing.
 
-   Navigate to Infrastructure > Zone > Settings.
+#. Navigate to Infrastructure > Zone > Settings.
 
-#. 
-
-   Set the name of the 64-bit template, KVM64bitTemplate, in the
+#. Set the name of the 64-bit template, KVM64bitTemplate, in the
    *``router.template.kvm``* global parameter.
 
    If you are using a XenServer 64-bit template, set the name in the
@@ -110,9 +86,8 @@ manage larger number of connection in your network.
    Any new virtual router created in this Zone automatically picks up
    this template.
 
-#. 
+#. Restart the Management Server.
 
-   Restart the Management Server.
 
 Multiple System VM Support for VMware
 -------------------------------------
@@ -127,6 +102,7 @@ The management server monitors and weights all commands sent to these
 System VMs and performs dynamic load balancing and scaling-up of more
 System VMs.
 
+
 Console Proxy
 -------------
 
@@ -144,7 +120,8 @@ the connection to the VNC port for the requested VM on the Host hosting
 the guest.
 
 .. note:: 
-   The hypervisors will have many ports assigned to VNC usage so that multiple VNC sessions can occur simultaneously.
+   The hypervisors will have many ports assigned to VNC usage so that 
+   multiple VNC sessions can occur simultaneously.
 
 There is never any traffic to the guest virtual IP, and there is no need
 to enable VNC within the guest.
@@ -164,11 +141,15 @@ the capacity to handle new sessions is used.
 Console proxies can be restarted by administrators but this will
 interrupt existing console sessions for users.
 
+
 Using a SSL Certificate for the Console Proxy
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. note::
-   In the past CloudStack used the ``realhostip.com`` dynamic  DNS resolution service. As this service will be shut down as of  June 30th, 2014, CloudStack has stopped using the service as of version 4.3.
+   In the past CloudStack used the ``realhostip.com`` dynamic  DNS 
+   resolution service. As this service will be shut down as of  
+   June 30th, 2014, CloudStack has stopped using the service as of 
+   version 4.3.
 
 By default, the console viewing functionality uses plaintext HTTP. In 
 any production environment, the console proxy connection should be
@@ -177,11 +158,9 @@ encrypted via SSL at the mininum.
 A CloudStack administrator has 2 ways to secure the console proxy
 communication with SSL:
 
--
-   Set up a SSL wild-card certificate and domain name resolution
+-  Set up a SSL wild-card certificate and domain name resolution
    
--
-   Set up SSL certificate for specific FQDN and configure load-balancer
+-  Set up SSL certificate for specific FQDN and configure load-balancer
 
 
 Changing the Console Proxy SSL Certificate and Domain
@@ -194,91 +173,72 @@ of the form aaa-bbb-ccc-ddd.your.domain to an IPv4 IP address in the
 form aaa.bbb.ccc.ddd, for example, 202.8.44.1. To change the console 
 proxy domain, SSL certificate, and private key:
 
-#. 
-
-   Set up dynamic name resolution or populate all possible DNS names in
+#. Set up dynamic name resolution or populate all possible DNS names in
    your public IP range into your existing DNS server with the format
    aaa-bbb-ccc-ddd.consoleproxy.company.com -> aaa.bbb.ccc.ddd.
 
    .. note::
-      In these steps you will notice *consoleproxy.company.com* -For security best practices, we recommend creating a wildcard SSL certificate on a separate subdomain so in the event that the certificate is compromised, a malicious user cannot impersonate a company.com domain.
-
-#. 
+      In these steps you will notice *consoleproxy.company.com* -For 
+      security best practices, we recommend creating a wildcard SSL 
+      certificate on a separate subdomain so in the event that the 
+      certificate is compromised, a malicious user cannot impersonate 
+      a company.com domain.
 
-   Generate the private key and certificate signing request (CSR). When
+#. Generate the private key and certificate signing request (CSR). When
    you are using openssl to generate private/public key pairs and CSRs,
    for the private key that you are going to paste into the CloudStack
    UI, be sure to convert it into PKCS#8 format.
 
-   #. 
-
-      Generate a new 2048-bit private key
+   #. Generate a new 2048-bit private key
 
       .. code:: bash
 
-          openssl genrsa -des3 -out yourprivate.key 2048
-
-   #. 
+         openssl genrsa -des3 -out yourprivate.key 2048
 
-      Generate a new certificate CSR. Ensure the creation of a wildcard 
+   #. Generate a new certificate CSR. Ensure the creation of a wildcard 
       certificate, eg ``*.consoleproxy.company.com``
 
       .. code:: bash
 
-          openssl req -new -key yourprivate.key -out yourcertificate.csr
+         openssl req -new -key yourprivate.key -out yourcertificate.csr
 
-   #. 
-
-      Head to the website of your favorite trusted Certificate
+   #. Head to the website of your favorite trusted Certificate
       Authority, purchase an SSL certificate, and submit the CSR. You
       should receive a valid certificate in return
 
-   #. 
-
-      Convert your private key format into PKCS#8 encrypted format.
+   #. Convert your private key format into PKCS#8 encrypted format.
 
       .. code:: bash
 
-          openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encrypted.key
-
-   #. 
+         openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encrypted.key
 
-      Convert your PKCS#8 encrypted private key into the PKCS#8 format
+   #. Convert your PKCS#8 encrypted private key into the PKCS#8 format
       that is compliant with CloudStack
 
       .. code:: bash
 
-          openssl pkcs8 -in yourprivate.pkcs8.encrypted.key -out yourprivate.pkcs8.key
+         openssl pkcs8 -in yourprivate.pkcs8.encrypted.key -out yourprivate.pkcs8.key
 
-#. 
-
-   In the Update SSL Certificate screen of the CloudStack UI, paste the
+#. In the Update SSL Certificate screen of the CloudStack UI, paste the
    following:
 
-   -  
-
-      The certificate you've just generated.
+   -  The certificate you've just generated.
 
-   -  
+   -  The private key you've just generated.
 
-      The private key you've just generated.
-
-   -  
-
-      The desired domain name, prefixed with ``*.``; for example, ``*.consoleproxy.company.com``
+   -  The desired domain name, prefixed with ``*.``; for example, ``*.consoleproxy.company.com``
 
      |update-ssl.png|
 
-#. 
-
-   This stops all currently running console proxy VMs, then restarts
+#. This stops all currently running console proxy VMs, then restarts
    them with the new certificate and key. Users might notice a brief
    interruption in console availability.
 
 The Management Server generates URLs of the form
-"aaa-bbb-ccc-ddd.consoleproxy.company.com" after this change is made. The new console
-requests will be served with the new DNS domain name, certificate, and
-key.
+"aaa-bbb-ccc-ddd.consoleproxy.company.com" after this change is made. 
+The new console requests will be served with the new DNS domain name, 
+certificate, and key.
+
 
 Load-balancing Console Proxies
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -286,8 +246,9 @@ An alternative to using dynamic DNS or creating a range of DNS entries
 as described in the last section would be to create a SSL certificate
 for a specific domain name, configure CloudStack to use that particular
 FQDN, and then configure a load balancer to load balance the console
-proxy's IP address behind the FQDN. As the functionality for this is still
-new, please see https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
+proxy's IP address behind the FQDN. As the functionality for this is 
+still new, please see 
+https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
 for more details.
 
 
@@ -308,35 +269,27 @@ basic test in debugging networking issues is to attempt to ping the
 virtual router from a guest VM. Some of the characteristics of the
 virtual router are determined by its associated system service offering.
 
+
 Configuring the Virtual Router
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can set the following:
 
--  
+-  IP range
 
-   IP range
+-  Supported network services
 
--  
+-  Default domain name for the network serviced by the virtual router
 
-   Supported network services
+-  Gateway IP address
 
--  
-
-   Default domain name for the network serviced by the virtual router
-
--  
-
-   Gateway IP address
-
--  
-
-   How often CloudStack fetches network usage statistics from CloudStack
+-  How often CloudStack fetches network usage statistics from CloudStack
    virtual routers. If you want to collect traffic metering data from
    the virtual router, set the global configuration parameter
    router.stats.interval. If you are not using the virtual router to
    gather network usage statistics, set it to 0.
 
+
 Upgrading a Virtual Router with System Service Offerings
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -347,95 +300,87 @@ virtual routers in a single guest network use the same system service
 offering. You can upgrade the capabilities of the virtual router by
 creating and applying a custom system service offering.
 
-#. 
-
-   Define your custom system service offering. See `“Creating a New System Service
-   Offering” <#creating-a-new-system-service-offering>`_. In System VM Type,
-   choose Domain Router.
-
-#. 
+#. Define your custom system service offering. 
+   See `“Creating a New System Service Offering” 
+   <#creating-a-new-system-service-offering>`_. 
+   In System VM Type, choose Domain Router.
 
-   Associate the system service offering with a network offering. See
-   `“Creating a New Network Offering” <networking.html#creating-a-new-network-offering>`_.
+#. Associate the system service offering with a network offering. See
+   `“Creating a New Network Offering” 
+   <networking.html#creating-a-new-network-offering>`_.
 
-#. 
-
-   Apply the network offering to the network where you want the virtual
+#. Apply the network offering to the network where you want the virtual
    routers to use the new system service offering. If this is a new
    network, follow the steps in Adding an Additional Guest Network on
    page 66. To change the service offering for existing virtual routers,
-   follow the steps in `“Changing the Network Offering
-   on a Guest Network” <networking2.html#changing-the-network-offering-on-a-guest-network>`_.
+   follow the steps in `“Changing the Network Offering on a Guest Network” 
+   <networking2.html#changing-the-network-offering-on-a-guest-network>`_.
+
 
 Best Practices for Virtual Routers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   WARNING: Restarting a virtual router from a hypervisor console
+-  WARNING: Restarting a virtual router from a hypervisor console
    deletes all the iptables rules. To work around this issue, stop the
    virtual router and start it from the CloudStack UI.
 
--  
+-  .. warning:: 
+      Do not use the destroyRouter API when only one router is available 
+      in the network, because restartNetwork API with the cleanup=false 
+      parameter can't recreate it later. If you want to destroy and 
+      recreate the single router available in the network, use the 
+      restartNetwork API with the cleanup=true parameter.
 
-   .. warning:: 
-      Do not use the destroyRouter API when only one router is available in the network, because restartNetwork API with the cleanup=false parameter can't recreate it later. If you want to destroy and recreate the single router available in the network, use the restartNetwork API with the cleanup=true parameter.
 
 Service Monitoring Tool for Virtual Router
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Various services running on the CloudStack virtual routers can be monitored by using a Service Monitoring tool. The tool ensures that
-services are successfully running until CloudStack deliberately disables them. If a service goes down, the tool automatically restarts the service, and if that does not help bringing up the service, an alert as well as an event is generated indicating the failure. A new global parameter, ``network.router.enableservicemonitoring``, has been introduced to control this feature. The default value is false, implies, monitoring is disabled. When you enable, ensure that the Management Server and the router are restarted.
-
+Various services running on the CloudStack virtual routers can be 
+monitored by using a Service Monitoring tool. The tool ensures that
+services are successfully running until CloudStack deliberately disables 
+them. If a service goes down, the tool automatically restarts the 
+service, and if that does not help bringing up the service, an alert as 
+well as an event is generated indicating the failure. A new global 
+parameter, ``network.router.enableservicemonitoring``, has been 
+introduced to control this feature. The default value is false, implies, 
+monitoring is disabled. When you enable, ensure that the Management 
+Server and the router are restarted.
 
 Monitoring tool can help to start a VR service, which is crashed due to
 an unexpected reason. For example:
 
--  
-
-   The services crashed due to defects in the source code.
+-  The services crashed due to defects in the source code.
 
--  
-
-   The services that are terminated by the OS when memory or CPU is not
+-  The services that are terminated by the OS when memory or CPU is not
    sufficiently available for the service.
 
 .. note:: 
-   Only those services with daemons are monitored. The services that are failed due to errors in the service/daemon configuration file cannot be restarted by the Monitoring tool. VPC networks are not supported.
+   Only those services with daemons are monitored. The services that are 
+   failed due to errors in the service/daemon configuration file cannot 
+   be restarted by the Monitoring tool. VPC networks are not supported.
 
 The following services are monitored in a VR:
 
--  
-
-   DNS
+-  DNS
 
--  
+-  HA Proxy
 
-   HA Proxy
+-  SSH
 
--  
-
-   SSH
-
--  
-
-   Apache Web Server
+-  Apache Web Server
 
 The following networks are supported:
 
--  
-
-   Isolated Networks
-
--  
+-  Isolated Networks
 
-   Shared Networks in both Advanced and Basic zone
+-  Shared Networks in both Advanced and Basic zone
 
    .. note:: VPC networks are not supported
 
 This feature is supported on the following hypervisors: XenServer,
 VMware, and KVM.
 
+
 Enhanced Upgrade for Virtual Routers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -470,152 +415,93 @@ The following service will be available even if the VR is not upgraded.
 However, no changes for any of the services can be sent to the VR, until
 it is upgraded:
 
--  
-
-   SecurityGroup
-
--  
-
-   UserData
-
--  
-
-   DHCP
-
--  
-
-   DNS
-
--  
-
-   LB
+-  SecurityGroup
 
--  
+-  UserData
 
-   Port Forwarding
+-  DHCP
 
--  
+-  DNS
 
-   VPN
+-  LB
 
--  
+-  Port Forwarding
 
-   Static NAT
+-  VPN
 
--  
+-  Static NAT
 
-   Source NAT
+-  Source NAT
 
--  
+-  Firewall
 
-   Firewall
+-  Gateway
 
--  
+-  NetworkACL
 
-   Gateway
-
--  
-
-   NetworkACL
 
 Supported Virtual Routers
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
--  
-
-   VR
+-  VR
 
--  
+-  VPC VR
 
-   VPC VR
+-  Redundant VR
 
--  
-
-   Redundant VR
 
 Upgrading Virtual Routers
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-#. 
-
-   Download the latest System VM template.
+#. Download the latest System VM template.
 
-#. 
+#. Download the latest System VM to all the primary storage pools.
 
-   Download the latest System VM to all the primary storage pools.
+#. Upgrade the Management Server.
 
-#. 
-
-   Upgrade the Management Server.
-
-#. 
-
-   Upgrade CPVM and SSVM either from the UI or by using the following
+#. Upgrade CPVM and SSVM either from the UI or by using the following
    script:
 
    .. code:: bash
 
-       # cloudstack-sysvmadm -d <IP address> -u cloud -p -s
+      # cloudstack-sysvmadm -d <IP address> -u cloud -p -s
 
    Even when the VRs are still on older versions, existing services will
    continue to be available to the VMs. The Management Server cannot
    perform any operations on the VRs until they are upgraded.
 
-#. 
-
-   Selectively upgrade the VRs:
-
-   #. 
+#. Selectively upgrade the VRs:
 
-      Log in to the CloudStack UI as the root administrator.
+   #. Log in to the CloudStack UI as the root administrator.
 
-   #. 
+   #. In the left navigation, choose Infrastructure.
 
-      In the left navigation, choose Infrastructure.
-
-   #. 
-
-      On Virtual Routers, click View More.
+   #. On Virtual Routers, click View More.
 
       All the VRs are listed in the Virtual Routers page.
 
-   #. 
-
-      In Select View drop-down, select desired grouping based on your
+   #. In Select View drop-down, select desired grouping based on your
       requirement.
 
       You can use either of the following:
 
-      -  
-
-         Group by zone
-
-      -  
+      -  Group by zone
 
-         Group by pod
+      -  Group by pod
 
-      -  
+      -  Group by cluster
 
-         Group by cluster
+      -  Group by account
 
-      -  
-
-         Group by account
-
-   #. 
-
-      Click the group which has the VRs to be upgraded.
+   #. Click the group which has the VRs to be upgraded.
 
       For example, if you have selected Group by zone, select the name
       of the desired zone.
 
-   #. 
+   #. Click the Upgrade button to upgrade all the VRs. |vr-upgrade.png|
 
-      Click the Upgrade button to upgrade all the VRs. |vr-upgrade.png|
+   #. Click OK to confirm.
 
-   #. 
-
-      Click OK to confirm.
 
 Secondary Storage VM
 --------------------
@@ -633,6 +519,7 @@ Zone, copying templates between Zones, and snapshot backups.
 
 The administrator can log in to the secondary storage VM if needed.
 
+
 .. |update-ssl.png| image:: _static/images/update-ssl.png
    :alt: Updating Console Proxy SSL Certificate
 .. |vr-upgrade.png| image:: _static/images/vr-upgrade.png


[31/40] git commit: accounts.rst: remove trailing spaces, add highlight

Posted by ra...@apache.org.
accounts.rst: remove trailing spaces, add highlight


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

Branch: refs/heads/4.4
Commit: fce127ef8e6669ea72e5c9b9051f5720172125cb
Parents: 733b866
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Tue Aug 19 20:04:07 2014 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Aug 19 20:15:02 2014 -0400

----------------------------------------------------------------------
 source/accounts.rst | 81 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 54 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fce127ef/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index a4d95a2..b555742 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -186,53 +186,80 @@ Using an LDAP Server for User Authentication
 --------------------------------------------
 
 You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. 
-CloudStack will search the external LDAP directory tree
-starting at a specified base directory and gets user info such as first name, last name, email and username. 
+or ApacheDS to authenticate CloudStack end-users. CloudStack will search
+the external LDAP directory tree starting at a specified base directory
+and gets user info such as first name, last name, email and username.
 
 To authenticate, username and password entered by the user are used.
-Cloudstack does a search for a user with the given username. If it exists, it does a bind request with DN and password
+Cloudstack does a search for a user with the given username. If it
+exists, it does a bind request with DN and password.
 
 To set up LDAP authentication in CloudStack, call the CloudStack API
-command addLdapConfiguration and provide Hostname or IP address and listening port of the LDAP server.
-You could configure multiple servers as well. These are expected to be replicas. If one fails, the next one is used.
+command ``addLdapConfiguration`` and provide Hostname or IP address
+and listening port of the LDAP server. You could configure multiple
+servers as well. These are expected to be replicas. If one fails,
+the next one is used.
 
+The following global configurations should also be configured (the
+default values are for openldap)
 
-The following global configurations should also be configured (the default values are for openldap)
+-  ``ldap.basedn``:	Sets the basedn for LDAP. Ex: **OU=APAC,DC=company,DC=com**
 
+-  ``ldap.bind.principal``, ``ldap.bind.password``: DN and password for a user
+   who can list all the users in the above basedn. Ex:
+   **CN=Administrator, OU=APAC, DC=company, DC=com**
+
+-  ``ldap.user.object``: object type of users within LDAP. Defaults value is
+   **user** for AD and **interorgperson** for openldap.
+
+-  ``ldap.email.attribute``: email attribute within ldap for a user. Default
+   value for AD and openldap is **mail**.
+
+-  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
+   Default value for AD and openldap is **givenname**.
+
+-  ``ldap.username.attribute``: username attribute for a user within LDAP.
+  Default value is **SAMAccountName** for AD and **uid** for openldap.
 
-- ldap.basedn:	Sets the basedn for LDAP. Ex: OU=APAC,DC=company,DC=com
-- ldap.bind.principal,ldap.bind.password: DN and password for a user who can list all the users in the above basedn. Ex: CN=Administrator, OU=APAC, DC=company, DC=com
-- ldap.user.object: object type of users within LDAP. Defaults value is user for AD and interorgperson for openldap.
-- ldap.email.attribute: email attribute within ldap for a user. Default value for AD and openldap is mail.
-- ldap.firstname.attribute: firstname attribute within ldap for a user. Default value for AD and openldap is givenname.
-- ldap.username.attribute: username attribute for a user within LDAP. Default value is SAMAccountNAme	for AD and uid for openldap.
 
 Restricting LDAP users to a group:
-~~~~~~~~~~~~~
-- ldap.search.group.principle: this is optional and if set only users from this group are listed.		
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  ``ldap.search.group.principle``: this is optional and if set only users from
+   this group are listed.
+
 
 LDAP SSL:
-~~~~~~~~~~~~~
-- ldap.lastname.attribute: lsatname attribute within ldap for a user. Default value for AD and openldap is sn.
-- ldap.truststore, ldap.truststore.password:	truststore,password to use for LDAP SSL.	
- 
-LDAP groups:  
-~~~~~~~~~~~~~
-- ldap.group.object: object type of groups within LDAP. Default value is group for AD and groupOfUniqueNames for openldap.	
-- ldap.group.user.uniquemember: attribute for uniquemembers within a group. Default value is member for AD and uniquemember for openldap.
+~~~~~~~~~
+
+-  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
+   Default value for AD and openldap is **sn**.
+
+-  ``ldap.truststore``, ``ldap.truststore.password``:	truststore, password
+   to use for LDAP SSL.
  
 
-Once configured, on Add Account page, you will see an "Add LDAP Account" button which opens a dialog and the selected users can be imported.
+LDAP groups:
+~~~~~~~~~~~~
+
+-  ``ldap.group.object``: object type of groups within LDAP. Default value is
+   group for AD and **groupOfUniqueNames** for openldap.	
+
+-  ``ldap.group.user.uniquemember``: attribute for uniquemembers within a group.
+   Default value is **member** for AD and **uniquemember** for openldap.
+
+Once configured, on Add Account page, you will see an "Add LDAP Account" button
+which opens a dialog and the selected users can be imported.
 
 .. figure:: _static/images/CloudStack-ldap-screen1.png
    :align:   center
 
 
+You could also use api commands: ``listLdapUsers``, ``ldapCreateAccount`` and
+``importLdapUsers``.
 
-You could also use api commands: listLdapUsers, ldapCreateAccount and importLdapUsers.
-
-Once LDAP is enabled, the users will not be allowed to changed password directly in cloudstack.
+Once LDAP is enabled, the users will not be allowed to changed password
+directly in cloudstack.
 
 
 


[30/40] git commit: CLOUDSTACK-6634

Posted by ra...@apache.org.
CLOUDSTACK-6634

updated the ldap section in admin guide

Signed-off-by: Pierre-Luc Dion <pd...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/733b8665
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/733b8665
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/733b8665

Branch: refs/heads/4.4
Commit: 733b8665968f1b4b9d4efde58579b09260c89b7e
Parents: 018c1ad
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Tue Aug 19 16:27:43 2014 +0530
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Aug 19 20:14:37 2014 -0400

----------------------------------------------------------------------
 .../_static/images/CloudStack-ldap-screen1.png  | Bin 0 -> 23243 bytes
 source/accounts.rst                             | 172 ++++---------------
 2 files changed, 33 insertions(+), 139 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/733b8665/source/_static/images/CloudStack-ldap-screen1.png
----------------------------------------------------------------------
diff --git a/source/_static/images/CloudStack-ldap-screen1.png b/source/_static/images/CloudStack-ldap-screen1.png
new file mode 100644
index 0000000..46032a4
Binary files /dev/null and b/source/_static/images/CloudStack-ldap-screen1.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/733b8665/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index e5d4b6d..a4d95a2 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -186,160 +186,54 @@ Using an LDAP Server for User Authentication
 --------------------------------------------
 
 You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. Just map CloudStack
-accounts to the corresponding LDAP accounts using a query filter. The
-query filter is written using the query syntax of the particular LDAP
-server, and can include special wildcard characters provided by
-CloudStack for matching common values such as the user’s email address
-and name. CloudStack will search the external LDAP directory tree
-starting at a specified base directory and return the distinguished name
-(DN) and password of the matching user. This information along with the
-given password is used to authenticate the user..
+or ApacheDS to authenticate CloudStack end-users. 
+CloudStack will search the external LDAP directory tree
+starting at a specified base directory and gets user info such as first name, last name, email and username. 
 
-To set up LDAP authentication in CloudStack, call the CloudStack API
-command ldapConfig and provide the following:
-
--  Hostname or IP address and listening port of the LDAP server
-
--  Base directory and query filter
-
--  Search user DN credentials, which give CloudStack permission to
-   search on the LDAP server
-
--  SSL keystore and password, if SSL is used
-
-
-Example LDAP Configuration Commands
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To understand the examples in this section, you need to know the basic
-concepts behind calling the CloudStack API, which are explained in the
-Developer’s Guide.
-
-The following shows an example invocation of ldapConfig with an ApacheDS
-LDAP server
-
-.. code:: bash
-
-   http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
-
-The command must be URL-encoded. Here is the same example without the
-URL encoding:
-
-.. code:: bash
-   
-   http://127.0.0.1:8080/client/api?command=ldapConfig
-   &hostname=127.0.0.1
-   &searchbase=ou=testing,o=project
-   &queryfilter=(&(%uid=%u))
-   &binddn=cn=John+Singh,ou=testing,o=project
-   &bindpass=secret
-   &port=10389
-   &ssl=true
-   &truststore=C:/company/info/trusted.ks
-   &truststorepass=secret
-   &response=json
-   &apiKey=YourAPIKey&signature=YourSignatureHash
-
-The following shows a similar command for Active Directory. Here, the
-search base is the testing group within a company, and the users are
-matched up based on email address.
-
-.. code:: bash
+To authenticate, username and password entered by the user are used.
+Cloudstack does a search for a user with the given username. If it exists, it does a bind request with DN and password
 
-   http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%28mail%3D%25e%29%29 &binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&bindpass=1111_aaaa&port=389&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
-
-The next few sections explain some of the concepts you will need to know
-when filling out the ldapConfig parameters.
-
-
-Search Base
-~~~~~~~~~~~
-
-An LDAP query is relative to a given node of the LDAP directory tree,
-called the search base. The search base is the distinguished name (DN)
-of a level of the directory tree below which all users can be found. The
-users can be in the immediate base directory or in some subdirectory.
-The search base may be equivalent to the organization, group, or domain
-name. The syntax for writing a DN varies depending on which LDAP server
-you are using. A full discussion of distinguished names is outside the
-scope of our documentation. The following table shows some examples of
-search bases to find users in the testing department..
-
-================  =======================
-LDAP Server       Example Search Base DN
-================  =======================
-ApacheDS          OU=testing, O=project
-Active Directory  OU=testing, DC=company
-================  =======================
-
-
-Query Filter
-~~~~~~~~~~~~
-
-The query filter is used to find a mapped user in the external LDAP
-server. The query filter should uniquely map the CloudStack user to LDAP
-user for a meaningful authentication. For more information about query
-filter syntax, consult the documentation for your LDAP server.
-
-The CloudStack query filter wildcards are:
-
-=====================  ====================
-Query Filter Wildcard  Description
-=====================  ====================
-%u                     User name
-%e                     Email address
-%n                     First and last name
-=====================  ====================
-
-The following examples assume you are using Active Directory, and refer
-to user attributes from the Active Directory schema.
-
-If the CloudStack user name is the same as the LDAP user ID:
-
-.. code:: bash
-
-   (uid=%u)
+To set up LDAP authentication in CloudStack, call the CloudStack API
+command addLdapConfiguration and provide Hostname or IP address and listening port of the LDAP server.
+You could configure multiple servers as well. These are expected to be replicas. If one fails, the next one is used.
 
-If the CloudStack user name is the LDAP display name:
 
-.. code:: bash
+The following global configurations should also be configured (the default values are for openldap)
 
-   (displayName=%u)
 
-To find a user by email address:
+- ldap.basedn:	Sets the basedn for LDAP. Ex: OU=APAC,DC=company,DC=com
+- ldap.bind.principal,ldap.bind.password: DN and password for a user who can list all the users in the above basedn. Ex: CN=Administrator, OU=APAC, DC=company, DC=com
+- ldap.user.object: object type of users within LDAP. Defaults value is user for AD and interorgperson for openldap.
+- ldap.email.attribute: email attribute within ldap for a user. Default value for AD and openldap is mail.
+- ldap.firstname.attribute: firstname attribute within ldap for a user. Default value for AD and openldap is givenname.
+- ldap.username.attribute: username attribute for a user within LDAP. Default value is SAMAccountNAme	for AD and uid for openldap.
 
-.. code:: bash
+Restricting LDAP users to a group:
+~~~~~~~~~~~~~
+- ldap.search.group.principle: this is optional and if set only users from this group are listed.		
 
-   (mail=%e)
+LDAP SSL:
+~~~~~~~~~~~~~
+- ldap.lastname.attribute: lsatname attribute within ldap for a user. Default value for AD and openldap is sn.
+- ldap.truststore, ldap.truststore.password:	truststore,password to use for LDAP SSL.	
+ 
+LDAP groups:  
+~~~~~~~~~~~~~
+- ldap.group.object: object type of groups within LDAP. Default value is group for AD and groupOfUniqueNames for openldap.	
+- ldap.group.user.uniquemember: attribute for uniquemembers within a group. Default value is member for AD and uniquemember for openldap.
+ 
 
+Once configured, on Add Account page, you will see an "Add LDAP Account" button which opens a dialog and the selected users can be imported.
 
-Search User Bind DN
-~~~~~~~~~~~~~~~~~~~
+.. figure:: _static/images/CloudStack-ldap-screen1.png
+   :align:   center
 
-The bind DN is the user on the external LDAP server permitted to search
-the LDAP directory within the defined search base. When the DN is
-returned, the DN and passed password are used to authenticate the
-CloudStack user with an LDAP bind. A full discussion of bind DNs is
-outside the scope of our documentation. The following table shows some
-examples of bind DNs.
 
-================  =================================================
-LDAP Server       Example Bind DN
-================  =================================================
-ApacheDS          CN=Administrator,DC=testing,OU=project,OU=org
-Active Directory  CN=Administrator, OU=testing, DC=company, DC=com
-================  =================================================
 
+You could also use api commands: listLdapUsers, ldapCreateAccount and importLdapUsers.
 
-SSL Keystore Path and Password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Once LDAP is enabled, the users will not be allowed to changed password directly in cloudstack.
 
-If the LDAP server requires SSL, you need to enable it in the ldapConfig
-command by setting the parameters ssl, truststore, and truststorepass.
-Before enabling SSL for ldapConfig, you need to get the certificate
-which the LDAP server is using and add it to a trusted keystore. You
-will need to know the path to the keystore and the password.
 
 
 .. |button to dedicate a zone, pod,cluster, or host| image:: _static/images/dedicate-resource-button.png


[28/40] git commit: Adding logo to 4.3 index page

Posted by ra...@apache.org.
Adding logo to 4.3 index page


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

Branch: refs/heads/4.4
Commit: a55b0dbcf3c56bb856bc3243ec36ef7025af2204
Parents: e54cd24
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Jun 30 11:30:12 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Jun 30 11:30:12 2014 +0200

----------------------------------------------------------------------
 source/_static/images/acslogo.png | Bin 0 -> 135394 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a55b0dbc/source/_static/images/acslogo.png
----------------------------------------------------------------------
diff --git a/source/_static/images/acslogo.png b/source/_static/images/acslogo.png
new file mode 100644
index 0000000..a938231
Binary files /dev/null and b/source/_static/images/acslogo.png differ


[14/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
new file mode 100644
index 0000000..64d9faa
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
@@ -0,0 +1,1860 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+# renoshen <sh...@sinosig.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-11 12:02+0000\n"
+"Last-Translator: darrentang <da...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 2170d7c1a0e145718f15a48fdfd6376c
+#: ../../virtual_machines.rst:18
+msgid "Working with Virtual Machines"
+msgstr "使用虚拟机"
+
+# 7b1c6837d7294d04b64fdefe3b860527
+#: ../../virtual_machines.rst:21
+msgid "About Working with Virtual Machines"
+msgstr "关于虚拟机的使用"
+
+# a8fcaad6e74c48de85dda47b508896ff
+#: ../../virtual_machines.rst:23
+msgid ""
+"CloudStack provides administrators with complete control over the lifecycle "
+"of all guest VMs executing in the cloud. CloudStack provides several guest "
+"management operations for end users and administrators. VMs may be stopped, "
+"started, rebooted, and destroyed."
+msgstr "CloudStack在云中为管理员提供了完整的管理所有来宾VMs整个生命周期的功能。CloudStack为终端用户和管理员提供了许多来宾虚机管理操作。VMs能被关机、开机、重启和销毁。"
+
+# 76072107bbd74ed58ef5e488bbc45361
+#: ../../virtual_machines.rst:28
+msgid ""
+"Guest VMs have a name and group. VM names and groups are opaque to "
+"CloudStack and are available for end users to organize their VMs. Each VM "
+"can have three names for use in different contexts. Only two of these names "
+"can be controlled by the user:"
+msgstr "来宾VMs有名称和组。VM的名称和组对于CloudStack是不透明的,对终端用户整理他们的VMs可用。每个VM可以有三个用于不同环境的名称。其中有两个名字受用户控制:"
+
+# fdf35c82059748b09618dc1b96c32958
+#: ../../virtual_machines.rst:35
+msgid ""
+"Instance name – a unique, immutable ID that is generated by CloudStack and "
+"can not be modified by the user. This name conforms to the requirements in "
+"IETF RFC 1123."
+msgstr "实例名称 – 一个唯一的,不可变的由CloudStack生成的ID,此ID不能被用户修改。此名称符合 IETF RFC 1123中的要求。"
+
+# 35bab809b50548b78006bcf7edfd8375
+#: ../../virtual_machines.rst:41
+msgid ""
+"Display name – the name displayed in the CloudStack web UI. Can be set by "
+"the user. Defaults to instance name."
+msgstr "显示名称 – 在CloudStack UI中显示的名称。可以由用户设置。默认跟实例名称一致。"
+
+# fc95d564a6b74400bdf7cbc43166b900
+#: ../../virtual_machines.rst:46
+msgid ""
+"Name – host name that the DHCP server assigns to the VM. Can be set by the "
+"user. Defaults to instance name"
+msgstr "名称 – 由DHCP服务器分配给VM的主机名。可以由用户设置。默认跟实例名称一致。"
+
+# 29b7bc970aec4088a82cb82eac51acf2
+#: ../../virtual_machines.rst:50
+msgid ""
+"You can append the display name of a guest VM to its internal name. For more"
+" information, see `“Appending a Display Name to the Guest VM’s Internal "
+"Name” <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+msgstr "你能把来宾VM的显示名附加到它的内部名称上。更多信息,请参考 `“将显示名附加到VM的内部名称” <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+
+# 7776a17a323a4f91a6a4286428927bdf
+#: ../../virtual_machines.rst:52
+msgid ""
+"Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is"
+" monitored by the system. If the system detects that the VM is down, it will"
+" attempt to restart the VM, possibly on a different host. For more "
+"information, see HA-Enabled Virtual Machines on"
+msgstr "来宾VMs可以配置成高可用(HA)。启用了HA的VM由系统监控。如果系统检测到此VM宕机,它可能将尝试在不同的主机上重启VM。更多信息,请参考在虚拟机上启用HA"
+
+# 89d81c5e76a047d0b049cbfcc9437d7d
+#: ../../virtual_machines.rst:57
+msgid ""
+"Each new VM is allocated one public IP address. When the VM is started, "
+"CloudStack automatically creates a static NAT between this public IP address"
+" and the private IP address of the VM."
+msgstr "每个新VM都有一个公共网络IP地址。当VM启动后,CloudStack为此VM的公共网络IP地址与内网IP地址自动创建一个静态NAT。"
+
+# 39ead95968f944999976e4c34017f685
+#: ../../virtual_machines.rst:61
+msgid ""
+"If elastic IP is in use (with the NetScaler load balancer), the IP address "
+"initially allocated to the new VM is not marked as elastic. The user must "
+"replace the automatically configured IP with a specifically acquired elastic"
+" IP, and set up the static NAT mapping between this new IP and the guest "
+"VM’s private IP. The VM’s original IP address is then released and returned "
+"to the pool of available public IPs. Optionally, you can also decide not to "
+"allocate a public IP to a VM in an EIP-enabled Basic zone. For more "
+"information on Elastic IP, see `“About Elastic IP” <networking2.html#about-"
+"elastic-ip>`_."
+msgstr "如果使用了弹性IP(与Netscaler负载均衡同时使用),初始分配给新VM的IP地址并没有标记为弹性的。用户必须将自动配置IP改为获得一个弹性IP,并在新IP与来宾VM的内网IP之间设置静态NAT映射。VM的原始IP地址随后会被释放到可用公共网络IPs池中。同样,你也可以在启用了EIP的基础zone中不为VM分配公网IP。关于弹性IP的更多信息,请参考`“关于弹性IP” <networking2.html#about-elastic-ip>`_。"
+
+# d4c486f223e24c42bd8704829023ab5d
+#: ../../virtual_machines.rst:71
+msgid ""
+"CloudStack cannot distinguish a guest VM that was shut down by the user "
+"(such as with the “shutdown” command in Linux) from a VM that shut down "
+"unexpectedly. If an HA-enabled VM is shut down from inside the VM, "
+"CloudStack will restart it. To shut down an HA-enabled VM, you must go "
+"through the CloudStack UI or API."
+msgstr "CloudStack不能区分是VM突然关机还是用户对来宾VM进行的关机操作(像Linux中的“shutdown”命令)。如果从启用了HA功能的VM系统中执行了关机操作,CloudStack会重启它。要对启用了HA功能的VM进行关机操作,你必须通过CloudStack UI或者API。"
+
+# 9376b049fcf74e669edc936a118d19e3
+#: ../../virtual_machines.rst:78
+msgid "Best Practices for Virtual Machines"
+msgstr "虚拟机的最佳实践"
+
+# 386619ec83cc48dfb2c427037f91d9f4
+#: ../../virtual_machines.rst:80
+msgid ""
+"For VMs to work as expected and provide excellent service, follow these "
+"guidelines."
+msgstr "为了让VMs能够按照预期的工作并提供最好的服务,请按照下面的指导进行操作。"
+
+# 863fbc4da7ab48ceb27e621892255393
+#: ../../virtual_machines.rst:83
+msgid "Monitor VMs for Max Capacity"
+msgstr "监视VMs的最大容量"
+
+# b1c4a0929eb34ecb943335789bb31c92
+#: ../../virtual_machines.rst:85
+msgid ""
+"The CloudStack administrator should monitor the total number of VM instances"
+" in each cluster, and disable allocation to the cluster if the total is "
+"approaching the maximum that the hypervisor can handle. Be sure to leave a "
+"safety margin to allow for the possibility of one or more hosts failing, "
+"which would increase the VM load on the other hosts as the VMs are "
+"automatically redeployed. Consult the documentation for your chosen "
+"hypervisor to find the maximum permitted number of VMs per host, then use "
+"CloudStack global configuration settings to set this as the default limit. "
+"Monitor the VM activity in each cluster at all times. Keep the total number "
+"of VMs below a safe level that allows for the occasional host failure. For "
+"example, if there are N hosts in the cluster, and you want to allow for one "
+"host in the cluster to be down at any given time, the total number of VM "
+"instances you can permit in the cluster is at most (N-1) \\* (per-host-"
+"limit). Once a cluster reaches this number of VMs, use the CloudStack UI to "
+"disable allocation of more VMs to the cluster."
+msgstr "管理员应该监视每个集群中的虚拟机实例的总数,如果总量快达到hypervisor允许的最大虚拟机数量时,不再向此群集分配虚拟机。并且,要注意为主机预留一定的计算能力,以防止群集中有主机发生故障,因为发生故障的主机上的虚拟机需要重新部署在这些预留主机上。请咨询您所选择hypervisor的文档,了解此hypervisor能支持的最大虚拟机数量,并将此数值设置在CloudStack的全局设置里。监控每个群集里虚拟机的活跃程序,并将活跃虚拟机保持在一个安全线内。这样,CloudStack就能允许偶尔的主机故障。举个示例:如果集群里有N个主机,而你只能让其中任一主机的停机时间不超过特定时间。那么,你能在此集群部署的最多虚拟主机数量值为:(N-1) \\* (每主机最大虚拟量数量限值)。一旦群集中的虚拟机达到此数量,必须在CloudStack的用户界面中禁止向
 此群集分配新的虚拟机。"
+
+# 07a8c32f156044b19d2ab4dc8c6911fa
+#: ../../virtual_machines.rst:103
+msgid "Install Required Tools and Drivers"
+msgstr "安装需要的工具和驱动"
+
+# 3f8d86b785404f85abaf6c075cc419cd
+#: ../../virtual_machines.rst:105
+msgid "Be sure the following are installed on each VM:"
+msgstr "确认在每个VM上都安装了下列软件和驱动:"
+
+# 5f5ab58b23b3484d806d822ff59a2de9
+#: ../../virtual_machines.rst:109
+msgid ""
+"For XenServer, install PV drivers and Xen tools on each VM. This will enable"
+" live migration and clean guest shutdown. Xen tools are required in order "
+"for dynamic CPU and RAM scaling to work."
+msgstr "对于XenServer,在每个VM上安装PV驱动和Xen tools。这将启用动态迁移和干净的来宾虚机关机。安装Xen tools也是为了使动态的CPU和RAM扩展能够工作。"
+
+# 0535820eb5d040f4925c98cdfa7f1f00
+#: ../../virtual_machines.rst:115
+msgid ""
+"For vSphere, install VMware Tools on each VM. This will enable console view "
+"to work properly. VMware Tools are required in order for dynamic CPU and RAM"
+" scaling to work."
+msgstr "对于vSphere,在每台VM上安装VMware Tools。这是为了能让控制台查看正常工作。安装VMware Tools也是为了使动态的CPU和RAM扩展能够工作。"
+
+# 52b93993efd74552bcbdffc5a0e4e982
+#: ../../virtual_machines.rst:119
+msgid ""
+"To be sure that Xen tools or VMware Tools is installed, use one of the "
+"following techniques:"
+msgstr "使用下面其中一个方法确认已经安装了Xen tools或VMware Tools:"
+
+# 74b0c1c26a5b460bb377b19ce856399d
+#: ../../virtual_machines.rst:124
+msgid ""
+"Create each VM from a template that already has the tools installed; or,"
+msgstr "从已经安装了tools的模板创建的每个VM;或者,"
+
+# 0e2a66d2e624435b827732e1a4e5f02c
+#: ../../virtual_machines.rst:129
+msgid ""
+"When registering a new template, the administrator or user can indicate "
+"whether tools are installed on the template. This can be done through the UI"
+" or using the updateTemplate API; or,"
+msgstr "当注册一个新的模板时,管理员或者用户可以标示出哪个在模板上安装了tools。这可以通过UI或者使用updateTemplate API来做;或者,"
+
+# be979443be424b4695d86d2417edaf13
+#: ../../virtual_machines.rst:135
+msgid ""
+"If a user deploys a virtual machine with a template that does not have Xen "
+"tools or VMware Tools, and later installs the tools on the VM, then the user"
+" can inform CloudStack using the updateVirtualMachine API. After installing "
+"the tools and updating the virtual machine, stop and start the VM."
+msgstr "如果用户通过一个没有安装Xen tools或者VMware Tools的模板部署虚机,然后在VM上安装了tools,之后用户可以使用updateVirtualMachine API告知CloudStack。在安装tools和更新虚拟机之后,请重启虚拟机。"
+
+# d34d6ed121d543db962b242b95d76f47
+#: ../../virtual_machines.rst:142
+msgid "VM Lifecycle"
+msgstr "虚拟机的生命周期"
+
+# c150b40a15b348f5b5cdcc9af91ec2ec
+#: ../../virtual_machines.rst:144
+msgid "Virtual machines can be in the following states:"
+msgstr "虚拟机可能处于下列状态:"
+
+# 35450095449943769e4df916f2ba98d1
+#: ../../virtual_machines.rst:146
+msgid "|basic-deployment.png|"
+msgstr "|basic-deployment.png|"
+
+# 82d68697d2034dcaa1e4dd828818f3e5
+#: ../../virtual_machines.rst:148
+msgid ""
+"Once a virtual machine is destroyed, it cannot be recovered. All the "
+"resources used by the virtual machine will be reclaimed by the system. This "
+"includes the virtual machine’s IP address."
+msgstr "一旦一个虚拟机被销毁,那么它就不能被恢复。该虚拟机使用的所有资源被系统回收。其中包括虚拟机的IP地址。"
+
+# e5d85a86eec94820acffac7223216d7b
+#: ../../virtual_machines.rst:152
+msgid ""
+"A stop will attempt to gracefully shut down the operating system, which "
+"typically involves terminating all the running applications. If the "
+"operation system cannot be stopped, it will be forcefully terminated. This "
+"has the same effect as pulling the power cord to a physical machine."
+msgstr "停止操作是比较稳妥的关闭操作系统的方式,因为这样做能正常的关闭所有正在运行的应用程序。如果操作系统不能被停止,才要强制关闭它。这么做跟拔掉物理机器的电源线是一个效果。"
+
+# 3262f9ef48524241b39ab24f50027665
+#: ../../virtual_machines.rst:158
+msgid "A reboot is a stop followed by a start."
+msgstr "重启是关机再开机的过程。"
+
+# 9fd4ac9dadd4498aba1893ab9ff67b37
+#: ../../virtual_machines.rst:160
+msgid ""
+"CloudStack preserves the state of the virtual machine hard disk until the "
+"machine is destroyed."
+msgstr "CloudStack会保存虚机硬盘的状态直到它被销毁。"
+
+# 225f316ae08b45c9af659bb8052ff60e
+#: ../../virtual_machines.rst:163
+msgid ""
+"A running virtual machine may fail because of hardware or network issues. A "
+"failed virtual machine is in the down state."
+msgstr "正在运行的虚机可能会因为硬件或者网络故障而出现问题。出现问题的虚机是down状态。"
+
+# c87832d0da9849c99bb576cdc028a417
+#: ../../virtual_machines.rst:166
+msgid ""
+"The system places the virtual machine into the down state if it does not "
+"receive the heartbeat from the hypervisor for three minutes."
+msgstr "如果系统在三分钟内收不到hypervisor的心跳信号,那么它就会将虚机切换至down状态。"
+
+# 38f2875d662c4c31b795e48e5666cdb5
+#: ../../virtual_machines.rst:169
+msgid "The user can manually restart the virtual machine from the down state."
+msgstr "用户能够手动从down状态下重启虚机。"
+
+# f36a208dc3c04defb09639b1fc2c9ffa
+#: ../../virtual_machines.rst:171
+msgid ""
+"The system will start the virtual machine from the down state automatically "
+"if the virtual machine is marked as HA-enabled."
+msgstr "如果虚机被标记上启用了HA,那么系统会自动地重启down状态中的虚机。"
+
+# 435b7bc89e044825854f8238d54cd95c
+#: ../../virtual_machines.rst:175
+msgid "Creating VMs"
+msgstr "创建VMs"
+
+# 90596cf453df41bea97abf4d26b55b9e
+#: ../../virtual_machines.rst:177
+msgid ""
+"Virtual machines are usually created from a template. Users can also create "
+"blank virtual machines. A blank virtual machine is a virtual machine without"
+" an OS template. Users can attach an ISO file and install the OS from the CD"
+"/DVD-ROM."
+msgstr "虚拟机通常是从模板创建的。用户也能创建空白虚拟机。空白虚拟机就是一个重新安装的操作系统。用户可以通过CD/DVD-ROM加载ISO文件安装。"
+
+# 89062b64f78c473bb4f095089a47a3e8
+#: ../../virtual_machines.rst:183
+msgid ""
+"You can create a VM without starting it. You can determine whether the VM "
+"needs to be started as part of the VM deployment. A request parameter, "
+"startVM, in the deployVm API provides this feature. For more information, "
+"see the Developer's Guide."
+msgstr "你可以创建一个VM,但不要启动它。你来决定此VM是否需要作为VM部署的一部分而启动。在deployVm API里面提供了一个startVM参数,提供了这个功能。更多信息,请参考开发者指导。"
+
+# 0672247e369b4e2d946b125ca4084ed2
+#: ../../virtual_machines.rst:185
+msgid "To create a VM from a template:"
+msgstr "从模板创建一个VM。"
+
+# dbdc45137b3844029f53e2cb9d9162c6
+# 321604ea0f024536a10305764908c359
+# 7f0370ba68fe4dae844b8c30bee8233e
+# 60f232c6cc96485796b41b3a4e0e8595
+#: ../../virtual_machines.rst:189 ../../virtual_machines.rst:228
+#: ../../virtual_machines.rst:379 ../../virtual_machines.rst:426
+msgid "Log in to the CloudStack UI as an administrator or user."
+msgstr "用管理员或用户账号登录CloudStack UI。"
+
+# 17cf7cb65591426fb58ec425f5fd55d8
+# 770013bd81d74beab891f720896b414d
+# c137363adbfd4c509c5f2496508d10e3
+#: ../../virtual_machines.rst:193 ../../virtual_machines.rst:232
+#: ../../virtual_machines.rst:430
+msgid "In the left navigation bar, click Instances."
+msgstr "在左侧导航栏,点击实例"
+
+# 7d2ba36548a74ef1b9f34c832b763e04
+# f3c1e3fb075f473dafabe13193f34933
+#: ../../virtual_machines.rst:197 ../../virtual_machines.rst:236
+msgid "Click Add Instance."
+msgstr "点击添加实例。"
+
+# d0219b24a04045f995b827bd2898f2aa
+# 539be5bfcf034e2aaa08ec396700de1c
+#: ../../virtual_machines.rst:201 ../../virtual_machines.rst:240
+msgid "Select a zone."
+msgstr "选择一个区域。"
+
+# 4a5fbf9ff1ee4269a55b0c3f549a22a5
+#: ../../virtual_machines.rst:205
+msgid ""
+"Select a template, then follow the steps in the wizard. For more information"
+" about how the templates came to be in this list, see `*Working with "
+"Templates* <templates.html>`_."
+msgstr "选择一个模板,然后按照向导中的步骤操作。更多关于如何上传模板的更多信息,请参考`*使用模板* <templates.html>`_。"
+
+# f131286995d64c42ac059085f726ae06
+#: ../../virtual_machines.rst:211
+msgid ""
+"Be sure that the hardware you have allows starting the selected service "
+"offering."
+msgstr "确认​你​的​硬​件​设​备​满足​运​行​所​选​的​服​务条件。"
+
+# edf69164fb0c47cb865ec5cbff2aa54e
+# 4068a900b1d144749c414fd49b63db55
+#: ../../virtual_machines.rst:216 ../../virtual_machines.rst:248
+msgid "Click Submit and your VM will be created and started."
+msgstr "点击提交,你的VM就会被创建并启动。"
+
+# f14fe68cb6e646b49647dfb709dffe56
+#: ../../virtual_machines.rst:219
+msgid ""
+"For security reason, the internal name of the VM is visible only to the root"
+" admin."
+msgstr "出于安全原因,VM的内部名称仅root管理员可见。"
+
+# c7f29a0e0eca4b1fa04ae333390ec922
+#: ../../virtual_machines.rst:221
+msgid "To create a VM from an ISO:"
+msgstr "从ISO创建虚拟机:"
+
+# 9802d38bcbeb44faad59f0c6b4dd425f
+#: ../../virtual_machines.rst:224
+msgid ""
+"(XenServer) Windows VMs running on XenServer require PV drivers, which may "
+"be provided in the template or added after the VM is created. The PV drivers"
+" are necessary for essential management functions such as mounting "
+"additional volumes and ISO images, live migration, and graceful shutdown."
+msgstr "(XenServer)XXenServer上运行的Windows VMs需要安装PV驱动,它可能在模板中或在创建完VM后添加。PV驱动对于基本的管理功能是必要的,比如挂载额外的卷和ISO镜像、在线迁移和正常关机。"
+
+# f11205e9a0634c1990bc69a94b684091
+#: ../../virtual_machines.rst:244
+msgid "Select ISO Boot, and follow the steps in the wizard."
+msgstr "选择ISO启动,然后按照向导中的步骤进行操作。"
+
+# 162cd4c1933b48c4a8e5a41c7ec37a5e
+#: ../../virtual_machines.rst:251
+msgid "Accessing VMs"
+msgstr "访问VMs"
+
+# 1c1e1a7cc847480488dea9931bd3ffd6
+#: ../../virtual_machines.rst:253
+msgid ""
+"Any user can access their own virtual machines. The administrator can access"
+" all VMs running in the cloud."
+msgstr "任​何​用​户​都可​以​访​问​他​们​自​己​的​虚​拟​机​。​管​理​员​能​够​访​问​在​云​中​运​行​的​所​有​虚​拟​机​。"
+
+# 582b288bbc8d448daa35ab6398edd5b6
+# 63c33ffacebf44328922949b1d62e681
+#: ../../virtual_machines.rst:256 ../../virtual_machines.rst:657
+msgid "To access a VM through the CloudStack UI:"
+msgstr "通过CloudStack UI访问VM:"
+
+# 7966ee7c12414472976feb432099fd1e
+# cc969f07182e4a4f825bb39d784326e2
+# 717a93d287eb42e799e3246945610dee
+# 7eedbf3ba193494f952fae4200c0bb8a
+# c5992eae3ce542a287bec2ab940ce661
+#: ../../virtual_machines.rst:260 ../../virtual_machines.rst:661
+#: ../../virtual_machines.rst:741 ../../virtual_machines.rst:970
+#: ../../virtual_machines.rst:1007
+msgid "Log in to the CloudStack UI as a user or admin."
+msgstr "使用用户或管理员登录到CloudStack用户界面。"
+
+# 1bad53cc506643b4afa9f2f32d5c84df
+#: ../../virtual_machines.rst:264
+msgid "Click Instances, then click the name of a running VM."
+msgstr "点击实例,然后点击运行VM的名字。"
+
+# ea61544613854ab98f0c7eaee19319b4
+#: ../../virtual_machines.rst:268
+msgid "Click the View Console button |console-icon.png|."
+msgstr "点击查看控制台按钮 |console-icon.png|。"
+
+# 7ee1f849247e4736b77106c631e33767
+#: ../../virtual_machines.rst:270
+msgid "To access a VM directly over the network:"
+msgstr "通过网络直接访问VM:"
+
+# 210aa9db3b28438cae36441f14c29e2b
+#: ../../virtual_machines.rst:274
+msgid ""
+"The VM must have some port open to incoming traffic. For example, in a basic"
+" zone, a new VM might be assigned to a security group which allows incoming "
+"traffic. This depends on what security group you picked when creating the "
+"VM. In other cases, you can open a port by setting up a port forwarding "
+"policy. See `“IP Forwarding and Firewalling” <networking2.html#ip-"
+"forwarding-and-firewalling>`_."
+msgstr "VM必须开通相关端口以便外部访问。比如,在基础zone中,新的VM可能被关联到一个允许流量进入的安全组。但这取决于你在创建VM的时候选择的安全组。在其他情况下,你可以通过设置端口转发策略来打开一个端口。请参考 `“IP转发及防火墙” <networking2.html#ip-forwarding-and-firewalling>`_。"
+
+# b955202d572b4eab831bf58c7ddf0290
+#: ../../virtual_machines.rst:283
+msgid ""
+"If a port is open but you can not access the VM using ssh, it’s possible "
+"that ssh is not already enabled on the VM. This will depend on whether ssh "
+"is enabled in the template you picked when creating the VM. Access the VM "
+"through the CloudStack UI and enable ssh on the machine using the commands "
+"for the VM’s operating system."
+msgstr "如果打开端口后,你仍然不能使用SSH访问VM,那么可能是VM中没有启用SSH。这取决于当你创建VM的时候选的模板是否启用了SSH。通过CloudStack UI访问VM,然后使用VM操作系统中的命令行启用SSH。"
+
+# eef15aa3610941a48b076ada83a93a76
+#: ../../virtual_machines.rst:291
+msgid ""
+"If the network has an external firewall device, you will need to create a "
+"firewall rule to allow access. See `“IP Forwarding and Firewalling” "
+"<networking2.html#ip-forwarding-and-firewalling>`_."
+msgstr "如果网络中有外部防火墙设备,你需要创建一个防火墙策略来允许访问。请参考`“IP转发及防火墙” <networking2.html#ip-forwarding-and-firewalling>`_。"
+
+# 07e9a7efad2c4aba92b7119770430d15
+#: ../../virtual_machines.rst:296
+msgid "Stopping and Starting VMs"
+msgstr "停止和启动VMs"
+
+# 3c483022f9974e77b1c3b4911b4b3ebb
+#: ../../virtual_machines.rst:298
+msgid ""
+"Once a VM instance is created, you can stop, restart, or delete it as "
+"needed. In the CloudStack UI, click Instances, select the VM, and use the "
+"Stop, Start, Reboot, and Destroy buttons."
+msgstr "一旦VM实例被创建,你可以根据需要停止、重启或删除它。在CloudStack UI里,点击实例,选择VM,然后使用停止、启动、重启和销毁按钮。"
+
+# 049108e92aae41a0bf087e70dee11846
+#: ../../virtual_machines.rst:303
+msgid "Assigning VMs to Hosts"
+msgstr "将VMs指定到主机"
+
+# dd82ff2b06c14258a8d3b8de3cf2b75f
+#: ../../virtual_machines.rst:305
+msgid ""
+"At any point in time, each virtual machine instance is running on a single "
+"host. How does CloudStack determine which host to place a VM on? There are "
+"several ways:"
+msgstr "在任何时刻,每个虚拟机实例都运行在一台主机上。CloudStack如何决定在哪个主机上放置VM呢?通常是这几种方式:"
+
+# db958d47c4e14a3bb226699150d1e382
+#: ../../virtual_machines.rst:311
+msgid ""
+"Automatic default host allocation. CloudStack can automatically pick the "
+"most appropriate host to run each virtual machine."
+msgstr "自动分配默认主机。CloudStack可以自动的选取最合适的主机来运行每个虚机。"
+
+# c02752691e62472cbdcfeb12b718e2b5
+#: ../../virtual_machines.rst:316
+msgid ""
+"Instance type preferences. CloudStack administrators can specify that "
+"certain hosts should have a preference for particular types of guest "
+"instances. For example, an administrator could state that a host should have"
+" a preference to run Windows guests. The default host allocator will attempt"
+" to place guests of that OS type on such hosts first. If no such host is "
+"available, the allocator will place the instance wherever there is "
+"sufficient physical capacity."
+msgstr "实例类型偏好设置。CloudStack管理员可以指定专门为某些特殊来宾实例做过优化的主机。比如,管理员指定为Windows来宾实例做过优化的主机。默认主机分配器会尝试将此类来宾实例运行到这些主机上。如果这些主机不够用,分配器会把实例运行在容量充足的物理机上。"
+
+# 725d3214117b4a0e84922b5aa3395e44
+#: ../../virtual_machines.rst:326
+msgid ""
+"Vertical and horizontal allocation. Vertical allocation consumes all the "
+"resources of a given host before allocating any guests on a second host. "
+"This reduces power consumption in the cloud. Horizontal allocation places a "
+"guest on each host in a round-robin fashion. This may yield better "
+"performance to the guests in some cases."
+msgstr "纵向和横向定位。纵向定位是指,在消耗完当前主机提供的所有资源的时候会将所有来宾虚机定位到第二台主机上。这会云中的节省电力成本。横向定位在每个主机上使用轮询的方式放置来宾虚机。在某些情况下这样会给来宾虚机带来更好的性能。"
+
+# 4aff1f16d00b45acab4019e0d726746f
+#: ../../virtual_machines.rst:334
+msgid ""
+"End user preferences. Users can not control exactly which host will run a "
+"given VM instance, but they can specify a zone for the VM. CloudStack is "
+"then restricted to allocating the VM only to one of the hosts in that zone."
+msgstr "最终用户偏好设置。用户不能控制VM实例运行在哪台主机上,但是他们能为VM指定区域。这样CloudStack就只能将VM分配到该区域中的主机上。"
+
+# 39bc261d5136423daceebdb26aa9c3b5
+#: ../../virtual_machines.rst:341
+msgid ""
+"Host tags. The administrator can assign tags to hosts. These tags can be "
+"used to specify which host a VM should use. The CloudStack administrator "
+"decides whether to define host tags, then create a service offering using "
+"those tags and offer it to the user."
+msgstr "主机标签。管理员可以给主机分配标签。这些标签是用来指定VM该使用哪台主机的。CloudStack管理员自己决定如何定义主机标签,然后使用这些标签创建一个服务方案来提供给用户。"
+
+# 9bf9ddb0d6134624a599dea900cf220f
+#: ../../virtual_machines.rst:348
+msgid ""
+"Affinity groups. By defining affinity groups and assigning VMs to them, the "
+"user or administrator can influence (but not dictate) which VMs should run "
+"on separate hosts. This feature is to let users specify that certain VMs "
+"won't be on the same host."
+msgstr "关联性组。依靠定义关联性组并把VMs分配给它们,用户或管理员可以影响(但不是指令)VMs运行在不同的主机上。这个功能是让用户可以规定某些VMs不会运行在同一台主机上。"
+
+# 2bf39c550ec84d32bb321b563cf38e3f
+#: ../../virtual_machines.rst:355
+msgid ""
+"CloudStack also provides a pluggable interface for adding new allocators. "
+"These custom allocators can provide any policy the administrator desires."
+msgstr "CloudStack为添加新的分配器提供了一个插件似的接口。这些自定义的分配器可以提供任何管理员想要的策略。"
+
+# 3f904a94520a464aaf183764319a1669
+#: ../../virtual_machines.rst:360
+msgid "Affinity Groups"
+msgstr "关联性组"
+
+# 1736a4811e0940b1a81a870d8894b714
+#: ../../virtual_machines.rst:362
+msgid ""
+"By defining affinity groups and assigning VMs to them, the user or "
+"administrator can influence (but not dictate) which VMs should run on "
+"separate hosts. This feature is to let users specify that VMs with the same "
+"“host anti-affinity” type won’t be on the same host. This serves to increase"
+" fault tolerance. If a host fails, another VM offering the same service (for"
+" example, hosting the user's website) is still up and running on another "
+"host."
+msgstr "依靠定义关联性组并把VMs分配给它们,用户或管理员可以影响(但不是指令)VMs运行在不同的主机上。这个功能是让用户可以规定某些VMs运行在同“host anti-affinity”类型的而非同一台主机上。这写类服务器增强了容错功能。如果一个主机出现问题,那么另一个提供同样服务的VM(比如,运行用户的网站)依然在别的主机上运行。"
+
+# 53fbff90dbfe4378912bdce947f6360c
+#: ../../virtual_machines.rst:370
+msgid "The scope of an affinity group is per user account."
+msgstr "一个关联性组的作用域是针对每个用户账号的。"
+
+# f21a6c3edcb943709a5fd18034689340
+#: ../../virtual_machines.rst:373
+msgid "Creating a New Affinity Group"
+msgstr "创建一个新的关联性组"
+
+# 952aa2be921548eca8c72a16351e18aa
+#: ../../virtual_machines.rst:375
+msgid "To add an affinity group:"
+msgstr "要添加一个关联性组:"
+
+# b4788a23606446a28d9e54f23baa1d0a
+# 9979d59417b340e4a9ccbe5403d7ac69
+# 30711cca7fee42eea38e1ce82da4c842
+#: ../../virtual_machines.rst:383 ../../virtual_machines.rst:452
+#: ../../virtual_machines.rst:472
+msgid "In the left navigation bar, click Affinity Groups."
+msgstr "在左侧的导航条,点击关联性组。"
+
+# cc4ced2fb2cb407692a1ee70f26a589d
+#: ../../virtual_machines.rst:387
+msgid ""
+"Click Add affinity group. In the dialog box, fill in the following fields:"
+msgstr "点击添加关联性组。在对话框中的下列区域中输入:"
+
+# 7f6afe679e8146c98f7d6df960d9ea71
+#: ../../virtual_machines.rst:392
+msgid "Name. Give the group a name."
+msgstr "名称。组的名称。"
+
+# 3203d032a77d455483907eb99dad9f4e
+#: ../../virtual_machines.rst:396
+msgid ""
+"Description. Any desired text to tell more about the purpose of the group."
+msgstr "描述。给出更多关于这个组的说明。"
+
+# f0132b06c21a4ccf96e0e405288b2f01
+#: ../../virtual_machines.rst:401
+msgid ""
+"Type. The only supported type shipped with CloudStack is Host Anti-Affinity."
+" This indicates that the VMs in this group should avoid being placed on the "
+"same VM with each other. If you see other types in this list, it means that "
+"your installation of CloudStack has been extended with customized affinity "
+"group plugins."
+msgstr "类型。仅仅支持CloudStack附带的Host Anti-Affinity。这表明了在此组中的VMs不会在同一台主机上。如果你在此列表中看见其他类型,它意味着你安装的CloudStack中有其他自定义的关联性组。"
+
+# 68888c95236b4de6989162419f0b4d05
+#: ../../virtual_machines.rst:409
+msgid "Assign a New VM to an Affinity Group"
+msgstr "将一个新的VM分配给一个关联性组"
+
+# a7f949c20a7c4f7f92c6c36d19462f79
+#: ../../virtual_machines.rst:411
+msgid "To assign a new VM to an affinity group:"
+msgstr "要将一个新的VM分配给一个关联性组:"
+
+# b9be84f061894a848f0963c9c1a9b762
+#: ../../virtual_machines.rst:415
+msgid ""
+"Create the VM as usual, as described in `“Creating VMs” "
+"<virtual_machines.html#creating-vms>`_. In the Add Instance wizard, there is"
+" a new Affinity tab where you can select the affinity group."
+msgstr "如何创建VM,在 `“Creating VMs” <virtual_machines.html#creating-vms>`_中有描述。在添加实例向导中,有一个新的关联性组标签,你可以选择关联性组。"
+
+# 60d469cdf8b345b6bbccde8cea1c500d
+#: ../../virtual_machines.rst:420
+msgid "Change Affinity Group for an Existing VM"
+msgstr "给已有的VM更改关联性组"
+
+# 72f9a8cbe55f459c8e234d4829094f58
+#: ../../virtual_machines.rst:422
+msgid "To assign an existing VM to an affinity group:"
+msgstr "要将已有的VM添加到关联性组:"
+
+# 2f2bed0782f840c0ae1f2403e67b0119
+#: ../../virtual_machines.rst:434
+msgid "Click the name of the VM you want to work with."
+msgstr "点击你想更改的VM的名称。"
+
+# 1be9c0b8187d462099baa414f292414f
+#: ../../virtual_machines.rst:438
+msgid "Stop the VM by clicking the Stop button."
+msgstr "点击停止按钮,将此VM关机。"
+
+# 9934a272aed044e1be6519701136b0f3
+#: ../../virtual_machines.rst:442
+msgid "Click the Change Affinity button. |change-affinity-button.png|"
+msgstr "点击变更关联性组按钮。 |change-affinity-button.png|"
+
+# 107b608573824f32b25733aa1be35a61
+#: ../../virtual_machines.rst:446
+msgid "View Members of an Affinity Group"
+msgstr "查看关联性组的成员"
+
+# 39aa367909e247d9b7dda5e00fdc11d1
+#: ../../virtual_machines.rst:448
+msgid ""
+"To see which VMs are currently assigned to a particular affinity group:"
+msgstr "要查看当前哪些VMs被分配到指定的关联性组:"
+
+# c6ff79b2977f4780bba8d89d2939d6d7
+# 528c4e24d64c40b782c2f097045479bd
+#: ../../virtual_machines.rst:456 ../../virtual_machines.rst:476
+msgid "Click the name of the group you are interested in."
+msgstr "点击要查看的组的名称。"
+
+# cd9344db1a7845e2ac6db8ae1b9cdce8
+#: ../../virtual_machines.rst:460
+msgid "Click View Instances. The members of the group are listed."
+msgstr "点击查看实例。组的成员会列在此处。"
+
+# c8e598a21aa9411993a3e9d98098f792
+#: ../../virtual_machines.rst:462
+msgid ""
+"From here, you can click the name of any VM in the list to access all its "
+"details and controls."
+msgstr "在这里,你可以点击列表中任何VM的名称来访问它所有的详细信息并控制它。"
+
+# bc6253fed6ef4ad9b34d66377fac822d
+#: ../../virtual_machines.rst:466
+msgid "Delete an Affinity Group"
+msgstr "删除一个关联性组"
+
+# 705ed7f11fa2492aa4f12cb7c3b83a33
+#: ../../virtual_machines.rst:468
+msgid "To delete an affinity group:"
+msgstr "要删除关联性组:"
+
+# 26faa61c5e374823a212c9ef948eaab7
+#: ../../virtual_machines.rst:480
+msgid "Click Delete."
+msgstr "点击删除。"
+
+# e080c219cee941d2a3bd9afa644b52a0
+#: ../../virtual_machines.rst:482
+msgid ""
+"Any VM that is a member of the affinity group will be disassociated from the"
+" group. The former group members will continue to run normally on the "
+"current hosts, but if the VM is restarted, it will no longer follow the host"
+" allocation rules from its former affinity group."
+msgstr "任何属于关联性组的VM都会被踢出此组。之前组里的成员会继续在当前主机上正常的运行,但是如果VM重启了,它就不再按照之前关联性组的主机分配策略。"
+
+# 96f9f97fd07a401ca04a60cc43e9ddf7
+#: ../../virtual_machines.rst:489
+msgid "Virtual Machine Snapshots"
+msgstr "虚拟机快照"
+
+# c64deb2f10e54c858148630c5d08c79d
+# 1cd91ec4adb3485cbef7eb7ad8a345e9
+#: ../../virtual_machines.rst:491 ../../virtual_machines.rst:777
+msgid "(Supported on VMware and XenServer)"
+msgstr "(支持XenServer、KVM和VMware)"
+
+# 9f988407b4244ebd939a738c3e1171a4
+#: ../../virtual_machines.rst:493
+msgid ""
+"In addition to the existing CloudStack ability to snapshot individual VM "
+"volumes, you can take a VM snapshot to preserve all the VM's data volumes as"
+" well as (optionally) its CPU/memory state. This is useful for quick restore"
+" of a VM. For example, you can snapshot a VM, then make changes such as "
+"software upgrades. If anything goes wrong, simply restore the VM to its "
+"previous state using the previously saved VM snapshot."
+msgstr "利用CloudStack的VM卷快照功能,你可以对VM做快照像保存它的CPU/内存状态一样保护VM的数据卷(可选的)。这对快速还原一个VM来说是非常有用的。比如,你可以对一个VM做快照,然后做了一些像软件升级的操作。如果期间有问题出现,使用之前保存的VM快照就可以将VM恢复到之前的状态了。"
+
+# 297acbf3278b49e3aebcdb2d625a42c9
+#: ../../virtual_machines.rst:501
+msgid ""
+"The snapshot is created using the hypervisor's native snapshot facility. The"
+" VM snapshot includes not only the data volumes, but optionally also whether"
+" the VM is running or turned off (CPU state) and the memory contents. The "
+"snapshot is stored in CloudStack's primary storage."
+msgstr "快照的创建使用的是 hypervisor本地快照工具。VM快照不但包括数据卷还可选择性的包括VM的运行或关机时(CPU状态)和内存内容的状态。快照保存在CloudStack的主存储里。"
+
+# b2c35dd49ee449fe89b52c9e65cdca77
+#: ../../virtual_machines.rst:506
+msgid ""
+"VM snapshots can have a parent/child relationship. Each successive snapshot "
+"of the same VM is the child of the snapshot that came before it. Each time "
+"you take an additional snapshot of the same VM, it saves only the "
+"differences between the current state of the VM and the state stored in the "
+"most recent previous snapshot. The previous snapshot becomes a parent, and "
+"the new snapshot is its child. It is possible to create a long chain of "
+"these parent/child snapshots, which amount to a \"redo\" record leading from"
+" the current state of the VM back to the original."
+msgstr "VM快照存在父/子关系。同一个VM的每次快照都是之前快照的子级。每次你对同一VM追加的快照,它仅仅保存两次快照之间系统状态差异。之前的快照变成父级,新的快照变成子级。它可能对这些父/子快照创建一个长链,它实际上是一个从当前的VM状态还原到之前的\"还原\"记录。"
+
+# b05ac4e6c37441b2bdf0604ab2728763
+#: ../../virtual_machines.rst:516
+msgid ""
+"If you need more information about VM snapshots on VMware, check out the "
+"VMware documentation and the VMware Knowledge Base, especially "
+"`Understanding virtual machine snapshots "
+"<http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180>`_."
+msgstr "如果你需要了解更多关于VMware的VM快照,请转去VMware文档中心和VMwareBK库,查找 `了解虚拟机的快照-英文 <http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180>`_、`了解虚拟机的快照-中文<http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=2075429>`_。"
+
+# d5a9dd1a0e4f4d38ae6043e7107cef55
+#: ../../virtual_machines.rst:522
+msgid "Limitations on VM Snapshots"
+msgstr "VM快照的限制"
+
+# 480356d265c44ccc955e6ec4d6b996a0
+#: ../../virtual_machines.rst:526
+msgid ""
+"If a VM has some stored snapshots, you can't attach new volume to the VM or "
+"delete any existing volumes. If you change the volumes on the VM, it would "
+"become impossible to restore the VM snapshot which was created with the "
+"previous volume structure. If you want to attach a volume to such a VM, "
+"first delete its snapshots."
+msgstr "如果一个VM存储了一些快照,你就不能给他附加新卷或删除存在的卷。如果你更改了VM的卷,他将不能通过之前卷结构下所做快照来进行恢复。如果你想给这样一个VM附加卷,请先删除快照。"
+
+# e0539e9e649742e791fe86f92cf42c59
+#: ../../virtual_machines.rst:534
+msgid ""
+"VM snapshots which include both data volumes and memory can't be kept if you"
+" change the VM's service offering. Any existing VM snapshots of this type "
+"will be discarded."
+msgstr "如果你更改了VM的服务方案,那么包含了数据卷和内存的VM快照就不能保留了,任何已有的此类型的VM快照都将被丢弃。"
+
+# af92c31e2cf54c6d93375e9b3b69359a
+#: ../../virtual_machines.rst:540
+msgid ""
+"You can't make a VM snapshot at the same time as you are taking a volume "
+"snapshot."
+msgstr "你不能同时对VM在做卷快照和VM快照。"
+
+# 51e49b30ae8e4501b16ef50f39f5c97b
+#: ../../virtual_machines.rst:545
+msgid ""
+"You should use only CloudStack to create VM snapshots on hosts managed by "
+"CloudStack. Any snapshots that you make directly on the hypervisor will not "
+"be tracked in CloudStack."
+msgstr "你只能使用CloudStack来创建其管理的主机上的VM快照。你在hypervisor上直接创建的任何快照都不能被CloudStack识别。"
+
+# 33b02b024ce6425e827df49595c4f880
+#: ../../virtual_machines.rst:550
+msgid "Configuring VM Snapshots"
+msgstr "配置VM快照"
+
+# 438a0db0ad7f45dbbb046cbe9560f821
+#: ../../virtual_machines.rst:552
+msgid ""
+"The cloud administrator can use global configuration variables to control "
+"the behavior of VM snapshots. To set these variables, go through the Global "
+"Settings area of the CloudStack UI."
+msgstr "云管理员可以使用全局配置变量来控制VM快照的行为。要设置这些变量,移步至CloudStack UI中的全局设置。"
+
+# 8ab6bf4420be492e9639c233e77c6a0c
+#: ../../virtual_machines.rst:556
+msgid "Configuration Setting Name"
+msgstr "配置设置名"
+
+# e5c65267d46a46588873cedef9381210
+#: ../../virtual_machines.rst:558
+msgid "Description"
+msgstr "描述"
+
+# a7756869a2d7450fa6c00d59471d65a9
+#: ../../virtual_machines.rst:560
+msgid "vmsnapshots.max"
+msgstr "vmsnapshots.max"
+
+# 6b59688572f44a4084dee840e8cb92ab
+#: ../../virtual_machines.rst:562
+msgid ""
+"The maximum number of VM snapshots that can be saved for any given virtual "
+"machine in the cloud. The total possible number of VM snapshots in the cloud"
+" is (number of VMs) \\* vmsnapshots.max. If the number of snapshots for any "
+"VM ever hits the maximum, the older ones are removed by the snapshot expunge"
+" job."
+msgstr "云中虚拟机能够保存快照的最大数。 (number of VMs) \\* vmsnapshots.max是云中VM快照的总共可能数量。如果任何一个VM的快照数达到了最大值,那么快照删除任务会把最老的快照删掉。"
+
+# 315e15f035d34660bf6c75e32f80bbf8
+#: ../../virtual_machines.rst:568
+msgid "vmsnapshot.create.wait"
+msgstr "vmsnapshot.create.wait"
+
+# 6c9f1eb1eee34263828e3616bc01b765
+#: ../../virtual_machines.rst:570
+msgid ""
+"Number of seconds to wait for a snapshot job to succeed before declaring "
+"failure and issuing an error."
+msgstr "在提示失败和发生错误之前快照工作为了成功的做快照而等待的秒数。"
+
+# 0a1f1d071bd5411aa41ed07db298dbd7
+#: ../../virtual_machines.rst:574
+msgid "Using VM Snapshots"
+msgstr "是用VM的快照"
+
+# 1012a83b75ba4980ade5783df566d171
+#: ../../virtual_machines.rst:576
+msgid "To create a VM snapshot using the CloudStack UI:"
+msgstr "是用CloudStack UI创建一个VM快照:"
+
+# 33a990587dc74ae3a44b7680873a280a
+#: ../../virtual_machines.rst:580
+msgid "Log in to the CloudStack UI as a user or administrator."
+msgstr "是用用户或者管理员登录CloudStack。"
+
+# 2c71edf0fbcf41d7b5cf19ccb31a2d8f
+#: ../../virtual_machines.rst:584
+msgid "Click Instances."
+msgstr "点击实例。"
+
+# f0d034c90731414caf988c6b39daa3a4
+#: ../../virtual_machines.rst:588
+msgid "Click the name of the VM you want to snapshot."
+msgstr "点击你想做快照的VM名称。"
+
+# cef255aa1bbf427eb67c09e57661c074
+#: ../../virtual_machines.rst:592
+msgid "Click the Take VM Snapshot button. |VMSnapshotButton.png|"
+msgstr "点击抓取VM快照按钮。 |VMSnapshotButton.png|"
+
+# 91d86429adfe4fafa6557ac8fe9a4ebe
+#: ../../virtual_machines.rst:594
+msgid ""
+"If a snapshot is already in progress, then clicking this button will have no"
+" effect."
+msgstr "如果一个快照处理过程正在进行,那么点击这个按钮是没有反应的。"
+
+# 0370dff77dde4e72adf2a67b45e8149c
+#: ../../virtual_machines.rst:598
+msgid ""
+"Provide a name and description. These will be displayed in the VM Snapshots "
+"list."
+msgstr "提供一个名称和秒数。这些会显示在VM快照列表中。"
+
+# 855867a6500d429293ee8ebbcd75c9df
+#: ../../virtual_machines.rst:603
+msgid ""
+"(For running VMs only) If you want to include the VM's memory in the "
+"snapshot, click the Memory checkbox. This saves the CPU and memory state of "
+"the virtual machine. If you don't check this box, then only the current "
+"state of the VM disk is saved. Checking this box makes the snapshot take "
+"longer."
+msgstr "(仅限运行中的VMs)如果你想在快照中包含VM的内存状态,请勾选内存。这可以保存虚拟机的CPU和内存状态。如果你不勾选这个选项,那么只有VM目前磁盘状态会被保存。勾选了这个选项会让快照过程变长。"
+
+# 555b611b1cd247a2996216ce643b91fd
+#: ../../virtual_machines.rst:611
+msgid ""
+"Quiesce VM: check this box if you want to quiesce the file system on the VM "
+"before taking the snapshot. Not supported on XenServer when used with "
+"CloudStack-provided primary storage."
+msgstr "静止VM:如果你想在做快照之前让VM的文件系统处于静止状态,请勾选此选项。使用CloudStack提供的主存储的XenServer环境不受支持。"
+
+# 8e99f68110884748840edd18ab5dd2e6
+#: ../../virtual_machines.rst:615
+msgid ""
+"When this option is used with CloudStack-provided primary storage, the "
+"quiesce operation is performed by the underlying hypervisor (VMware is "
+"supported). When used with another primary storage vendor's plugin, the "
+"quiesce operation is provided according to the vendor's implementation."
+msgstr "当这个选项在CloudStack提供的主存储中使用了,那么静止操作是由底层的hypervisor完成的(VMware支持)。当使用了其他主存储提供商的插件,静止操作是由其提供商的软件完成的,"
+
+# 64c731c2d39b45c2a9bda67514d23efd
+# a9ac563a0811423d904a5107ca94c503
+# 591146dd0e264c80b6464b88ca9357c3
+# dec56daa0b3542fbb8341e07033e9665
+# 3636f9c70f554023be95dc5ac236d8df
+#: ../../virtual_machines.rst:623 ../../virtual_machines.rst:770
+#: ../../virtual_machines.rst:994 ../../virtual_machines.rst:1177
+#: ../../virtual_machines.rst:1212
+msgid "Click OK."
+msgstr "点击确定。"
+
+# 8b2f4e3ab42c4ecca13a79bdeda7aef4
+#: ../../virtual_machines.rst:625
+msgid ""
+"To delete a snapshot or restore a VM to the state saved in a particular "
+"snapshot:"
+msgstr "要删除一个快照或者还原VM的状态到指定的一个快照:"
+
+# 100fcc6b769847daadd44b81deb01660
+#: ../../virtual_machines.rst:630
+msgid "Navigate to the VM as described in the earlier steps."
+msgstr "通过之前描述的步骤定位至VM。"
+
+# b42bf19ec7fe4d348bb9896919e99d7e
+#: ../../virtual_machines.rst:634
+msgid "Click View VM Snapshots."
+msgstr "点击查看VM快照。"
+
+# 116e22cf4bbc46f583ec19afc7a83234
+#: ../../virtual_machines.rst:638
+msgid ""
+"In the list of snapshots, click the name of the snapshot you want to work "
+"with."
+msgstr "在快照列表中,点击你要操作的快照名字。"
+
+# 9680e9db4d1d45e0a4f1355162d48d87
+#: ../../virtual_machines.rst:643
+msgid "Depending on what you want to do:"
+msgstr "取决于你想做什么:"
+
+# cc915de819194759a4730b1596fd0f45
+#: ../../virtual_machines.rst:645
+msgid "To delete the snapshot, click the Delete button. |delete-button.png|"
+msgstr "要删除快照,点击删除按钮。 |delete-button.png|"
+
+# 5720d90a77164d1c9b47a6e4d6493f58
+#: ../../virtual_machines.rst:647
+msgid "To revert to the snapshot, click the Revert button. |revert-vm.png|"
+msgstr "要还原至此快照,点击还原按钮。 |revert-vm.png|"
+
+# 1eb4b6de42fc4a958c571bddd6fdf4af
+#: ../../virtual_machines.rst:649
+msgid ""
+"VM snapshots are deleted automatically when a VM is destroyed. You don't "
+"have to manually delete the snapshots in this case."
+msgstr "当VM被销毁了,那么它的快照也会被自动的删除。这种情况下,你不用手动的去删除快照。"
+
+# bf0cbd9990334eb78c0a68b58fd55949
+#: ../../virtual_machines.rst:652
+msgid "Changing the VM Name, OS, or Group"
+msgstr "更改VM名字,OS或组"
+
+# bb3f878a35cd400eb4dbc5590833c6a4
+#: ../../virtual_machines.rst:654
+msgid ""
+"After a VM is created, you can modify the display name, operating system, "
+"and the group it belongs to."
+msgstr "在VM被创建之后,你可以修改显示名,操作系统和它所属的组。"
+
+# 3c79485483a24041b1a63ff8c4962455
+# 26a8095e2378453aae012204e61d5012
+# 892ab93158c6470293b350d2c1a1683b
+# 7292d4056be84a7da4271b3efcf751eb
+# 74da77f007b54413b23a8cf4c355ea97
+#: ../../virtual_machines.rst:665 ../../virtual_machines.rst:745
+#: ../../virtual_machines.rst:974 ../../virtual_machines.rst:1011
+#: ../../virtual_machines.rst:1196
+msgid "In the left navigation, click Instances."
+msgstr "在左侧的导航菜单中,点击实例。"
+
+# b3c44fd119fd4d3ca4a21c70c141006b
+#: ../../virtual_machines.rst:669
+msgid "Select the VM that you want to modify."
+msgstr "选择你想修改的VM。"
+
+# cd5efcab714940198a37940b533fb83e
+# b98ba035b8fe4339955221cfa626e541
+#: ../../virtual_machines.rst:673 ../../virtual_machines.rst:756
+msgid "Click the Stop button to stop the VM. |StopButton.png|"
+msgstr "点击停止按钮来关闭虚机。 |StopButton.png|"
+
+# 2c56bc69a7b441e9a866eb6c9a2cc8ad
+#: ../../virtual_machines.rst:677
+msgid "Click Edit. |EditButton.png|"
+msgstr "点击编辑。 |EditButton.png|"
+
+# c532542833a74aff9cb5d19bfb2fa261
+#: ../../virtual_machines.rst:681
+msgid "Make the desired changes to the following:"
+msgstr "更改以下几项为所需要的:"
+
+# bc23e5df14ed483584bea8c0150a484c
+#: ../../virtual_machines.rst:685
+msgid ""
+"**Display name**: Enter a new display name if you want to change the name of"
+" the VM."
+msgstr "**显示名**:如果你想更改VM的名字,那么输入一个新的显示名。"
+
+# 7afcc727427d45fe96e478ea446336a0
+#: ../../virtual_machines.rst:690
+msgid "**OS Type**: Select the desired operating system."
+msgstr "**OS类型**:选择所需的操作系统。"
+
+# abbc86a92d4444ed9f7b9b2357baa1be
+#: ../../virtual_machines.rst:694
+msgid "**Group**: Enter the group name for the VM."
+msgstr "**组**:输入VM的组名。"
+
+# dd76abfa5c964108a6c9230c9fbcd606
+# 415be7be9d294588a419692258b1ba1a
+#: ../../virtual_machines.rst:698 ../../virtual_machines.rst:846
+msgid "Click Apply."
+msgstr "点击应用"
+
+# bfc324b750b049169c4a90709c8f6fe5
+#: ../../virtual_machines.rst:701
+msgid "Appending a Display Name to the Guest VM’s Internal Name"
+msgstr "给来宾VM的内部名称附加显示名"
+
+# 3fdb1ec3e9ca4ab2bed35e0b9d0fc31d
+#: ../../virtual_machines.rst:703
+msgid ""
+"Every guest VM has an internal name. The host uses the internal name to "
+"identify the guest VMs. CloudStack gives you an option to provide a guest VM"
+" with a display name. You can set this display name as the internal name so "
+"that the vCenter can use it to identify the guest VM. A new global "
+"parameter, vm.instancename.flag, has now been added to achieve this "
+"functionality."
+msgstr "每个来宾VM都有一个内部名称。主机使用内部名称来识别来宾VMs。CloudStack为来宾VM提供了一个关于显示名的选项。你可以设置显示名作为内部名称以便vCenter可以使用它来识别来宾VM。vm.instancename.flag作为一个新的全局参数,已被添加用来实现此功能。"
+
+# 70ebc8d7fb524bba80935443c9bb5a38
+#: ../../virtual_machines.rst:710
+msgid ""
+"The default format of the internal name is "
+"i-<user\\_id>-<vm\\_id>-<instance.name>, where instance.name is a global "
+"parameter. However, If vm.instancename.flag is set to true, and if a display"
+" name is provided during the creation of a guest VM, the display name is "
+"appended to the internal name of the guest VM on the host. This makes the "
+"internal name format as i-<user\\_id>-<vm\\_id>-<displayName>. The default "
+"value of vm.instancename.flag is set to false. This feature is intended to "
+"make the correlation between instance names and internal names easier in "
+"large data center deployments."
+msgstr "默认的内部名称的格式是 i-<user\\_id>-<vm\\_id>-<instance.name>,这里instance.name是全局参数。但是,如果vm.instancename.flag被设置为true,并且来宾VM在创建的过程中提供了显示名,那么显示名就会被附加至该主机的来宾VM的内部名称上。这样就使得内部名称的格式类似于 i-<user\\_id>-<vm\\_id>-<displayName>。vm.instancename.flag的默认值被设置为false。这个功能可以比较容易的在大型数据中心的部署中表示实例名和内部名之间的相互关系。"
+
+# e7dcf9ff2ede40e7ad88cc9d45558874
+#: ../../virtual_machines.rst:720
+msgid ""
+"The following table explains how a VM name is displayed in different "
+"scenarios."
+msgstr "下面的表格解释了不同场景下VM的名称是如何显示的。"
+
+# a9e2bf46d7c346d8af293ad73c2e684a
+#: ../../virtual_machines.rst:724
+msgid "User-Provided Display Name"
+msgstr "用户提供的显示名"
+
+# fee0cd8b1fe4487d8c082ef34a9fc968
+#: ../../virtual_machines.rst:724
+msgid "vm.instancename.flag"
+msgstr "vm.instancename.flag"
+
+# 0802a64909d3466191c2bad24ec8bbe9
+#: ../../virtual_machines.rst:724
+msgid "Hostname on the VM"
+msgstr "VM的主机名"
+
+# 431d32ea296544f9b8e951dcc7988ec1
+#: ../../virtual_machines.rst:724
+msgid "Name on vCenter"
+msgstr "vCenter中的名称"
+
+# adc50a465cb94885ae79c571546e7570
+#: ../../virtual_machines.rst:724
+msgid "Internal Name"
+msgstr "内部名称"
+
+# 3dc225bc98dd447ba275ccc6b1fc3c4a
+# b100851adac24eb6b9b6159a2f934f7e
+#: ../../virtual_machines.rst:726 ../../virtual_machines.rst:728
+msgid "Yes"
+msgstr "支持"
+
+# f51d73dfb1b149be9803bf629bd5adaa
+# be1874026cab4afd8a1717bf4a88618b
+#: ../../virtual_machines.rst:726 ../../virtual_machines.rst:727
+msgid "True"
+msgstr "True"
+
+# 003ebc1da3174970bb1750546ae5ce4a
+# ce3520ca7d684836aff5c98244992ba2
+#: ../../virtual_machines.rst:726 ../../virtual_machines.rst:728
+msgid "Display name"
+msgstr "显示名"
+
+# 5838c808f46141f0bb3d0ec56b725f2b
+# 0148868b3e774a4db0afb05287ebc1ff
+#: ../../virtual_machines.rst:726 ../../virtual_machines.rst:726
+msgid "i-<user\\_id>-<vm\\_id>-displayName"
+msgstr "i-<user\\_id>-<vm\\_id>-displayName"
+
+# b2ae497e2b0642e3a4f8603ccedfe021
+# 8132948b1e674e5eb57f3d1ec76613ce
+#: ../../virtual_machines.rst:727 ../../virtual_machines.rst:729
+msgid "No"
+msgstr "不支持"
+
+# 976d1732c80e416895823f19d9ea3d33
+# 03b0a027103941e785544c80d73c35a0
+#: ../../virtual_machines.rst:727 ../../virtual_machines.rst:729
+msgid "UUID"
+msgstr "UUID"
+
+# b7cbaa66caa14d6cb52d162873d6e34a
+# 21ccfc6d8c7d48da985a9dbe38ad47f9
+# cf8e6e77c0b7410ebf9f734284ae8051
+# 491471d146974889873f5b29feab9516
+# 442b5ea91886462f8e77ec3c3fa26f73
+# f65b3aaa71f34436b30c67aa875be464
+#: ../../virtual_machines.rst:727 ../../virtual_machines.rst:727
+#: ../../virtual_machines.rst:728 ../../virtual_machines.rst:728
+#: ../../virtual_machines.rst:729 ../../virtual_machines.rst:729
+msgid "i-<user\\_id>-<vm\\_id>-<instance.name>"
+msgstr "i-<user\\_id>-<vm\\_id>-<instance.name>"
+
+# 80ad2684aaef4dd4a4c4e661b4780896
+# 772274ff3eac4e59afaed9d440dce9b4
+#: ../../virtual_machines.rst:728 ../../virtual_machines.rst:729
+msgid "False"
+msgstr "False"
+
+# c9ae081445274a4f8ed0bab875e10d91
+#: ../../virtual_machines.rst:734
+msgid "Changing the Service Offering for a VM"
+msgstr "为VM变更服务方案"
+
+# 24262c17e18946c69d73feb0f92d470a
+#: ../../virtual_machines.rst:736
+msgid ""
+"To upgrade or downgrade the level of compute resources available to a "
+"virtual machine, you can change the VM's compute offering."
+msgstr "要给虚拟机提升或降低可用计算资源的级别,你可以更改VM的计算方案。"
+
+# 5635030af83f40ecb65cccb32dc8e5d5
+#: ../../virtual_machines.rst:749
+msgid "Choose the VM that you want to work with."
+msgstr "选择你要处理的VM。"
+
+# 5f129aad75ed42008e8dfe5a33c70b3c
+#: ../../virtual_machines.rst:753
+msgid ""
+"(Skip this step if you have enabled dynamic VM scaling; see :ref:`cpu-and-"
+"memory-scaling`.)"
+msgstr "(如果你启用了动态VM扩展或缩减,请跳过此步;查看:ref:`cpu-and-memory-scaling。`)"
+
+# 7558361b218c43b6a41cab8d88ad8917
+#: ../../virtual_machines.rst:760
+msgid "Click the Change Service button. |ChangeServiceButton.png|"
+msgstr "点击更改服务按钮。 |ChangeServiceButton.png|"
+
+# e2a7b28c0ed643628721bae2c57866ad
+#: ../../virtual_machines.rst:762
+msgid "The Change service dialog box is displayed."
+msgstr "显示更改服务对话框。"
+
+# c534200b0f234e4c9bab8bde5e8870e9
+#: ../../virtual_machines.rst:766
+msgid "Select the offering you want to apply to the selected VM."
+msgstr "选择你想应用到选择的VM的方案。"
+
+# 27cc346285d64fc28e5ae5385a64ccf2
+#: ../../virtual_machines.rst:775
+msgid "CPU and Memory Scaling for Running VMs"
+msgstr "运行中VMs的CPU和内存的扩展和缩减"
+
+# 003ea8b547a9485b93e271dd28f999c7
+#: ../../virtual_machines.rst:779
+msgid ""
+"It is not always possible to accurately predict the CPU and RAM requirements"
+" when you first deploy a VM. You might need to increase these resources at "
+"any time during the life of a VM. You can dynamically modify CPU and RAM "
+"levels to scale up these resources for a running VM without incurring any "
+"downtime."
+msgstr "通常当你第一次部署VM的时候不太可能精确地预计CPU和RAM需求。你可能必须在VM的生命周期内的任何时间增加这些资源。你可以在不中断运行状态中的VM的情况下,动态的修改CPU和RAM级别来提升这些资源,、。"
+
+# 01c0085974924811b187eae6b78a7e3c
+#: ../../virtual_machines.rst:785
+msgid "Dynamic CPU and RAM scaling can be used in the following cases:"
+msgstr "动态CPU和RAM扩展和缩减能被用于一下情况:"
+
+# 31c363b5061f41f0a3d90253661544bd
+#: ../../virtual_machines.rst:789
+msgid "User VMs on hosts running VMware and XenServer."
+msgstr "运行VMware和XenServer的主机上的用户VMs。"
+
+# a5aa7ca4c88e404c856aa6e294e9d37e
+#: ../../virtual_machines.rst:793
+msgid "System VMs on VMware."
+msgstr "VMware上的系统VMs。"
+
+# a7d2cfb519ec4add81f26ea49d645daa
+#: ../../virtual_machines.rst:797
+msgid ""
+"VMware Tools or XenServer Tools must be installed on the virtual machine."
+msgstr "虚拟机上必须安装VMware Tools或者XenServer Tools。"
+
+# 2bba4d9cff7f4ba7a99dbcaf432658b8
+#: ../../virtual_machines.rst:802
+msgid ""
+"The new requested CPU and RAM values must be within the constraints allowed "
+"by the hypervisor and the VM operating system."
+msgstr "对于新的CPU和RAM大小必须在hypervisor和VM操作系统要求之内。"
+
+# dea06443628241338663ac0823265090
+#: ../../virtual_machines.rst:807
+msgid ""
+"New VMs that are created after the installation of CloudStack 4.2 can use "
+"the dynamic scaling feature. If you are upgrading from a previous version of"
+" CloudStack, your existing VMs created with previous versions will not have "
+"the dynamic scaling capability unless you update them using the following "
+"procedure."
+msgstr "在CloudStack 4.2安装完以后创建的新VMs都可以使用动态扩展和缩减功能。如果你的CloudStack是从旧版本升级而来的,其上已有的VMs不会支持动态扩展和缩减功能,除非你按照下面的过程来升级这些VM。"
+
+# f85afebe892a4ace9207f033d6491f66
+#: ../../virtual_machines.rst:814
+msgid "Updating Existing VMs"
+msgstr "升级已有VMs"
+
+# 5b1650cd938443f58757171129549956
+#: ../../virtual_machines.rst:816
+msgid ""
+"If you are upgrading from a previous version of CloudStack, and you want "
+"your existing VMs created with previous versions to have the dynamic scaling"
+" capability, update the VMs using the following steps:"
+msgstr "如果你正在升级旧版本的CloudStack,并且你还想让你的旧版本VMs拥有动态扩展和缩减能力,请使用以下步骤来升级VMs:"
+
+# e17b5670258343b49b747ee6e079d4ec
+#: ../../virtual_machines.rst:822
+msgid ""
+"Make sure the zone-level setting enable.dynamic.scale.vm is set to true. In "
+"the left navigation bar of the CloudStack UI, click Infrastructure, then "
+"click Zones, click the zone you want, and click the Settings tab."
+msgstr "确保区域级别设置enable.dynamic.scale.vm被设置为true。在CloudStack UI的左侧导航条,点击基础架构,然后点击区域,点击你要操作的区域,然后点击Settings标签。"
+
+# bee04f5bc16843af85ad08de5482bb0b
+#: ../../virtual_machines.rst:829
+msgid ""
+"Install Xen tools (for XenServer hosts) or VMware Tools (for VMware hosts) "
+"on each VM if they are not already installed."
+msgstr "在每台VM上安装Xen tools(适用于XenServer主机)或者VMware Tools(适用于VMware主机)。"
+
+# b1f2bf5ed45a4fcfa061660f0df1f283
+#: ../../virtual_machines.rst:834
+msgid "Stop the VM."
+msgstr "停止VM。"
+
+# 4d3222f75f4441acb3f7516e2d388648
+#: ../../virtual_machines.rst:838
+msgid "Click the Edit button."
+msgstr "点击编辑按钮。"
+
+# 61e90315c538406a9c315c62f747cc2e
+#: ../../virtual_machines.rst:842
+msgid "Click the Dynamically Scalable checkbox."
+msgstr "点击动态伸缩选框。"
+
+# 9aa7f5d09507405ea98a7e3a187f958b
+#: ../../virtual_machines.rst:850
+msgid "Restart the VM."
+msgstr "重启VM。"
+
+# 73d1c7490e504d2281a6892402c02e81
+#: ../../virtual_machines.rst:853
+msgid "Configuring Dynamic CPU and RAM Scaling"
+msgstr "配置动态CPU和RAM伸缩"
+
+# 05f20343444d4826bbcf7850a03ff73e
+#: ../../virtual_machines.rst:855
+msgid ""
+"To configure this feature, use the following new global configuration "
+"variables:"
+msgstr "要配置此功能,请使用下面的全局配置变量:"
+
+# 1aaa2fb09309444697b5b4bf9ef5ef75
+#: ../../virtual_machines.rst:860
+msgid ""
+"enable.dynamic.scale.vm: Set to True to enable the feature. By default, the "
+"feature is turned off."
+msgstr "enable.dynamic.scale.vm:设置为True以启用此功能。默认情况下,此功能是被关闭的。"
+
+# 52efb56d95374359815b6efedb138880
+#: ../../virtual_machines.rst:865
+msgid ""
+"scale.retry: How many times to attempt the scaling operation. Default = 2."
+msgstr "scale.retry:伸缩操作的重试次数。默认为2。"
+
+# 2ae2186e2b6e404dbd39ee8095a87bf4
+#: ../../virtual_machines.rst:869
+msgid "How to Dynamically Scale CPU and RAM"
+msgstr "如果动态伸缩CPU和RAM"
+
+# 0e93a4355ab7478e98e7505e737337d1
+#: ../../virtual_machines.rst:871
+msgid ""
+"To modify the CPU and/or RAM capacity of a virtual machine, you need to "
+"change the compute offering of the VM to a new compute offering that has the"
+" desired CPU and RAM values. You can use the same steps described above in "
+"`“Changing the Service Offering for a VM” <#changing-the-service-offering-"
+"for-a-vm>`_, but skip the step where you stop the virtual machine. Of "
+"course, you might have to create a new compute offering first."
+msgstr "要修改虚拟机的CPU和/或RAM,你必须更改VM的计算方案为你想要的。你可以按照上文中所述的同样的步骤 `“Changing the Service Offering for a VM” <#changing-the-service-offering-for-a-vm>`_,但是要跳过停止虚拟机的步骤。当然,你可能必须先创建一个新的计算方案。"
+
+# b101fbdc248247569dec5af8568168b6
+#: ../../virtual_machines.rst:879
+msgid ""
+"When you submit a dynamic scaling request, the resources will be scaled up "
+"on the current host if possible. If the host does not have enough resources,"
+" the VM will be live migrated to another host in the same cluster. If there "
+"is no host in the cluster that can fulfill the requested level of CPU and "
+"RAM, the scaling operation will fail. The VM will continue to run as it was "
+"before."
+msgstr "当你提交一个动态伸缩的请求的时候,当前主机可能会扩展资源。如果主机没有足够的资源,VM会被在线迁移至同一群集中的其他主机。如果群集中没有能满足CPU和RAM条件的主机,那么扩展操作会失败。不用担心,VM会往常一样继续运行。"
+
+# 1d09d0d96932426eaedf888c5d4bb7b3
+#: ../../virtual_machines.rst:887
+msgid "Limitations"
+msgstr "局限性"
+
+# 8df5bd609d334564a90f30f51a4a07f1
+#: ../../virtual_machines.rst:891
+msgid "You can not do dynamic scaling for system VMs on XenServer."
+msgstr "你不能为XenServer上运行的系统VMs进行动态伸缩操作。"
+
+# 2f2a3e6456674e06ace3c43636415177
+#: ../../virtual_machines.rst:895
+msgid ""
+"CloudStack will not check to be sure that the new CPU and RAM levels are "
+"compatible with the OS running on the VM."
+msgstr "CloudStack不会检查新的CPU和RAM级别是不是符合VM操作系统的要求。"
+
+# 492ccb959cfc432e88b64e8dd249b28c
+#: ../../virtual_machines.rst:900
+msgid ""
+"When scaling memory or CPU for a Linux VM on VMware, you might need to run "
+"scripts in addition to the other steps mentioned above. For more "
+"information, see `Hot adding memory in Linux (1012764) "
+"<http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1012764>`_"
+" in the VMware Knowledge Base."
+msgstr "当为VMware上运行的Linux VM扩展内存或者CPU的时候,你可能需要运行额外的脚本。更多信息,请参阅VMware知识库中的 `在Linux中热添加内存 (1012764) <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1012764>`_"
+
+# 715ff91daf224aeab90718b612d41d50
+#: ../../virtual_machines.rst:908
+msgid ""
+"(VMware) If resources are not available on the current host, scaling up will"
+" fail on VMware because of a known issue where CloudStack and vCenter "
+"calculate the available capacity differently. For more information, see "
+"`https://issues.apache.org/jira/browse/CLOUDSTACK-1809 "
+"<https://issues.apache.org/jira/browse/CLOUDSTACK-1809>`_."
+msgstr "(VMware)如果当前主机上没有可用资源,因为一个已知的问题,VMware上的虚机扩展会失败,这是因为CloudStack和vCenter计算可用容量方法的不同。更多信息,请参阅`https://issues.apache.org/jira/browse/CLOUDSTACK-1809 <https://issues.apache.org/jira/browse/CLOUDSTACK-1809>`_。"
+
+# f0f4ca2f349f499fadb1cc2a3d13b761
+#: ../../virtual_machines.rst:916
+msgid ""
+"On VMs running Linux 64-bit and Windows 7 32-bit operating systems, if the "
+"VM is initially assigned a RAM of less than 3 GB, it can be dynamically "
+"scaled up to 3 GB, but not more. This is due to a known issue with these "
+"operating systems, which will freeze if an attempt is made to dynamically "
+"scale from less than 3 GB to more than 3 GB."
+msgstr "对于运行Linux 64位和Windows 7 32位操作系统的VMs,如果VM初始分配的RAM小于3GB,那么它最大能动态的扩展到3GB。这是因为这些操作系统已知的问题,如果尝试从小于3G动态扩展至超过3G的话,操作系统会宕机。"
+
+# e5f94051809f4fdc9b73c3c2a82fda21
+#: ../../virtual_machines.rst:923
+msgid "Resetting the Virtual Machine Root Volume on Reboot"
+msgstr "在重启时重置虚拟机的Root卷"
+
+# 48d80af594204278be829b174c5a4523
+#: ../../virtual_machines.rst:925
+msgid ""
+"For secure environments, and to ensure that VM state is not persisted across"
+" reboots, you can reset the root disk. For more information, see `“Reset VM "
+"to New Root Disk on Reboot” <storage.html#reset-vm-to-new-root-disk-on-"
+"reboot>`_."
+msgstr "为安全环境和确保VM重启期间不被中断状态,你可以重置root磁盘。更多信息,请参阅 `“在重启时给VM重置一个新的Root磁盘” <storage.html#reset-vm-to-new-root-disk-on-reboot>`_。"
+
+# aa4ca1c9e6f1450b872d7b19cb306a9d
+#: ../../virtual_machines.rst:931
+msgid "Moving VMs Between Hosts (Manual Live Migration)"
+msgstr "在主机之间移动VMs(手动在线迁移)"
+
+# 991bc31743834bd285fd42664f467f3b
+#: ../../virtual_machines.rst:933
+msgid ""
+"The CloudStack administrator can move a running VM from one host to another "
+"without interrupting service to users or going into maintenance mode. This "
+"is called manual live migration, and can be done under the following "
+"conditions:"
+msgstr "CloudStack管理员可以从一个主机将运行中的VM不中断服务地移动到其他主机或者将其进入维护模式。这个过程叫手动在线迁移,要满足以下条件:"
+
+# 3155449d7c29414bb311284884f57a23
+#: ../../virtual_machines.rst:940
+msgid ""
+"The root administrator is logged in. Domain admins and users can not perform"
+" manual live migration of VMs."
+msgstr "root管理员已登录。域管理员和用户不能执行手动在线迁移操作。"
+
+# ea6b697cd1214233b579d728a08a9398
+#: ../../virtual_machines.rst:945
+msgid "The VM is running. Stopped VMs can not be live migrated."
+msgstr "VM正在运行。停止的VMs不能进行在线迁移。"
+
+# ef589ba17133433db3d1e4374fedb177
+#: ../../virtual_machines.rst:949
+msgid ""
+"The destination host must have enough available capacity. If not, the VM "
+"will remain in the \"migrating\" state until memory becomes available."
+msgstr "目标主机必须有足够的可用容量。如果没有,VM会一直停留在\"迁移中\"状态,直到有多余内存可用。"
+
+# 70e5acb9366945f3a292924549f075c5
+#: ../../virtual_machines.rst:955
+msgid ""
+"(KVM) The VM must not be using local disk storage. (On XenServer and VMware,"
+" VM live migration with local disk is enabled by CloudStack support for "
+"XenMotion and vMotion.)"
+msgstr "(KVM)VM必须不能使用本地磁盘存储。(在XenServer和VMware中,CloudStack依靠XenMotion和vMotion允许使用了本地磁盘的VM能够在线迁移。)"
+
+# ad1e58fdb03a4bda8f7cbe3509dc1b29
+#: ../../virtual_machines.rst:961
+msgid ""
+"(KVM) The destination host must be in the same cluster as the original host."
+" (On XenServer and VMware, VM live migration from one cluster to another is "
+"enabled by CloudStack support for XenMotion and vMotion.)"
+msgstr "(KVM)目标主机必须跟源主机在同一个群集。(在XenServer和VMware上,CloudStack依靠XenMotion和vMotion,允许VM从一个群集在线迁移到另一个群集)"
+
+# 3bbeb916fadc4d5485cc2311778dea39
+#: ../../virtual_machines.rst:966
+msgid "To manually live migrate a virtual machine"
+msgstr "手动在线迁移一个虚拟机"
+
+# cac7bb80e52140ffb9b2064aaf90a545
+#: ../../virtual_machines.rst:978
+msgid "Choose the VM that you want to migrate."
+msgstr "选择你想迁移的VM。"
+
+# ad6a7c7fc2774af19be664773c62991f
+#: ../../virtual_machines.rst:982
+msgid "Click the Migrate Instance button. |Migrateinstance.png|"
+msgstr "点击迁移实例按钮。 |Migrateinstance.png|"
+
+# f6a8c2c04d5a419ea87d0eb7c6aab2f9
+#: ../../virtual_machines.rst:986
+msgid ""
+"From the list of suitable hosts, choose the one to which you want to move "
+"the VM."
+msgstr "从可用主机列表中,选择一个目标主机。"
+
+# aa10e98e071f4ce6a979503514da6fc6
+#: ../../virtual_machines.rst:990
+msgid ""
+"If the VM's storage has to be migrated along with the VM, this will be noted"
+" in the host list. CloudStack will take care of the storage migration for "
+"you."
+msgstr "如果VM的存储与VM必须一起被迁移,这点会在主机列表中标注。CloudStack会为你自动的进行存储迁移。"
+
+# 2ee1776c823e444bb96036b1353934ff
+#: ../../virtual_machines.rst:997
+msgid "Deleting VMs"
+msgstr "删除VMs"
+
+# 4506fdbbd39a4d90822765565d24819e
+#: ../../virtual_machines.rst:999
+msgid ""
+"Users can delete their own virtual machines. A running virtual machine will "
+"be abruptly stopped before it is deleted. Administrators can delete any "
+"virtual machines."
+msgstr "用户可以删除他们拥有的虚拟机。在删除运行中的虚拟机之前,虚拟机会被强制停止。管理员可以删除任何虚拟机。"
+
+# 913edf18c98446f7add9e9b002dc571e
+#: ../../virtual_machines.rst:1003
+msgid "To delete a virtual machine:"
+msgstr "要删除虚拟机:"
+
+# 4471e96b3042480887044b650cf5dfa7
+#: ../../virtual_machines.rst:1015
+msgid "Choose the VM that you want to delete."
+msgstr "选择你想删除的VM。"
+
+# 14c5b440483c444190fd3fc8d953c2a5
+#: ../../virtual_machines.rst:1019
+msgid "Click the Destroy Instance button. |Destroyinstance.png|"
+msgstr "点击销毁实例按钮。 |Destroyinstance.png|"
+
+# 7739d729c35f4724a4c0492fbc8c1b97
+#: ../../virtual_machines.rst:1022
+msgid "Working with ISOs"
+msgstr "使用ISOs"
+
+# 037ea9c2997f4695a6eb7227eda501ca
+#: ../../virtual_machines.rst:1024
+msgid ""
+"CloudStack supports ISOs and their attachment to guest VMs. An ISO is a "
+"read-only file that has an ISO/CD-ROM style file system. Users can upload "
+"their own ISOs and mount them on their guest VMs."
+msgstr "CloudStack支持ISOs和将其挂载到来宾VMs。ISO是一种只读的ISO/CD-ROM格式的文件文件系统。用户可以上传他们自己的ISOs并且将其挂载至他们的来宾VMs。"
+
+# bb915cb78ccb40fbb74f5c72bfc775f9
+#: ../../virtual_machines.rst:1028
+msgid ""
+"ISOs are uploaded based on a URL. HTTP is the supported protocol. Once the "
+"ISO is available via HTTP specify an upload URL such as "
+"http://my.web.server/filename.iso."
+msgstr "ISOs文件通过URL上传。HTTP是受支持的协议。一旦ISO通过HTTP指定一个上传URL,比如http://my.web.server/filename.iso上传成功,那么文件就可以用了。"
+
+# 49d1e81d8d2f431ead35a0681b93930e
+#: ../../virtual_machines.rst:1032
+msgid ""
+"ISOs may be public or private, like templates.ISOs are not hypervisor-"
+"specific. That is, a guest on vSphere can mount the exact same image that a "
+"guest on KVM can mount."
+msgstr "ISOs可能是私有的也可以是共有的,像templates.ISOs并不针对某种hypervisor。也就是说,运行在vSphere上的来宾虚机和运行在KVM上的虚机可以挂载同一个ISO。"
+
+# ec9f85158e634c70bb3289ba4354c53e
+#: ../../virtual_machines.rst:1036
+msgid ""
+"ISO images may be stored in the system and made available with a privacy "
+"level similar to templates. ISO images are classified as either bootable or "
+"not bootable. A bootable ISO image is one that contains an OS image. "
+"CloudStack allows a user to boot a guest VM off of an ISO image. Users can "
+"also attach ISO images to guest VMs. For example, this enables installing PV"
+" drivers into Windows. ISO images are not hypervisor-specific."
+msgstr "ISO镜像可能存储在系统中并且隐私级别与模板相似。ISO镜像分为可引导或不可引导的。可引导的ISO镜像是包含了OS镜像的。CloudStack允许用户通过ISO镜像来启动来宾虚机。用户同样可以将ISO镜像挂载到来宾VMs。比如,给Windows安装PV驱动。ISO镜像不指定hypervisor。"
+
+# 66d6d4e68aaa46fc8a38ea3d9e9eff72
+#: ../../virtual_machines.rst:1045
+msgid "Adding an ISO"
+msgstr "添加ISO"
+
+# 4d9f89344dbd49cf809056b015c893e9
+#: ../../virtual_machines.rst:1047
+msgid ""
+"To make additional operating system or other software available for use with"
+" guest VMs, you can add an ISO. The ISO is typically thought of as an "
+"operating system image, but you can also add ISOs for other types of "
+"software, such as desktop applications that you want to be installed as part"
+" of a template."
+msgstr "为了添加额外的操作系统或者给来宾VMs使用其它软件,你可以添加ISO。操作系统镜像被认为是最典型的ISO,但是你也能添加软件类型的ISOs,例如你想把安装的桌面应用作为模板的一部分。"
+
+# 9498811c36fa4b7081260060ea17df89
+#: ../../virtual_machines.rst:1055
+msgid "Log in to the CloudStack UI as an administrator or end user."
+msgstr "使用管理员或者终端用户账号登录CloudStack UI。"
+
+# 9c94cd61bf874dde87586c83b2468101
+#: ../../virtual_machines.rst:1059
+msgid "In the left navigation bar, click Templates."
+msgstr "在左侧的导航栏,点击模板。"
+
+# a5071eb73fa449c18ce96de2c342e45d
+#: ../../virtual_machines.rst:1063
+msgid "In Select View, choose ISOs."
+msgstr "在选择视图中,选择ISOs。"
+
+# e19433ec2d144a92bbf9c55ad2bc3484
+#: ../../virtual_machines.rst:1067
+msgid "Click Add ISO."
+msgstr "点击添加ISO。"
+
+# b760a614085c4b59bb13262b7892cde4
+#: ../../virtual_machines.rst:1071
+msgid "In the Add ISO screen, provide the following:"
+msgstr "在添加ISO界面中,提供下列信息:"
+
+# 9fdde4dd08374f0793251a5518e975be
+#: ../../virtual_machines.rst:1075
+msgid ""
+"**Name**: Short name for the ISO image. For example, CentOS 6.2 64-bit."
+msgstr "**名称**: ISO 镜像的简称。例如,CentOS6.2 64-bit。"
+
+# 057c511f14834d53b851241e6e307b66
+#: ../../virtual_machines.rst:1080
+msgid ""
+"**Description**: Display test for the ISO image. For example, CentOS 6.2 "
+"64-bit."
+msgstr "**描述**: 对于ISO镜像的描述。例如,CentOS 6.2 64-bit."
+
+# 45877549dabb466b9cf1d79d86e902f3
+#: ../../virtual_machines.rst:1085
+msgid ""
+"**URL**: The URL that hosts the ISO image. The Management Server must be "
+"able to access this location via HTTP. If needed you can place the ISO image"
+" directly on the Management Server"
+msgstr "**URL**: ISO镜像主机的URL。管理服务器必须能够通过HTTP访问这个地址。如果有需要你可以直接将ISO放置到管理服务器中。"
+
+# 68c8d3975adf4027a8cbceacace184c5
+#: ../../virtual_machines.rst:1091
+msgid ""
+"**Zone**: Choose the zone where you want the ISO to be available, or All "
+"Zones to make it available throughout CloudStack."
+msgstr "**区域**: 选择你希望该ISO在到哪个区域可用,或者选择所有区域使该ISO在CloudStack中全部区域中可用。"
+
+# 0159cee8f9ad46aab66d2a0b15a0026f
+#: ../../virtual_machines.rst:1096
+msgid ""
+"**Bootable**: Whether or not a guest could boot off this ISO image. For "
+"example, a CentOS ISO is bootable, a Microsoft Office ISO is not bootable."
+msgstr "**可启动**: 来宾是否可以通过该ISO镜像启动。例如,一个CentOS ISO 是可启动的,一个Microsoft Office ISO 是不可启动的。"
+
+# 20cb0c8a4e1d4ffd8279d8587ac831d2
+#: ../../virtual_machines.rst:1102
+msgid ""
+"**OS Type**: This helps CloudStack and the hypervisor perform certain "
+"operations and make assumptions that improve the performance of the guest. "
+"Select one of the following."
+msgstr "**操作系统类型*: 这有助于CloudStack和Hypervisor执行某些操作并假设可提高来宾虚拟机的性能。选择下列之一。"
+
+# 5ccda673858b485d9d029499d3c6e0db
+#: ../../virtual_machines.rst:1108
+msgid ""
+"If the operating system of your desired ISO image is listed, choose it."
+msgstr "如果你需要的ISO镜像对应的操作系统在列表中,请选择它。"
+
+# 2ab6ca22329e4c3e877533c892467967
+#: ../../virtual_machines.rst:1113
+msgid ""
+"If the OS Type of the ISO is not listed or if the ISO is not bootable, "
+"choose Other."
+msgstr "如果ISO镜像的操作系统类型没有被列出或者ISO是不可引导的,选择Other。"
+
+# 9be1c439f3ce4ab9a41d7137880e76cd
+#: ../../virtual_machines.rst:1118
+msgid ""
+"(XenServer only) If you want to boot from this ISO in PV mode, choose Other "
+"PV (32-bit) or Other PV (64-bit)"
+msgstr "(仅针对XenServer) 如果你想使用这个ISO在PV 模式中引导,选择 Other PV (32-bit) 或 Other PV(64-bit)"
+
+# b50992f8bb54434387b26839fd05e1a2
+#: ../../virtual_machines.rst:1123
+msgid ""
+"(KVM only) If you choose an OS that is PV-enabled, the VMs created from this"
+" ISO will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the "
+"VMs will have an IDE root disk. The PV-enabled types are:"
+msgstr "(仅针对KVM) 如果你选择一个操作系统为PV-enabled,, 通过这个ISO创建的虚拟机会有一个SCSI(virtio)根磁盘。如果这个操作系统没有PV-enabled,,虚拟机将有一个IDE根磁盘。PV-enabled 类型是:"
+
+# aad0ef1396ee4a6f9bc531d842d53100
+#: ../../virtual_machines.rst:1128
+msgid "Fedora 13"
+msgstr "Fedora 13"
+
+# 59079d1f59324bbe8b1abcea8603f2cc
+#: ../../virtual_machines.rst:1130
+msgid "Fedora 12"
+msgstr "Fedora 12"
+
+# b8b262bd1513438d840f6124407681e2
+#: ../../virtual_machines.rst:1132
+msgid "Fedora 11"
+msgstr "Fedora 11"
+
+# b4b9f21ef32a4ef6a55ca72d8ecb6e21
+#: ../../virtual_machines.rst:1134
+msgid "Fedora 10"
+msgstr "Fedora 10"
+
+# 63098f620c9846d0bb57b96bce1570f7
+#: ../../virtual_machines.rst:1136
+msgid "Fedora 9"
+msgstr "Fedora 9"
+
+# 23123eb72cc94f54a8c080e0d7e3f9b1
+#: ../../virtual_machines.rst:1138
+msgid "Other PV"
+msgstr "Other PV"
+
+# e2502905c8ad4a5082eaf77c12a663a2
+#: ../../virtual_machines.rst:1140
+msgid "Debian GNU/Linux"
+msgstr "Debian GNU/Linux"
+
+# 3e223c0e18b546c6aa44380d75dbcd75
+#: ../../virtual_machines.rst:1142
+msgid "CentOS 5.3"
+msgstr "CentOS 5.3"
+
+# 22c90e96d87b47b9b52f5d36afbb4bca
+#: ../../virtual_machines.rst:1144
+msgid "CentOS 5.4"
+msgstr "CentOS 5.4"
+
+# 08857787cb804700851faf1944428e9a
+#: ../../virtual_machines.rst:1146
+msgid "CentOS 5.5"
+msgstr "CentOS 5.5"
+
+# 3d0c5c0b25ac43dfb9c6f424494416c5
+#: ../../virtual_machines.rst:1148
+msgid "Red Hat Enterprise Linux 5.3"
+msgstr "Red Hat Enterprise Linux 5.3"
+
+# 192d89c4588a46089607de0c7d8eb8d1
+#: ../../virtual_machines.rst:1150
+msgid "Red Hat Enterprise Linux 5.4"
+msgstr "Red Hat Enterprise Linux 5.4"
+
+# 577c9a33d98b4fc4a4a121cd9f026fd1
+#: ../../virtual_machines.rst:1152
+msgid "Red Hat Enterprise Linux 5.5"
+msgstr "Red Hat Enterprise Linux 5.5"
+
+# 99aa5f6d829c492ca635ff7a54373fd8
+#: ../../virtual_machines.rst:1154
+msgid "Red Hat Enterprise Linux 6"
+msgstr "Red Hat Enterprise Linux 6"
+
+# b33e5a4f06cf443b9506e80db9f2e83d
+#: ../../virtual_machines.rst:1157
+msgid ""
+"It is not recommended to choose an older version of the OS than the version "
+"in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image"
+" will usually not work. In these cases, choose Other."
+msgstr "不建议选择一个比操作系统镜像老的版本。例如,选择CentOS 5.4 去支持一个CentOS6.2的镜像通常导致不能工作。在这种情况下,去选择Other。"
+
+# e4e2e905b80442298bc0b64ce88ecab1
+#: ../../virtual_machines.rst:1161
+msgid ""
+"**Extractable**: Choose Yes if the ISO should be available for extraction."
+msgstr "**可提取**:  如果该ISO可以被提取出来,则选择Yes。"
+
+# a2f23bd50ec54f93ba29dffc1fb73308
+#: ../../virtual_machines.rst:1166
+msgid "**Public**: Choose Yes if this ISO should be available to other users."
+msgstr "**公共**:  如果该ISO可以被所有用户使用,则选择Yes。"
+
+# a045b92e96314a2b9ca966ae7d9e69e7
+#: ../../virtual_machines.rst:1171
+msgid ""
+"**Featured**: Choose Yes if you would like this ISO to be more prominent for"
+" users to select. The ISO will appear in the Featured ISOs list. Only an "
+"administrator can make an ISO Featured."
+msgstr "**精选**:  如果你想这个用户在选择这个ISO时更加突出则选择Yes。该ISO将出现在精选ISO列表中。只有管理员可以设置ISO为精选。"
+
+# f6a3a2db613242338786ae4594017ed0
+#: ../../virtual_machines.rst:1179
+msgid ""
+"The Management Server will download the ISO. Depending on the size of the "
+"ISO, this may take a long time. The ISO status column will display Ready "
+"once it has been successfully downloaded into secondary storage. Clicking "
+"Refresh updates the download percentage."
+msgstr "管理服务器将下载该ISO。根据ISO镜像的大小,下载过程可能会用很长时间。一旦该镜像已经被成功下载到辅助存储时ISO 状态栏将会显示Ready。点击刷新更新更新百分比。"
+
+# 0fed1d5c6f1043ffb6867a5b24e6f76d
+#: ../../virtual_machines.rst:1186
+msgid ""
+"**Important**: Wait for the ISO to finish downloading. If you move on to the"
+" next task and try to use the ISO right away, it will appear to fail. The "
+"entire ISO must be available before CloudStack can work with it."
+msgstr "**重要**: 等等ISO下载完成过程中。如果你想执行下一个任务并且尝试正常使用该ISO,这将会失败。在CloudStack 使用它之前该ISO必须是完整且有效的。"
+
+# 75e7c4822f2949598aa3a5e8cfa3c75a
+#: ../../virtual_machines.rst:1192
+msgid "Attaching an ISO to a VM"
+msgstr "附加ISO到虚拟机"
+
+# c49011305c6040abac9c4c10904564b0
+#: ../../virtual_machines.rst:1200
+msgid "Choose the virtual machine you want to work with."
+msgstr "选择要使用的虚拟机。"
+
+# a3b01615c42b489a9c2ca0f920b92cb1
+#: ../../virtual_machines.rst:1204
+msgid "Click the Attach ISO button. |iso.png|"
+msgstr "点击附加ISO按钮。 |iso.png|"
+
+# 02bc55c3634a43e9947613722f71ada2
+#: ../../virtual_machines.rst:1208
+msgid "In the Attach ISO dialog box, select the desired ISO."
+msgstr "在附加ISO对话框中,选择所需的ISO。"
+
+# 071721241f504f06bfb0b36125fc3870
+#: ../../virtual_machines.rst:1215
+msgid "Changing a VM's Base Image"
+msgstr "改变VM's 的基础镜像"
+
+# 0d3190522cde471aa0ebe72afd3e6cf8
+#: ../../virtual_machines.rst:1217
+msgid ""
+"Every VM is created from a base image, which is a template or ISO which has "
+"been created and stored in CloudStack. Both cloud administrators and end "
+"users can create and modify templates, ISOs, and VMs."
+msgstr "每个VM都是通过基础镜像创建的,可以是创建并存储在CloudStack中的一个模版或者一个ISO镜像。云管理员和终端用户都可以创建和修改模版,ISO和VM。"
+
+# de60998312a04130be852dba54b0e5d8
+#: ../../virtual_machines.rst:1221
+msgid ""
+"In CloudStack, you can change an existing VM's base image from one template "
+"to another, or from one ISO to another. (You can not change from an ISO to a"
+" template, or from a template to an ISO)."
+msgstr "在CloudStack中,你可以改变虚拟机的基础磁盘从一个模版换成其他模版,或从一个ISO换成其他ISO。(你不能把ISO变成模版或模版变成ISO。)"
+
+# da938830337643e9992dbf05c3792f8c
+#: ../../virtual_machines.rst:1225
+msgid ""
+"For example, suppose there is a template based on a particular operating "
+"system, and the OS vendor releases a software patch. The administrator or "
+"user naturally wants to apply the patch and then make sure existing VMs "
+"start using it. Whether a software update is involved or not, it's also "
+"possible to simply switch a VM from its current template to any other "
+"desired template."
+msgstr "例如,假设有一个模板基于一个特定的操作系统,并且操作系统厂商发布了一个补丁。管理员和用户理所当然的想要将该补丁应用到已经存在的虚拟机中,并确保虚拟机开始使用它。无论是否涉及软件更新,也有可能只是将虚拟机从当前的模板切换至其他所需的模板。"
+
+# 8218e4d0e098440f88209b1124c5ee3c
+#: ../../virtual_machines.rst:1232
+msgid ""
+"To change a VM's base image, call the restoreVirtualMachine API command and "
+"pass in the virtual machine ID and a new template ID. The template ID "
+"parameter may refer to either a template or an ISO, depending on which type "
+"of base image the VM was already using (it must match the previous type of "
+"image). When this call occurs, the VM's root disk is first destroyed, then a"
+" new root disk is created from the source designated in the template ID "
+"parameter. The new root disk is attached to the VM, and now the VM is based "
+"on the new template."
+msgstr "要改变熏鸡的基础镜像,通过虚拟机iD和新的模版ID调用restoreVirtualMachine API命令。模版ID参数可以参考模版或者ISO,取决于虚拟机正在使用的基础镜像类型(它必须匹配先前的镜像类型)。当这个调用生效时,虚拟机的根磁盘首先被摧毁,然后通过指定的模版ID参数创建根磁盘。新的根磁盘会附件到虚拟机中,现在虚拟机已经基于新的模版了。"
+
+# 9f9d3ce3a34c4a55ba84e57c2537163e
+#: ../../virtual_machines.rst:1241
+msgid ""
+"You can also omit the template ID parameter from the restoreVirtualMachine "
+"call. In this case, the VM's root disk is destroyed and recreated, but from "
+"the same template or ISO that was already in use by the VM."
+msgstr "你同样可以在调用restoreVirtualMachine时忽略模版ID参数。在这个情况下,虚拟机的根磁盘被摧毁并重新创建。但相同的模版或ISO已经被该虚拟机使用。"


[22/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/networking2.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/networking2.po b/source/locale/zh_CN/LC_MESSAGES/networking2.po
new file mode 100644
index 0000000..f2a12a8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/networking2.po
@@ -0,0 +1,8448 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# aguncn <ag...@163.com>, 2014
+# renoshen <sh...@sinosig.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-08 08:01+0000\n"
+"Last-Translator: aguncn <ag...@163.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 4c134b7a710148a3ab2766ead2eecc37
+#: ../../networking2.rst:18
+msgid "Managing Networks and Traffic"
+msgstr "网络和流量管理"
+
+# 3dea6f52fda445569cf65ce098c1b84c
+#: ../../networking2.rst:20
+msgid ""
+"In a CloudStack, guest VMs can communicate with each other using shared "
+"infrastructure with the security and user perception that the guests have a "
+"private LAN. The CloudStack virtual router is the main component providing "
+"networking features for guest traffic."
+msgstr "在CLOUDSTACK中,客户虚拟机之间可以在共享构架下相互通讯,并且可以在一个私有LAN中实现安全和用户互通。CLOUDSTACK的虚拟路由器是实现客户网络功能的主要组件。"
+
+# c845ad86dd2c41e091ae6234539d6672
+#: ../../networking2.rst:26
+msgid "Guest Traffic"
+msgstr "来宾流量"
+
+# d8fc8ee73a5d4bc5915b1fd2e4eb7108
+#: ../../networking2.rst:28
+msgid ""
+"A network can carry guest traffic only between VMs within one zone. Virtual "
+"machines in different zones cannot communicate with each other using their "
+"IP addresses; they must communicate with each other by routing through a "
+"public IP address."
+msgstr "在同一个区域内,客户虚拟机之间可以互访,但在不同的区域内,客户虚拟机之间不可以通过(内网)IP地址互访,而只能通过公网IP路由才可以互连。"
+
+# e56f7eded9f441659c145763662800d5
+#: ../../networking2.rst:33
+msgid "See a typical guest traffic setup given below:"
+msgstr "下图是一个典型的来宾流量设置:"
+
+# 6823c848cad04848a61dbff31215055b
+#: ../../networking2.rst:35
+msgid "|guest-traffic-setup.png|"
+msgstr "|guest-traffic-setup.png|"
+
+# 5cc5110f1ee142468aaacae83aca4060
+#: ../../networking2.rst:37
+msgid ""
+"Typically, the Management Server automatically creates a virtual router for "
+"each network. A virtual router is a special virtual machine that runs on the"
+" hosts. Each virtual router in an isolated network has three network "
+"interfaces. If multiple public VLAN is used, the router will have multiple "
+"public interfaces. Its eth0 interface serves as the gateway for the guest "
+"traffic and has the IP address of 10.1.1.1. Its eth1 interface is used by "
+"the system to configure the virtual router. Its eth2 interface is assigned a"
+" public IP address for public traffic. If multiple public VLAN is used, the "
+"router will have multiple public interfaces."
+msgstr "通常,管理服务器会自动为每一个网络建立一个虚拟路由。一个虚拟路由实际上就是运行在物理主机上的一台特殊的虚拟机。每一台在一个独立网络中的虚拟路由有3个网口。如果使用多个公共 VLAN,相应的这台路由器就有多个公共的网口。 它的 eth0 网口是提供客户机通信的网关服务的,它的IP地址是 10.1.1.1。eth1 网口是为系统来配置这个虚拟路由而提供的。eth2 网口被赋予一个公共 IP 地址用来实现外部的公共通信。 同样如果使用了多个公共 VLAN 接入,这台路由器将会拥有多个公共的网口。"
+
+# b252663b377641b6a497a33ae549a1c3
+#: ../../networking2.rst:48
+msgid ""
+"The virtual router provides DHCP and will automatically assign an IP address"
+" for each guest VM within the IP range assigned for the network. The user "
+"can manually reconfigure guest VMs to assume different IP addresses."
+msgstr "虚拟路由器提供DHCP功能,能自动的为每一个客户虚拟机在预先定义好的IP范围之内分配IP地址。用户也可以为虚拟机手工配置不同的IP地址。"
+
+# 08366e677b394ff486de117a98b53a1c
+#: ../../networking2.rst:53
+msgid ""
+"Source NAT is automatically configured in the virtual router to forward "
+"outbound traffic for all guest VMs"
+msgstr "Source NAT功能是在虚拟路由里自动配置好的,它可以转发所有来宾虚拟机的外出流量。"
+
+# 8db3692749f44d209bc4b6643b4bed42
+#: ../../networking2.rst:57
+msgid "Networking in a Pod"
+msgstr "一个提供点里的网络"
+
+# f92d73cb904740b69bb3044663745ef9
+#: ../../networking2.rst:59
+msgid ""
+"The figure below illustrates network setup within a single pod. The hosts "
+"are connected to a pod-level switch. At a minimum, the hosts should have one"
+" physical uplink to each switch. Bonded NICs are supported as well. The pod-"
+"level switch is a pair of redundant gigabit switches with 10 G uplinks."
+msgstr "下图演示了一个单提供点的网络配置。主机均连接到提供点层级的交换机。每一个主机至少有一个物理网卡连接到交换机。当然,这种环境也支持网卡绑定。提供点层级的交换机由两个1000M冗余组成,它们通过10G线路上联。"
+
+# 3cf0b62b19c942899bbf90f9c3e111be
+#: ../../networking2.rst:65
+msgid "|networksinglepod.png|"
+msgstr "|networksinglepod.png|"
+
+# 61fa2a0f3f6046b2a1d038ab3e5ea255
+#: ../../networking2.rst:67
+msgid "Servers are connected as follows:"
+msgstr "服务器以如下形式连接:"
+
+# 9dd3a988270c471db1794e964c4a56c7
+#: ../../networking2.rst:71
+msgid ""
+"Storage devices are connected to only the network that carries management "
+"traffic."
+msgstr "存储设备只与管理网络连接。"
+
+# 2e2c8c8881fa4cd5be1de3eec14c1d1c
+#: ../../networking2.rst:76
+msgid ""
+"Hosts are connected to networks for both management traffic and public "
+"traffic."
+msgstr "主机同时与管理网络和公共网络连接。"
+
+# 3e2f4aed8c924b9e80395bdf1e1c2f73
+#: ../../networking2.rst:81
+msgid ""
+"Hosts are also connected to one or more networks carrying guest traffic."
+msgstr "主机也与一个或多个来宾网络连接。"
+
+# d85f7dccd3784410a2b1d16863f27a73
+#: ../../networking2.rst:84
+msgid ""
+"We recommend the use of multiple physical Ethernet cards to implement each "
+"network interface as well as redundant switch fabric in order to maximize "
+"throughput and improve reliability."
+msgstr "我们推荐用多个物理网卡以改进性能,也推荐用冗余的光纤交换机以改进网络可靠性。"
+
+# d776e46765c84e1181b3e580c688c626
+#: ../../networking2.rst:89
+msgid "Networking in a Zone"
+msgstr "一个区域里的网络"
+
+# d239d21a20c649aba205a75b8c13f10d
+#: ../../networking2.rst:91
+msgid ""
+"The following figure illustrates the network setup within a single zone."
+msgstr "下图说明了一个单一区域内的网络设置。"
+
+# a576182d84c04ab98566ba031289abb1
+#: ../../networking2.rst:93
+msgid "|networksetupzone.png|"
+msgstr "|networksetupzone.png|"
+
+# f9ec1f6b949e428b918524444e4e4c2d
+#: ../../networking2.rst:95
+msgid ""
+"A firewall for management traffic operates in the NAT mode. The network "
+"typically is assigned IP addresses in the 192.168.0.0/16 Class B private "
+"address space. Each pod is assigned IP addresses in the 192.168.\\*.0/24 "
+"Class C private address space."
+msgstr "用于管理通信的防火墙工作在NAT模式。通常是分配给网络中的IP地址192.168.0.0/16 B类私有地址空间。每个机柜(POD)分配的IP地址是192.168.*.0/24 C类私有地址空间。"
+
+# f0acacb8a1ac4f92b32c742e22c0aa30
+#: ../../networking2.rst:100
+msgid ""
+"Each zone has its own set of public IP addresses. Public IP addresses from "
+"different zones do not overlap."
+msgstr "每个区域都有自己的一套公网IP地址。来自不同区域的公网IP地址不重叠。"
+
+# 48df0d18a8e448909a0b484414468735
+#: ../../networking2.rst:104
+msgid "Basic Zone Physical Network Configuration"
+msgstr "基本区域物理网络配置"
+
+# 20494f4a5f604216bed0571fa51a7ddb
+#: ../../networking2.rst:106
+msgid ""
+"In a basic network, configuring the physical network is fairly "
+"straightforward. You only need to configure one guest network to carry "
+"traffic that is generated by guest VMs. When you first add a zone to "
+"CloudStack, you set up the guest network through the Add Zone screens."
+msgstr "在一个基本的网络中,物理网络的配置非常直接明了。你只需要配置一个客户网络(虚拟)以承载由客户虚拟机产生的流量。当你首次增加一个区域(Zone)到 CloudStack 中,你通过添加域(Add Zone)页面来设置客户网络(虚拟)。"
+
+# b5ca7152b69d4a2d8fcc434cb9267f7c
+#: ../../networking2.rst:112
+msgid "Advanced Zone Physical Network Configuration"
+msgstr "高级区域物理网络的配置"
+
+# 954218a2f4204be989c2436ecd73edc1
+#: ../../networking2.rst:114
+msgid ""
+"Within a zone that uses advanced networking, you need to tell the Management"
+" Server how the physical network is set up to carry different kinds of "
+"traffic in isolation."
+msgstr "在使用复杂网络的区域中,你需要告知管理服务器,为了实现隔离不同类型的通讯,物理网络是如何设置的。"
+
+# b3ba0f73a0df4d36a3cb4f204c4dee2d
+#: ../../networking2.rst:119
+msgid "Configure Guest Traffic in an Advanced Zone"
+msgstr "在高级域中设置客户通信"
+
+# ecd9d16a0a0c4dff9373a2dbf58e4c09
+#: ../../networking2.rst:121
+msgid ""
+"These steps assume you have already logged in to the CloudStack UI. To "
+"configure the base guest network:"
+msgstr "下面的步骤假定你已经登录进入 CloudStack 的界面。设置基本的客户网络:"
+
+# 78523deb5f20412383b00c879c3b21aa
+#: ../../networking2.rst:126
+msgid ""
+"In the left navigation, choose Infrastructure. On Zones, click View More, "
+"then click the zone to which you want to add a network."
+msgstr "在左边的导航栏,选择基础架构。在区域界面点击查看全部,然后点击你要添加网络的区域。"
+
+# 6257a61390924cb3bd8aeeac1a071780
+# 991bb1da835442988405cc08b7001c28
+# 61c9a678d28f40d599b72b6c2670f13d
+#: ../../networking2.rst:131 ../../networking2.rst:215
+#: ../../networking2.rst:1597
+msgid "Click the Network tab."
+msgstr "点击网络选项卡。"
+
+# 81ea8b8553864a83843ba71e6bf101af
+# 2d5debf29d7e42428b6c6d0ea25b7b92
+# e156f160e7c64f60a6d9c5bd8b8164a9
+#: ../../networking2.rst:135 ../../networking2.rst:219
+#: ../../networking2.rst:1601
+msgid "Click Add guest network."
+msgstr "点击 添加来宾网络。"
+
+# 7b664064e09a4c25ac5afbc839d6bf94
+#: ../../networking2.rst:137
+msgid "The Add guest network window is displayed:"
+msgstr "添加来宾网络窗口显示:"
+
+# 467663954a4745be91a92b1d95b23080
+#: ../../networking2.rst:139
+msgid "|addguestnetwork.png|"
+msgstr "|addguestnetwork.png|"
+
+# a7bd588835354863bf7622de307358f6
+# e19b9c5096354c629c5cb237adbb7845
+# d0d70642a5104df08ab13289bdd0c02b
+#: ../../networking2.rst:143 ../../networking2.rst:4200
+#: ../../networking2.rst:5082
+msgid "Provide the following information:"
+msgstr "填写以下内容:"
+
+# 02150922f26d47f3b7a13ca653f96421
+#: ../../networking2.rst:147
+msgid "**Name**. The name of the network. This will be user-visible"
+msgstr "“Name”。要建立的网络结构的名字。这个是用户可见的"
+
+# 71b93ff5fc154455a9e31bb96fc71d72
+#: ../../networking2.rst:151
+msgid ""
+"**Display Text**: The description of the network. This will be user-visible"
+msgstr "“Display Text”:网络的描述。用户可见"
+
+# 3aa2ff94b2f3453caf3cf8a60cf57294
+#: ../../networking2.rst:156
+msgid "**Zone**: The zone in which you are configuring the guest network."
+msgstr "“Zone”: 这里的区域是指你要配置客户网络的区域。"
+
+# 8020d9a242d94611b622a7fbbf730632
+#: ../../networking2.rst:160
+msgid ""
+"**Network offering**: If the administrator has configured multiple network "
+"offerings, select the one you want to use for this network"
+msgstr "“网络提议”: 如果管理员已经配置了多个网络方案,可以选择你需要的那个"
+
+# 409cf198865e4ed4a4ceda18fb9c08f8
+#: ../../networking2.rst:165
+msgid "**Guest Gateway**: The gateway that the guests should use"
+msgstr "“Guest gateway”:虚拟机需要使用的网关"
+
+# 1b24f9a1dc1a468fa60412939100a476
+#: ../../networking2.rst:169
+msgid ""
+"**Guest Netmask**: The netmask in use on the subnet the guests will use"
+msgstr "“Guest Netmask”:客户虚拟机会使用的子网掩码"
+
+# 91173c96c5184ed8a0542f56f340c125
+# 6968c572935348d89aa2cfe9419c00cd
+# 9ee0ac806d854e47bd3f486e9e128034
+# 5d45344f6070463bb25599b8c1ac7145
+# 0527e80fdbfe4508a05ede62a047cd51
+# c6016b8b267942548713429d3c7e74e0
+# 3ccbb578962b42588bd495e0dbd57f76
+# f5954071e2a24961b74b3dcca98a33b1
+# e6ab2eac57564f63bfeea06d1691c574
+# 6d9b635b27544fb3adc30d7e8bc3070b
+# aae381906435443489b7db544138dc66
+# 0218e655795843808690f324bad3bbf9
+# 2c8c3e70a3904e0fb57a195a43305818
+# bc97ad0f132944ffbb337c4649b00a51
+#: ../../networking2.rst:174 ../../networking2.rst:870
+#: ../../networking2.rst:1251 ../../networking2.rst:1428
+#: ../../networking2.rst:1755 ../../networking2.rst:3144
+#: ../../networking2.rst:3662 ../../networking2.rst:4319
+#: ../../networking2.rst:4355 ../../networking2.rst:5118
+#: ../../networking2.rst:5211 ../../networking2.rst:5458
+#: ../../networking2.rst:5499 ../../networking2.rst:6953
+msgid "Click OK."
+msgstr "点击确定。"
+
+# bb8994cf25ed4d0f9c1738b0a288a66d
+#: ../../networking2.rst:177
+msgid "Configure Public Traffic in an Advanced Zone"
+msgstr "在高级区域中配置公共通信"
+
+# 53d266b50a684d08b2b57469d0ba2117
+#: ../../networking2.rst:179
+msgid ""
+"In a zone that uses advanced networking, you need to configure at least one "
+"range of IP addresses for Internet traffic."
+msgstr "在一个使用高级网络配置的区域中,你需要配置至少一个用于Internet通信的IP地址范围。"
+
+# 173ecef5b8d34d51b8690fdff5bcfc1f
+#: ../../networking2.rst:183
+msgid "Configuring a Shared Guest Network"
+msgstr "配置共享的客户网络"
+
+# 93a4d181244541b381a3a70d1daea74e
+# 55cf11dd995e463eb0015820a7998825
+# 648d4dddf66542dd975f89802e4efaec
+#: ../../networking2.rst:187 ../../networking2.rst:761
+#: ../../networking2.rst:1569
+msgid "Log in to the CloudStack UI as administrator."
+msgstr "作为管理员登录到CloudStack用户界面。"
+
+# ef46dafa14464c0580eef19b6347e754
+# f88933a8ce404a74b4dbfb012972639e
+# 1a1e2e9b76e842d2ad6653556d716440
+#: ../../networking2.rst:191 ../../networking2.rst:1363
+#: ../../networking2.rst:1573
+msgid "In the left navigation, choose Infrastructure."
+msgstr "在左边的导航,选择基础架构。"
+
+# e6266ec66e47425eaefdebd94b55e3d6
+# 9b6fa85ad73145c2a68b917e13c4dd74
+#: ../../networking2.rst:195 ../../networking2.rst:1577
+msgid "On Zones, click View More."
+msgstr "在区域页面,点击查看全部。"
+
+# ae18ac4302694c399605762c754adc89
+# a83fd7a01a4d4702815c49eabf8d6f45
+#: ../../networking2.rst:199 ../../networking2.rst:1581
+msgid "Click the zone to which you want to add a guest network."
+msgstr "选择要添加客户网络的那个区域。"
+
+# 35ace6a71a514813adb835b0e291e59a
+# 92a70044e0a64276aca71c727238658c
+# e7a6054e0cac452abbdf14af1fcf9ab7
+# 1dc7e2ce80f242c792c3eadfdf57d1f8
+#: ../../networking2.rst:203 ../../networking2.rst:777
+#: ../../networking2.rst:898 ../../networking2.rst:1585
+msgid "Click the Physical Network tab."
+msgstr "点击物理网络标签卡。"
+
+# 7d1c35e3c6fb45268f88743d4f33fc4a
+# 5d24c24102dc463b8df955cea14e8321
+#: ../../networking2.rst:207 ../../networking2.rst:1589
+msgid "Click the physical network you want to work with."
+msgstr "选择您要操作的物理网络。"
+
+# d69f9202aba443119708b15355371054
+# b50eb62ce8e94fdf956d6c49a9d8c539
+#: ../../networking2.rst:211 ../../networking2.rst:1593
+msgid "On the Guest node of the diagram, click Configure."
+msgstr "在客户节点界面,点击配置。"
+
+# 61f94d523e2b4257ac005b54b2300cd1
+# e69e4aa9dc5d4b77b59760f32d4410e5
+#: ../../networking2.rst:221 ../../networking2.rst:1603
+msgid "The Add guest network window is displayed."
+msgstr "现实添加客户网络窗口。"
+
+# 4af18c5d61a6456caf73f7a9369e2fee
+# cd3004192b7247d6b3d8df85d071c687
+# cefbbdc700e1418791c24fa0e9ff9991
+# 7d7d79ee61514455a6bd14b72d23c697
+# 9eddccf9e3ed490ba485fed483665910
+# ad7396c2fa194389a72869772975a651
+# ba22f3a686da4d51be0844159353ec45
+# 813ce0c39bee45a6b48988f7b8abcccd
+# 49c644d753054859b04b0040656835a6
+# 6851774e7c7b4a888987619af18e594a
+# 5bb2026725a84546bbf11325cca1e760
+# ca837cbb6534464a8d34b465a79f3b42
+# 1766498324004d1b9d70c399f1671335
+# 3fcb97db48704b65b73bdf48cfc719df
+#: ../../networking2.rst:225 ../../networking2.rst:806
+#: ../../networking2.rst:822 ../../networking2.rst:856
+#: ../../networking2.rst:916 ../../networking2.rst:1227
+#: ../../networking2.rst:1400 ../../networking2.rst:1607
+#: ../../networking2.rst:2480 ../../networking2.rst:3177
+#: ../../networking2.rst:5166 ../../networking2.rst:5592
+#: ../../networking2.rst:6347 ../../networking2.rst:6741
+msgid "Specify the following:"
+msgstr "指定以下信息:"
+
+# 8779be8d9d6846f085dbce3da3461bc3
+# b0b915aaeb67486684b659dc291d6454
+#: ../../networking2.rst:229 ../../networking2.rst:1611
+msgid "**Name**: The name of the network. This will be visible to the user."
+msgstr "“Name”。要建立的网络的名字。这个是用户可见的"
+
+# 5074f17c728f4f3a8a7f794e8374c034
+# 0a5db820304048068d1845c134b8df63
+#: ../../networking2.rst:234 ../../networking2.rst:1616
+msgid ""
+"**Description**: The short description of the network that can be displayed "
+"to users."
+msgstr "**描述**: 提供一个简短的方案描述。 "
+
+# 2b82a4bc6aa046f3b00d043934c959d7
+# 41c1edb5305a4945842709a1c5cf1ad6
+#: ../../networking2.rst:239 ../../networking2.rst:1621
+msgid "**VLAN ID**: The unique ID of the VLAN."
+msgstr "“VLAN ID”:VLAN 的ID。"
+
+# 418bb2fcab5742fb987163b73807d96b
+#: ../../networking2.rst:243
+msgid "**Isolated VLAN ID**: The unique ID of the Secondary Isolated VLAN."
+msgstr "“Isolated VLAN ID”: 二级独立 VLAN 的 ID。"
+
+# f26b6b49568f43ac84898deb5855609f
+# 969c263588994f74ac62592a499a4b31
+#: ../../networking2.rst:248 ../../networking2.rst:1633
+msgid "**Scope**: The available scopes are Domain, Account, Project, and All."
+msgstr "“Scope”:可用的范围,包括域,帐户,项目和其他所以。"
+
+# 178c532fedf44f0fb1a2993bf0f625a0
+# 15faa541a4ce4327913cfce7e0c3f217
+#: ../../networking2.rst:253 ../../networking2.rst:1638
+msgid ""
+"**Domain**: Selecting Domain limits the scope of this guest network to the "
+"domain you specify. The network will not be available for other domains. If "
+"you select Subdomain Access, the guest network is available to all the sub "
+"domains within the selected domain."
+msgstr "“Domain”:域,指定客户网络范围的域。指定域中的网络相对其他域是隔离不可见的。如果指定子域访问,域中的客户网络将在所有的子域中可用。"
+
+# 91422a2eb500489a88e0a6f4b976e5c8
+# eb7d195938c445079e17b8d4de34c9b0
+#: ../../networking2.rst:261 ../../networking2.rst:1646
+msgid ""
+"**Account**: The account for which the guest network is being created for. "
+"You must specify the domain the account belongs to."
+msgstr "“Account”:这里的帐户是为建立客户网络所指定的。必须指定域中所属的帐户。"
+
+# acbed03163c746f394f0b6065ac5d267
+# b6481103a23442a698dd33a8241fd4a5
+#: ../../networking2.rst:267 ../../networking2.rst:1652
+msgid ""
+"**Project**: The project for which the guest network is being created for. "
+"You must specify the domain the project belongs to."
+msgstr "“Project”:项目是客户网络所建立的项目。必须为这个项目指定域。"
+
+# 7515546501ea4a229f3d24cb1957114c
+# 14055c49cff34a97af7586b6692b395f
+#: ../../networking2.rst:273 ../../networking2.rst:1658
+msgid ""
+"**All**: The guest network is available for all the domains, account, "
+"projects within the selected zone."
+msgstr "“All”:选择它,会让客户网络对这个区域(Zone)中的所有域,帐户和项目都可用。"
+
+# 9e7d75c438d04916a6c8e41212a5add4
+# d311a00faddf44fb969a7362e8525846
+#: ../../networking2.rst:278 ../../networking2.rst:1663
+msgid ""
+"**Network Offering**: If the administrator has configured multiple network "
+"offerings, select the one you want to use for this network."
+msgstr "“网络提议”: 如果管理员已经配置了多个网络方案,可以选择你需要的那个。"
+
+# 3b34a00342f74aabb8f06ef47a71928f
+# cec7265b43cc44c985fc19c1aada24ca
+#: ../../networking2.rst:284 ../../networking2.rst:1669
+msgid "**Gateway**: The gateway that the guests should use."
+msgstr "“Guest gateway”:虚拟机需要使用的网关。"
+
+# e8b1ed0c13f24b28b17097da6a906553
+# e376b4730d514e9cb67f58490f5323da
+#: ../../networking2.rst:288 ../../networking2.rst:1673
+msgid "**Netmask**: The netmask in use on the subnet the guests will use."
+msgstr "“Netmask”:虚拟机子网要使用的网络掩码。"
+
+# e95322f93824448f8b5213679edb09a1
+# f9867bf0fe584ea68c8d8697b398a35d
+#: ../../networking2.rst:292 ../../networking2.rst:1677
+msgid ""
+"**IP Range**: A range of IP addresses that are accessible from the Internet "
+"and are assigned to the guest VMs."
+msgstr "“IP Range”:定义公网IP范围,这些IP用来访问公网或是从公网访问客户虚拟机。"
+
+# e30dfcdbb56b4fdab7ac50d318f8cfee
+#: ../../networking2.rst:295
+msgid ""
+"If one NIC is used, these IPs should be in the same CIDR in the case of "
+"IPv6."
+msgstr "如果使用了网卡,这些IP应该在相同的IPv6的CIDR中。"
+
+# c999c7758e4644bb960bd36b4934a153
+#: ../../networking2.rst:300
+msgid ""
+"**IPv6 CIDR**: The network prefix that defines the guest network subnet. "
+"This is the CIDR that describes the IPv6 addresses in use in the guest "
+"networks in this zone. To allot IP addresses from within a particular "
+"address block, enter a CIDR."
+msgstr "“IPv6 CIDR”:用于定义网络子网的网络前缀。"
+
+# 06222d5aca4f4401b3e50b9562eafd93
+# bdec8ee29ad7416da22dd28dfee5836c
+#: ../../networking2.rst:307 ../../networking2.rst:1682
+msgid ""
+"**Network Domain**: A custom DNS suffix at the level of a network. If you "
+"want to assign a special domain name to the guest VM network, specify a DNS "
+"suffix."
+msgstr "\"网络域\":如果你想为客户虚机网络定义一个域名,在此处输入后缀名。"
+
+# 6cbf270deb434c49a37109538320e729
+# e3f042ecf42f48179722b1f43ed74365
+# 6a7ddea8dd2248ce9c184a2ecb2a727c
+# 3048777b2bf143b7b0cf2d931ebf1461
+# 007a1927e30b4659b6f5b8dad349a236
+#: ../../networking2.rst:313 ../../networking2.rst:1688
+#: ../../networking2.rst:3215 ../../networking2.rst:3256
+#: ../../networking2.rst:4559
+msgid "Click OK to confirm."
+msgstr "点击确定。"
+
+# 6dae7352ba9441b4ab5afb0eb736de8e
+#: ../../networking2.rst:316
+msgid "Using Multiple Guest Networks"
+msgstr "使用多个来宾网络"
+
+# 2b127f6d5dfd4f3aa7e896c69fa530fc
+#: ../../networking2.rst:318
+msgid ""
+"In zones that use advanced networking, additional networks for guest traffic"
+" may be added at any time after the initial installation. You can also "
+"customize the domain name associated with the network by specifying a DNS "
+"suffix for each network."
+msgstr "在使用高级网络的资源域里, 额外的来宾网络可以在初始安装后任何时间添加. 你还可以通过指定DNS后缀为每个网络自定义关联的域名."
+
+# 57493d5abb6d42e29119db9cfbd72df0
+#: ../../networking2.rst:323
+msgid ""
+"A VM's networks are defined at VM creation time. A VM cannot add or remove "
+"networks after it has been created, although the user can go into the guest "
+"and remove the IP address from the NIC on a particular network."
+msgstr "一个虚机的网络在其创建时定义. 当一个虚机创建以后, 就不能对其网络添加删除, 即便用户可以进入客户虚机删除指定网卡的IP地址."
+
+# df560b1f84f74fa096be5526e9f253c2
+#: ../../networking2.rst:328
+msgid ""
+"Each VM has just one default network. The virtual router's DHCP reply will "
+"set the guest's default gateway as that for the default network. Multiple "
+"non-default networks may be added to a guest in addition to the single, "
+"required default network. The administrator can control which networks are "
+"available as the default network."
+msgstr "每一个虚机只有一个默认的网络. 在这个默认网络里, 虚拟路由器的DHCP响应将设置客户的默认网关. 除了单一,必须的默认网络, 多个非默认的网络也可以添加到客户虚机里. 管理员可以控制哪个网络作为默认的网络."
+
+# 1b89ed0c211f490d9ab7e3873f785995
+#: ../../networking2.rst:334
+msgid ""
+"Additional networks can either be available to all accounts or be assigned "
+"to a specific account. Networks that are available to all accounts are zone-"
+"wide. Any user with access to the zone can create a VM with access to that "
+"network. These zone-wide networks provide little or no isolation between "
+"guests.Networks that are assigned to a specific account provide strong "
+"isolation."
+msgstr "附加的网络可以给所有账户使用或者分配给特定的账户. 对所有账户都可用的网络在整个资源域有效. 任何可以访问这个资源域的用户都可以使用这个网络创建虚机. 这些资源域一级的网络基本不提供客户之间的隔离. 分配给特定帐户的网络提供强制隔离的功能."
+
+# 03479d92c4f3472fbf1c837f78ae38b9
+#: ../../networking2.rst:342
+msgid "Adding an Additional Guest Network"
+msgstr "增添一个虚拟机的网络"
+
+# dcc9b20e05d94a90a82df638e638d914
+# bf1857069dbe437da757dd8117d7a8f6
+# b00f09bd670c4e6bb6a9d90b98d3ee27
+# 06d1f9568c404045a154fa7800b17b42
+# 3a1cc0396efd4b8ebd8a6128932f37f3
+# ded02e7a4c5d4431a40e7c763efe892e
+# 2bf9437aec83464ca8aa33fb4d5bc7d2
+# 474cb61b7d6d414bb525496395e11ac0
+# cf958678b40649e395bf748ed3a82341
+# c6386d8cdb7f4830ac34eb0e3d53d353
+# e419b4e20de34ab59ca3fd7119a6a509
+# cb96251ca7834bcfb93698899e36997c
+# c24de51d817f4b8b86aa10d3c56327e6
+# 1970352df0b24327ab0040b0248447d1
+# b69b28bceebf484d9240513871a69e53
+# efd7ff6f49f24baebd8a7054ca0fcb6a
+# 855b8ad33e0942859a9fb87da979bff6
+# b853131f26c84398bd3ab3b28e7c8c10
+# 0415ee973c9e4f138f81c716a5897661
+# a2d18d98840548f1994851b84a11d06b
+# dafb981c4cd44ff284f9609a6d78076f
+# 8b5b3770bbea4a4b91bce618eaa95579
+# 0f348eefc7a140f0bfa10c40ab0de750
+# 20e4bf643dc649a5adf2b96c98aad755
+# 229dd2bf881340558fca0975604b2643
+# 470f52bcfa37419386c12e3c2112f795
+# bbf8e4596d4c4216a94cb7fd144372c1
+# bbeffb28c2c749518103fe11d941e8f3
+# 910d29d282334e13b2f84bdba7e4ae2f
+# d94ff6f14e7643a9832ac593d1c69ffb
+# 534c0a26f9b24f54a399020a1716f7ed
+# e92cc9d2cd1d448e9f9d848b7a0f8851
+# a96d8dddd84c4103b8b7afff0db24cfe
+# e307dc8da8084a23951ba5a0f61c85d4
+# 538a9fc2f7b941d8831cf7952f1eac3f
+# a6c65c894c464e4f928395582357dc97
+# 786b76e0eb6b4cadba166292663da2ea
+# 6530063879054b16a643c0b8d345a236
+#: ../../networking2.rst:346 ../../networking2.rst:413
+#: ../../networking2.rst:478 ../../networking2.rst:509
+#: ../../networking2.rst:543 ../../networking2.rst:688
+#: ../../networking2.rst:1205 ../../networking2.rst:1258
+#: ../../networking2.rst:1359 ../../networking2.rst:1735
+#: ../../networking2.rst:1815 ../../networking2.rst:2210
+#: ../../networking2.rst:3284 ../../networking2.rst:3327
+#: ../../networking2.rst:3370 ../../networking2.rst:3444
+#: ../../networking2.rst:3548 ../../networking2.rst:3695
+#: ../../networking2.rst:3829 ../../networking2.rst:4184
+#: ../../networking2.rst:4329 ../../networking2.rst:4362
+#: ../../networking2.rst:4459 ../../networking2.rst:4650
+#: ../../networking2.rst:5066 ../../networking2.rst:5131
+#: ../../networking2.rst:5262 ../../networking2.rst:5344
+#: ../../networking2.rst:5513 ../../networking2.rst:5752
+#: ../../networking2.rst:5843 ../../networking2.rst:5931
+#: ../../networking2.rst:6022 ../../networking2.rst:6265
+#: ../../networking2.rst:6575 ../../networking2.rst:6659
+#: ../../networking2.rst:6784 ../../networking2.rst:6823
+msgid "Log in to the CloudStack UI as an administrator or end user."
+msgstr "使用管理员或者终端用户账号登录CloudStack UI。"
+
+# c650c895a3ac4ff2851197288859be98
+# 65e8807d38054bd1b0027a7155f8085f
+# 6cbdfa0e6a0e46cdab35e3223f504119
+# 2f9490cb25514f8283f8dec06a79102d
+# 5563fe265c1a429d967cda0edab813f4
+# 54d9e12cb3164286a92aceeba0a664e5
+# 612ff33bd3f84bdd84ef63b9c3cb6cf3
+# 6fc81420daf44701856963aa3d9f4a87
+# 07cefb7f05bc4714bf198cbd879aea33
+# ab72dbc455b843cfb4c72e923297fc4d
+# 2e8cbb1231ef43fb9b387b21b0f97305
+# 9cb098264bbf4fc79077a14d44ff4e4d
+# ceb0f3b90cd2499b89cc614d577384d9
+# f15f55387b954e10a6e5a4417bfa6071
+# c298749dee624dae9ac00c5329f45af3
+# e222d654cbbb4a0a9bfcec6a887925e2
+# aa6ece8cd97543d091148cc4a9db4c04
+# 412366a772fc462991958a94917d88ee
+# e838e4d54a33420fad3f9b5aac4181ea
+# ef4b5d8b2c1f4efcb1dcb0909dd0610b
+# fb954e22b2e247cfbf72c9525d556f10
+# e9064194f98e4db6bb1374bc04afd258
+# da3f29bc5aa344e99d840c524c97ff52
+# 931799f15e4f4ef78f34f77acc6a84a5
+# 0035008431074c10b6f9cdcd88cf746a
+# 7a1970bdf40a45d3acd7f9db64c34c2f
+# f9b9878b284a440380845f18adc4dc02
+# 1108ad1b0aa449c198fc5fbf7b2f6f72
+# cea2011545724bc2b72940d23a00d3d7
+#: ../../networking2.rst:350 ../../networking2.rst:553
+#: ../../networking2.rst:692 ../../networking2.rst:1262
+#: ../../networking2.rst:2214 ../../networking2.rst:3288
+#: ../../networking2.rst:3331 ../../networking2.rst:3374
+#: ../../networking2.rst:3448 ../../networking2.rst:3552
+#: ../../networking2.rst:4188 ../../networking2.rst:4333
+#: ../../networking2.rst:4366 ../../networking2.rst:4463
+#: ../../networking2.rst:4654 ../../networking2.rst:5070
+#: ../../networking2.rst:5135 ../../networking2.rst:5266
+#: ../../networking2.rst:5348 ../../networking2.rst:5517
+#: ../../networking2.rst:5756 ../../networking2.rst:5847
+#: ../../networking2.rst:5935 ../../networking2.rst:6026
+#: ../../networking2.rst:6269 ../../networking2.rst:6579
+#: ../../networking2.rst:6663 ../../networking2.rst:6788
+#: ../../networking2.rst:6827
+msgid "In the left navigation, choose Network."
+msgstr "在左侧的导航栏,选择网络。"
+
+# f6aa7a61ff37420d9f141635bdbce188
+#: ../../networking2.rst:354
+msgid "Click Add guest network. Provide the following information:"
+msgstr "地阿基添加来宾网络。提供以下信息:"
+
+# 94e3451e541243a590fc75a1c6838168
+#: ../../networking2.rst:358
+msgid "**Name**: The name of the network. This will be user-visible."
+msgstr "**Name**:网络的名称。对于最终用户可见。"
+
+# 24a87a4d530b4a8c9af892bd51a53c2b
+#: ../../networking2.rst:362
+msgid ""
+"**Display Text**: The description of the network. This will be user-visible."
+msgstr "**Display Text**:网络的描述信息。对于最终用户可见。"
+
+# 4491ce6396264b9f805777eca895a720
+#: ../../networking2.rst:367
+msgid ""
+"**Zone**. The name of the zone this network applies to. Each zone is a "
+"broadcast domain, and therefore each zone has a different IP range for the "
+"guest network. The administrator must configure the IP range for each zone."
+msgstr "**Zone**:此网络所应用到zone的名称。每个zone都是一个广播域,因此每个zone中的来宾网络都有不同的IP范围。管理员必须为每个zone配置IP范围。"
+
+# 738c6e4f1dac40f6ae58cfa12e3fafb6
+#: ../../networking2.rst:374
+msgid ""
+"**Network offering**: If the administrator has configured multiple network "
+"offerings, select the one you want to use for this network."
+msgstr "**Network offering**如果管理员已经配置了多个网络,选择一个你想使用的。"
+
+# 4d5b30b8ae754940bd24bf9ce873f62c
+#: ../../networking2.rst:380
+msgid "**Guest Gateway**: The gateway that the guests should use."
+msgstr "**Guest Gateway**:来宾网络的网关。"
+
+# d2cc46c6e57d4a74b0f41b06645d7905
+#: ../../networking2.rst:384
+msgid ""
+"**Guest Netmask**: The netmask in use on the subnet the guests will use."
+msgstr "**Guest Netmask**:来宾网络的子网掩码。"
+
+# 0eef322a01b1441c968f5d08a7d1205d
+# 0fd1c8972f504925a86019b475f8cf7a
+#: ../../networking2.rst:389 ../../networking2.rst:4032
+msgid "Click Create."
+msgstr "点击创建。"
+
+# de4eb821eff84801b56973e967b9870e
+#: ../../networking2.rst:392
+msgid "Reconfiguring Networks in VMs"
+msgstr "在VMs中重新配置网络"
+
+# 0f2fe4ab745e4f7fb65fe812f7d64f1a
+#: ../../networking2.rst:394
+msgid ""
+"CloudStack provides you the ability to move VMs between networks and "
+"reconfigure a VM's network. You can remove a VM from a network and add to a "
+"new network. You can also change the default network of a virtual machine. "
+"With this functionality, hybrid or traditional server loads can be "
+"accommodated with ease."
+msgstr "CloudStack能让你在不同网络间移动VMs和重新配置VM的网络。你可以从一个网络中移除一个VM,再将其移动到另一个网络。"
+
+# 74ad1316798b4f60a8f0033d2c970d86
+#: ../../networking2.rst:400
+msgid "This feature is supported on XenServer, VMware, and KVM hypervisors."
+msgstr "XenServer、VMware和KVM hypervisors支持这个特性。"
+
+# 65c68a2b86274b91a6ec6ed32d0eb511
+# b0f423eb9e1444fa8072955fb8cbe955
+# c9a7dedb4fe74538a84d59bba4b0ea21
+#: ../../networking2.rst:403 ../../networking2.rst:1526
+#: ../../networking2.rst:2416
+msgid "Prerequisites"
+msgstr "先决条件"
+
+# bc2166808aa14a3d84e34f7a073eda9b
+#: ../../networking2.rst:405
+msgid ""
+"Ensure that vm-tools are running on guest VMs for adding or removing "
+"networks to work on VMware hypervisor."
+msgstr "确保虚拟机上安装了vm-tools以便通过VMware hypervisor添加或移除网络。"
+
+# 5edc5eb13c714fdcb4bc76dfefee938a
+#: ../../networking2.rst:409
+msgid "Adding a Network"
+msgstr "添加网络"
+
+# e9c46729b8e44e9b86983fc1d062228c
+# 69e1fa7916874968ad5f68de2af2cbc4
+# 53892275c4d84a16b7aa19e912822afe
+#: ../../networking2.rst:417 ../../networking2.rst:482
+#: ../../networking2.rst:513
+msgid "In the left navigation, click Instances."
+msgstr "在左侧的导航菜单中,点击实例。"
+
+# 237aa96a8b6047e2abb22526bd4bac7c
+# 2b3f21ea21b24697b7196dc8f6846009
+# 274e34eca30542b289b9dccb8063fa1f
+#: ../../networking2.rst:421 ../../networking2.rst:486
+#: ../../networking2.rst:517
+msgid "Choose the VM that you want to work with."
+msgstr "选择你要处理的VM。"
+
+# a616e6054be2484499468033d21dea1c
+# 7df447c421184ebd8362e78e05a81058
+# 57cb30b5f480462abef7c6f73b23f46e
+#: ../../networking2.rst:425 ../../networking2.rst:490
+#: ../../networking2.rst:521
+msgid "Click the NICs tab."
+msgstr "点击网络适配器标签。"
+
+# dccdbd5be35b43fda6baf17f2c628af7
+#: ../../networking2.rst:429
+msgid "Click Add network to VM."
+msgstr "将网络添加到 VM"
+
+# 05af00bbbfae48b0869d614090792531
+#: ../../networking2.rst:431
+msgid "The Add network to VM dialog is displayed."
+msgstr "显示添加网络对话框。"
+
+# 9d15b4dcf3c8457785334338c368aa26
+#: ../../networking2.rst:435
+msgid ""
+"In the drop-down list, select the network that you would like to add this VM"
+" to."
+msgstr "在下拉列表里选择你要添加给VM的网络。"
+
+# 9747107d35eb413e81aa96529adf5506
+#: ../../networking2.rst:438
+msgid ""
+"A new NIC is added for this network. You can view the following details in "
+"the NICs page:"
+msgstr "这样就为这个网络添加了一个新网卡。你可以在网卡页面查看下列信息:"
+
+# 96ffcc74f3da41ee9f7fade2c284e2cc
+#: ../../networking2.rst:443
+msgid "ID"
+msgstr "ID"
+
+# 0930c07f915e4e8f8321b47ce1b2546c
+#: ../../networking2.rst:447
+msgid "Network Name"
+msgstr "网络名称"
+
+# 2166ea3836e64777968d20d97a551782
+#: ../../networking2.rst:451
+msgid "Type"
+msgstr "类型"
+
+# ebba5967ce5b40c6a4b9557338f01ce6
+# 3d4b724e0c8241c1ba31b6395bc04008
+# 5af256fd3dbb4fdd841ef05a4ec9b838
+#: ../../networking2.rst:455 ../../networking2.rst:4442
+#: ../../networking2.rst:4567
+msgid "IP Address"
+msgstr "IP地址"
+
+# a5e87e2a4b4d4ddd80f323f49ceee587
+# ad200504779f4909905c825a837ecb20
+#: ../../networking2.rst:459 ../../networking2.rst:4571
+msgid "Gateway"
+msgstr "网关"
+
+# b15a081ce5664e48891a6f018aa8f161
+#: ../../networking2.rst:463
+msgid "Netmask"
+msgstr "子网掩码"
+
+# 297b7172628240e1a2c5b8cabc302f62
+#: ../../networking2.rst:467
+msgid "Is default"
+msgstr "默认的"
+
+# 8a2efed9a7e74c7f9fe0f1d5eb5d090c
+#: ../../networking2.rst:471
+msgid "CIDR (for IPv6)"
+msgstr "CIDR(IPv6)"
+
+# 9398952782e64b64b3867a3fe12fd7bc
+#: ../../networking2.rst:474
+msgid "Removing a Network"
+msgstr "移除网络"
+
+# a093eadb6ac145cbae36f5faaaa2c9a1
+#: ../../networking2.rst:494
+msgid "Locate the NIC you want to remove."
+msgstr "找到你要移除的网卡上。"
+
+# 5785d874c0944a0caf08db20f4f9e446
+#: ../../networking2.rst:498
+msgid "Click Remove NIC button. |remove-nic.png|"
+msgstr "点击移除网卡按钮。|remove-nic.png|"
+
+# c2771766c44443d1bb463bd5a0f9ecef
+# ed60114d9fff4ae6871302c0c6b0aed2
+#: ../../networking2.rst:502 ../../networking2.rst:533
+msgid "Click Yes to confirm."
+msgstr "点击Yes确认。"
+
+# 6b25b8b44f294113afdfb3b97d2eac02
+#: ../../networking2.rst:505
+msgid "Selecting the Default Network"
+msgstr "选择默认网络"
+
+# 86d95a73e3274acc9285a47537212537
+#: ../../networking2.rst:525
+msgid "Locate the NIC you want to work with."
+msgstr "找到你想要的网卡。"
+
+# 998ed551fd1a45f4ac897f9f38552afe
+#: ../../networking2.rst:529
+msgid "Click the Set default NIC button. |set-default-nic.png|."
+msgstr "点击设置为默认网卡按钮。 |set-default-nic.png|."
+
+# df5fbaabb7364cf599673d6b129dc3a4
+#: ../../networking2.rst:536
+msgid "Changing the Network Offering on a Guest Network"
+msgstr "在来宾网络上更改网络方案"
+
+# 7fc2bd82deb7433b8d2b5f310500de46
+#: ../../networking2.rst:538
+msgid ""
+"A user or administrator can change the network offering that is associated "
+"with an existing guest network."
+msgstr "用户或者管理员可以更改与之相关的来宾网络的网络方案。"
+
+# 9961a724d3c9484ca0b4c1d5978d448c
+#: ../../networking2.rst:547
+msgid ""
+"If you are changing from a network offering that uses the CloudStack virtual"
+" router to one that uses external devices as network service providers, you "
+"must first stop all the VMs on the network."
+msgstr "如果你将使用CloudStack虚拟路由的一个网络方案改成使用公共网络设备作为网络服务商,那么你必须先关掉该网络中的所有虚机。"
+
+# 449cac531ff847d796c389fb42f64c5c
+# 44aa044295ce4f078b84c89406c09bb3
+#: ../../networking2.rst:557 ../../networking2.rst:696
+msgid "Click the name of the network you want to modify."
+msgstr "点击你要修改的网络名称。"
+
+# 013515a624984a4181813aa619128c01
+# fb4f4c6fee5a4d54a8210453ae8fea0b
+#: ../../networking2.rst:561 ../../networking2.rst:700
+msgid "In the Details tab, click Edit. |edit-icon.png|"
+msgstr "在  详细  页签,点击 编辑按钮。|edit-icon.png|"
+
+# 2af58d6970ae4fa49f1d797131ae88e5
+#: ../../networking2.rst:565
+msgid ""
+"In Network Offering, choose the new network offering, then click Apply."
+msgstr "在网络方案中,选择新的网络方案,然后点击应用。"
+
+# bc3a2c3c3d324782ae47b4da0e17c214
+#: ../../networking2.rst:568
+msgid ""
+"A prompt is displayed asking whether you want to keep the existing CIDR. "
+"This is to let you know that if you change the network offering, the CIDR "
+"will be affected."
+msgstr "这时会有一个提示问你是否保持已存在的CIDR不变。这是让你了解如果你改变网络了方案,那么CIDR会受到影响。"
+
+# 1b6db56bbeec4098851005614591b4f2
+#: ../../networking2.rst:572
+msgid ""
+"If you upgrade between virtual router as a provider and an external network "
+"device as provider, acknowledge the change of CIDR to continue, so choose "
+"Yes."
+msgstr "如果你将虚拟路由升级到外网设备,在看到变更CIDR以继续时,请选择Yes。"
+
+# 146e4502698d4bedb783dec26532e410
+#: ../../networking2.rst:578
+msgid ""
+"Wait for the update to complete. Don't try to restart VMs until the network "
+"change is complete."
+msgstr "等待更新完成。在网络变更完成之前不要试图重启虚拟机。"
+
+# 4ae7ada6f8e841c4bab421568ca6c79c
+#: ../../networking2.rst:583
+msgid "If you stopped any VMs, restart them."
+msgstr "如果你停止了任何VMs,请重启他们。"
+
+# 9725e5abe5b24d5b9b938be30e1e60f9
+#: ../../networking2.rst:586
+msgid "IP Reservation in Isolated Guest Networks"
+msgstr "隔离的来宾网络中的预留IP"
+
+# 2160ad6d081d44638ebbdfb06dbfae1f
+#: ../../networking2.rst:588
+msgid ""
+"In isolated guest networks, a part of the guest IP address space can be "
+"reserved for non-CloudStack VMs or physical servers. To do so, you configure"
+" a range of Reserved IP addresses by specifying the CIDR when a guest "
+"network is in Implemented state. If your customers wish to have non-"
+"CloudStack controlled VMs or physical servers on the same network, they can "
+"share a part of the IP address space that is primarily provided to the guest"
+" network."
+msgstr "在隔离的来宾网络中,来宾IP地址空间中的一部分可以被保留下来以供非CloudStack VMs或者物理服务器使用。要真么做,你应该在来宾网络应用状态时依靠指定CIDR来配置一个预留IP地址范围。如果你的客户希望在同一个网络中有非CloudStack控制的VMs或者物理服务器,它们可以共享一部分主要为来宾网络提供的IP地址空间。"
+
+# fbba0aa499f74b36b378c6c99ef2ea87
+#: ../../networking2.rst:596
+msgid ""
+"In an Advanced zone, an IP address range or a CIDR is assigned to a network "
+"when the network is defined. The CloudStack virtual router acts as the DHCP "
+"server and uses CIDR for assigning IP addresses to the guest VMs. If you "
+"decide to reserve CIDR for non-CloudStack purposes, you can specify a part "
+"of the IP address range or the CIDR that should only be allocated by the "
+"DHCP service of the virtual router to the guest VMs created in CloudStack. "
+"The remaining IPs in that network are called Reserved IP Range. When IP "
+"reservation is configured, the administrator can add additional VMs or "
+"physical servers that are not part of CloudStack to the same network and "
+"assign them the Reserved IP addresses. CloudStack guest VMs cannot acquire "
+"IPs from the Reserved IP Range."
+msgstr "在高级域中,定义一个网络时要给其赋予一个IP地址范围或CIDR。CloudStack虚拟路由器起着DHCP的作用,并通过CIDR来给客户虚拟机分配IP地址。如果为了预留CIDR不用于cloudstack,应当进行说明,即部分IP地址范围或CIDR仅能被DHCP服务分配给在cloudstack中创建的虚拟机。剩下的IP地址被称作预留IP地址范围。当预留的IP被配置时,管理员可以增加额外的虚拟机或并不属于cloudstack的物理服务器到同一个网络,可以将预留的IP地址指定给他们。cloudstack的客户虚拟机不能够从预留的IP地址中获得地址。"
+
+# 90bf1a7d2c754ac4902085a1fd1ba748
+#: ../../networking2.rst:610
+msgid "IP Reservation Considerations"
+msgstr "IP预留事项"
+
+# bc5248dcc785447289018e7cdfcbae8a
+#: ../../networking2.rst:612
+msgid ""
+"Consider the following before you reserve an IP range for non-CloudStack "
+"machines:"
+msgstr "在给非cloudstack内的机器预留IP地址时,要考虑以下几个方面:"
+
+# 7c3b4a1806bc46caaec696068e353f33
+#: ../../networking2.rst:617
+msgid "IP Reservation is supported only in Isolated networks."
+msgstr "IP预留仅在隔离网络内支持"
+
+# a58ea815910f4eeebf5310fba2f2b4e6
+#: ../../networking2.rst:621
+msgid ""
+"IP Reservation can be applied only when the network is in Implemented state."
+msgstr "仅当网络在实施状态时,IP预留才能被应用。"
+
+# b1e7853953d34392be43f635d609444e
+#: ../../networking2.rst:626
+msgid "No IP Reservation is done by default."
+msgstr "默认不做IP预留。"
+
+# c5d1c53bfa0a4acb8b354fa73f021b37
+#: ../../networking2.rst:630
+msgid "Guest VM CIDR you specify must be a subset of the network CIDR."
+msgstr "指定客户的CIDR必须是网络CIDR的子网。"
+
+# 71e39d8747064bfa95ff48adddf42e34
+#: ../../networking2.rst:634
+msgid ""
+"Specify a valid Guest VM CIDR. IP Reservation is applied only if no active "
+"IPs exist outside the Guest VM CIDR."
+msgstr "指定一个有效的客户虚拟机CIDR。只有不活动的IP在客户虚拟机CIDR存在时,IP预留才能被应用。"
+
+# 7cd262eb2864435f953ba2f8d9b2e0a0
+#: ../../networking2.rst:637
+msgid ""
+"You cannot apply IP Reservation if any VM is alloted with an IP address that"
+" is outside the Guest VM CIDR."
+msgstr "如果任一虚拟机被分配了客户虚拟机CIDR之外的IP地址时,IP预留将不能应用。"
+
+# e135731ad79443bcb5dd396201d24cf1
+#: ../../networking2.rst:642
+msgid ""
+"To reset an existing IP Reservation, apply IP reservation by specifying the "
+"value of network CIDR in the CIDR field."
+msgstr "为重置一个已存在的IP预留,通过在CIDR框指定CIDR值就可应用IP预留。"
+
+# 3019eee8f787404483287650255b0fe0
+#: ../../networking2.rst:645
+msgid ""
+"For example, the following table describes three scenarios of guest network "
+"creation:"
+msgstr "例如,下表描述了客户网络创建的三种情形:"
+
+# 80174dfa477741e8a428588c2de692c5
+#: ../../networking2.rst:649
+msgid "Case"
+msgstr "案例"
+
+# eef86be3eee44a648412010005fb2333
+# 5f16a478e68c498db89c7157f7a1baf2
+# 60559aa9aec74533a0723a299680c8a8
+# fe93ec4b20274d52a8708a5cf4922fbd
+# a51541e1ff974e5b9cec68fc9bcf7ea7
+# d31c3f23647842caa0554fd1db873ce4
+# 94126de200d245e5a36add083af0c115
+# d3690595a81542b3a1a8daec4b800f9c
+# 7cb858db9ac346838a97c8e7ed8dcd87
+# e2cbdab6f6d04ca3a9579faffa22f221
+# d1254ad4a86545a8ac507083e4787780
+# 7abcfe51770247ca88d17c97fb261b52
+# ab3f6c13fcea4cdf8df4054fc6c55960
+#: ../../networking2.rst:649 ../../networking2.rst:3931
+#: ../../networking2.rst:4403 ../../networking2.rst:4503
+#: ../../networking2.rst:4695 ../../networking2.rst:5251
+#: ../../networking2.rst:5299 ../../networking2.rst:5558
+#: ../../networking2.rst:5884 ../../networking2.rst:5971
+#: ../../networking2.rst:6063 ../../networking2.rst:6306
+#: ../../networking2.rst:6700
+msgid "CIDR"
+msgstr "CIDR"
+
+# 7190e9a05c824c698c369f059903140f
+#: ../../networking2.rst:649
+msgid "Network CIDR"
+msgstr "网络CIDR"
+
+# 7b3e79ea891f42948ec144865f44db13
+#: ../../networking2.rst:649
+msgid "Reserved IP Range for Non-CloudStack VMs"
+msgstr "非cloudstack虚拟机的IP预留范围"
+
+# 4c1abc1728ab4017a78ab13faa073d32
+#: ../../networking2.rst:649
+msgid "Description"
+msgstr "描述"
+
+# 95c1f9dcea57490f9baba27f6052d7df
+# c7dc34629f4a4f3380ad7fa0415823fe
+#: ../../networking2.rst:651 ../../networking2.rst:5253
+msgid "1"
+msgstr "1"
+
+# ca251edef20a4a09a96d4439f40e9fcc
+# 47ec19dde3c14d2daf3a5f567a8ab892
+# 96ce4f76ef034c6c8ad91aa5358390ea
+#: ../../networking2.rst:651 ../../networking2.rst:652
+#: ../../networking2.rst:655
+msgid "10.1.1.0/24"
+msgstr "10.1.1.0/24"
+
+# 9553954ea80b4c108951c22f66b1f907
+# 9d8d02ccc8624c42ab63f95c1e6e61d2
+# 1711e6d7b17c49c1bbacdfe2f237bc1c
+# 3fe4ae27728949db852e351bdc3590a0
+#: ../../networking2.rst:651 ../../networking2.rst:651
+#: ../../networking2.rst:655 ../../networking2.rst:655
+msgid "None"
+msgstr "无"
+
+# 4cefe96c4cd048d6ab5bba6b2b2b2c1f
+#: ../../networking2.rst:651
+msgid "No IP Reservation."
+msgstr "无"
+
+# 9743a326091e467d9b6bca3cd0e35000
+# 326ceea3093e4ad2bc955dd15a12fcaa
+#: ../../networking2.rst:652 ../../networking2.rst:5254
+msgid "2"
+msgstr "2"
+
+# 28839e89c7b84228a801613e0c9ed896
+#: ../../networking2.rst:652
+msgid "10.1.1.0/26"
+msgstr "10.1.1.0/26"
+
+# fb5379ee12174589ad3d2da83e61667c
+#: ../../networking2.rst:652
+msgid "10.1.1.64 to 10.1.1.254"
+msgstr "10.1.1.64-10.1.1.254"
+
+# a9558f6e733545849f81f3ae6fc11f08
+#: ../../networking2.rst:652
+msgid ""
+"IP Reservation configured by the UpdateNetwork API with "
+"guestvmcidr=10.1.1.0/26 or enter 10.1.1.0/26 in the CIDR field in the UI."
+msgstr "在界面的CIDR框内输入10.1.1.0/26或通过更新网络的API配置为guestvmcidr=10.1.1.0/26,进行IP预留配置"
+
+# b3beece5bd0f4a3d8a0234aa9980a330
+#: ../../networking2.rst:655
+msgid "3"
+msgstr "3"
+
+# 79c55aa2874f4650b96805d27acfee4e
+#: ../../networking2.rst:655
+msgid ""
+"Removing IP Reservation by the UpdateNetwork API with "
+"guestvmcidr=10.1.1.0/24 or enter 10.1.1.0/24 in the CIDR field in the UI."
+msgstr "在界面的CIDR框内输入10.1.1.0/24或通过更新网络的API配置为guestvmcidr=10.1.1.0/24,进行IP预留清除"
+
+# 69a8f32537914ac6a722239a9dc07582
+# d8ca4fc7bf014daa9437cc4d5c7eb4f6
+#: ../../networking2.rst:661 ../../networking2.rst:1774
+msgid "Limitations"
+msgstr "局限性"
+
+# 6d66399f47684bc1940beb29a805e60c
+#: ../../networking2.rst:665
+msgid ""
+"The IP Reservation is not supported if active IPs that are found outside the"
+" Guest VM CIDR."
+msgstr "如果在客户虚拟机CIDR外发现活动的IP地址,IP预留将不被支持。"
+
+# db05ec3e0280485b9f6f8c5d902cbcc7
+#: ../../networking2.rst:670
+msgid ""
+"Upgrading network offering which causes a change in CIDR (such as upgrading "
+"an offering with no external devices to one with external devices) IP "
+"Reservation becomes void if any. Reconfigure IP Reservation in the new re-"
+"implemeted network."
+msgstr "在IP预留中,引起CIDR变化的网络升级方案都将无效,如将无外部设备的方案升级到带有外部设备的方案。在新实施的网络中,要重新配置IP预留。"
+
+# 6edc84466bc24a3d85247cab80c0cd80
+#: ../../networking2.rst:676
+msgid "Best Practices"
+msgstr "最佳实践"
+
+# 4bd0b852d6474b84accb421f128331f4
+#: ../../networking2.rst:678
+msgid ""
+"Apply IP Reservation to the guest network as soon as the network state "
+"changes to Implemented. If you apply reservation soon after the first guest "
+"VM is deployed, lesser conflicts occurs while applying reservation."
+msgstr "一旦网络状态变为实施,应尽快应用IP预留到客户网络。如果在第一台客户虚拟机部署后应用IP预留,则会在应用IP会有较少的冲突发生。"
+
+# e601241fba8a43feb30b4dcde1dc89a6
+#: ../../networking2.rst:684
+msgid "Reserving an IP Range"
+msgstr "预留一个IP范围"
+
+# dd9d0df809aa420899439632c2e7019f
+#: ../../networking2.rst:702
+msgid "The CIDR field changes to editable one."
+msgstr "CIDR框将变为可编辑状态"
+
+# 0ffc29b024624ccdb36d0ea407209d7f
+#: ../../networking2.rst:706
+msgid "In CIDR, specify the Guest VM CIDR."
+msgstr "在CIDR框,说明客户虚拟机的CIDR"
+
+# b2b4f195c2e847418d352a7e1ef06061
+#: ../../networking2.rst:710
+msgid "Click Apply."
+msgstr "点击应用"
+
+# d33d489b7f234940bc59878574087127
+#: ../../networking2.rst:712
+msgid ""
+"Wait for the update to complete. The Network CIDR and the Reserved IP Range "
+"are displayed on the Details page."
+msgstr "等待更新完成。"
+
+# 06aed4f105fd47d283331f291310c288
+#: ../../networking2.rst:716
+msgid "Reserving Public IP Addresses and VLANs for Accounts"
+msgstr "为账户预留公共IP地址及VLANS"
+
+# d29491316baf475184dbf3bd53bb19c3
+#: ../../networking2.rst:718
+msgid ""
+"CloudStack provides you the ability to reserve a set of public IP addresses "
+"and VLANs exclusively for an account. During zone creation, you can continue"
+" defining a set of VLANs and multiple public IP ranges. This feature extends"
+" the functionality to enable you to dedicate a fixed set of VLANs and guest "
+"IP addresses for a tenant."
+msgstr "CloudStack可以让你能够独立的为账户预留一部分公共IP地址和VLANS。在创建区域阶段,你可以继续定义一部分VLANS以及多个公共IP范围。这种功能扩展特性可以让你能够为客户预留固定的一部分VLAN和客户IP地址"
+
+# 68a3748797434d67bcbfc405a263a065
+#: ../../networking2.rst:724
+msgid ""
+"Note that if an account has consumed all the VLANs and IPs dedicated to it, "
+"the account can acquire two more resources from the system. CloudStack "
+"provides the root admin with two configuration parameter to modify this "
+"default behavior: use.system.public.ips and use.system.guest.vlans. These "
+"global parameters enable the root admin to disallow an account from "
+"acquiring public IPs and guest VLANs from the system, if the account has "
+"dedicated resources and these dedicated resources have all been consumed. "
+"Both these configurations are configurable at the account level."
+msgstr "注意,如果一个账户使用了所有分配给他的VLAN和IP,这个账户可以从系统获得二个以上的资源。CloudStack为根管理员提供了二个参数可以进行控制,分别是use.system.public.ips和use.system.guest.vlans。当一个账户分配了资源并且这些资源已经被消耗掉时,这二个全局参数可以使根管理员拒绝此账户从公共IP和来宾VLAN获取资源。二个配置都能在帐户级别进行配置。"
+
+# 40f4120539264e8fb5dbf5a7064d1fe9
+#: ../../networking2.rst:734
+msgid "This feature provides you the following capabilities:"
+msgstr "这些特性可提供以下的功能:"
+
+# 9bf2889fc36847ebabce3e8f9b625163
+#: ../../networking2.rst:738
+msgid ""
+"Reserve a VLAN range and public IP address range from an Advanced zone and "
+"assign it to an account"
+msgstr "从一个高级区域中预留一个VLAN范围和公共IP地址,并可以将其指定给一个账户。"
+
+# e1e3b63901214e39b4cd5ded0ff47ab6
+#: ../../networking2.rst:743
+msgid "Disassociate a VLAN and public IP address range from an account"
+msgstr "将一个VLAN和IP地址从一个账户解除联系。"
+
+# a849c48967014ee4ab4c29e6250ac9bc
+#: ../../networking2.rst:747
+msgid "View the number of public IP addresses allocated to an account"
+msgstr "查看分配给帐户的公共IP地址。"
+
+# 4c148c9f929f4394861c0230a52f46ea
+#: ../../networking2.rst:751
+msgid ""
+"Check whether the required range is available and is conforms to account "
+"limits."
+msgstr "检查需要的范围是否可用并且要符合帐户限制。"
+
+# b03cc0c4939e4538b33463b1acfa081f
+#: ../../networking2.rst:754
+msgid "The maximum IPs per account limit cannot be superseded."
+msgstr "不能超过每个账户最大的IP限制数。"
+
+# 331f9e80ff07451f833ea2f1e6592f48
+#: ../../networking2.rst:757
+msgid "Dedicating IP Address Ranges to an Account"
+msgstr "分配IP地址给一个账户"
+
+# cc9f01ca9cd04090b9ef074c6c68eb34
+# af5838600fdc41f68b104a44ea03d81a
+# 6230bfd5086842d69df7366e01ad5977
+#: ../../networking2.rst:765 ../../networking2.rst:886
+#: ../../networking2.rst:3054
+msgid "In the left navigation bar, click Infrastructure."
+msgstr "在左侧导航栏中,点击基础架构"
+
+# 732571fdd87e45b2ba3d0c99d319dada
+# 0a044cf03cd04706a971cfd6747f3972
+#: ../../networking2.rst:769 ../../networking2.rst:890
+msgid "In Zones, click View All."
+msgstr "在区域中,点击查看全部"
+
+# 718b87bdd1b24472a05561bc487af593
+# f0113ce9f8584511a94348c59e5098e9
+# 11d188714878411189998fcd7fb05a07
+#: ../../networking2.rst:773 ../../networking2.rst:894
+#: ../../networking2.rst:3062
+msgid "Choose the zone you want to work with."
+msgstr "选择你要设置的区域。"
+
+# e2c9d117a33a4ca698597ea697c642a8
+#: ../../networking2.rst:781
+msgid "In the Public node of the diagram, click Configure."
+msgstr "在图的公共节点上,点击配置。"
+
+# b587547f92d54da6a66fb328a1f90aa1
+#: ../../networking2.rst:785
+msgid "Click the IP Ranges tab."
+msgstr "点击IP范围页签。"
+
+# 71762e4009804e12af198d32409f6abe
+#: ../../networking2.rst:787
+msgid ""
+"You can either assign an existing IP range to an account, or create a new IP"
+" range and assign to an account."
+msgstr "或者指定一个已经的IP范围给帐户,或创建一个新的IP范围并指定给一个帐户。"
+
+# 89865009ad614a7caefc9d7e195d1f2c
+#: ../../networking2.rst:792
+msgid "To assign an existing IP range to an account, perform the following:"
+msgstr "要指定一个已有IP范围给帐户,按以下操作进行"
+
+# 023883e725b743e790c6c7d378fae5d1
+#: ../../networking2.rst:796
+msgid "Locate the IP range you want to work with."
+msgstr "确定需要分配的IP范围"
+
+# 727f9c60c5a149af95962b79fb673136
+#: ../../networking2.rst:800
+msgid "Click Add Account |addAccount-icon.png| button."
+msgstr "点击添加帐户按钮。|addAccount-icon.png| "
+
+# 98609249ea444461a727d851b23bdb4a
+#: ../../networking2.rst:802
+msgid "The Add Account dialog is displayed."
+msgstr "会弹出添加帐户对话框。"
+
+# 91a874f4d53548b5a54dd26c7a8070c4
+#: ../../networking2.rst:810
+msgid ""
+"**Account**: The account to which you want to assign the IP address range."
+msgstr "帐户,即需要指定IP地址范围的帐户"
+
+# d765ebdf04b540e9bb49f050bc9d5d1c
+#: ../../networking2.rst:815
+msgid "**Domain**: The domain associated with the account."
+msgstr "域名,与帐户关联的域名"
+
+# 68e22a0328b543599b5c092cb1be55c8
+#: ../../networking2.rst:817
+msgid "To create a new IP range and assign an account, perform the following:"
+msgstr "要指定一个新的IP范围给帐户,按以下操作进行"
+
+# a7351c3fc8aa4e6ab6f6de9982df895a
+#: ../../networking2.rst:826
+msgid "**Gateway**"
+msgstr "网关"
+
+# a8212080596548efb06b7f360af77801
+#: ../../networking2.rst:830
+msgid "**Netmask**"
+msgstr "掩码"
+
+# 2bac81ea68b044c99364b2e06d943f9e
+#: ../../networking2.rst:834
+msgid "**VLAN**"
+msgstr "VLAN"
+
+# a4fe8a556467404db7fc7ce462d9d690
+#: ../../networking2.rst:838
+msgid "**Start IP**"
+msgstr "起始IP"
+
+# b86850aa7e104d75b25613535bda6ad1
+#: ../../networking2.rst:842
+msgid "**End IP**"
+msgstr "结束IP"
+
+# 0cb6e7bb5c24462ca8eba42cba3c2ba0
+#: ../../networking2.rst:846
+msgid "**Account**: Perform the following:"
+msgstr "帐户,按以下操作进行:"
+
+# ba26e0ab36b64d9a9e00350c439eb9ec
+#: ../../networking2.rst:850
+msgid "Click Account."
+msgstr "点击帐户"
+
+# 7ef94c9e8e0b407d82dc09a915d88b3e
+#: ../../networking2.rst:852
+msgid "The Add Account page is displayed."
+msgstr "会显示添加帐户页"
+
+# 2e18417b732143f89ffa9ab5c5767d1d
+#: ../../networking2.rst:860
+msgid ""
+"****Account****: The account to which you want to assign an IP address "
+"range."
+msgstr "帐户,即需要指定IP地址范围的帐户"
+
+# 24326080425a4f7ba299c24defa8ee63
+# 3360555202854da8a230941d49441cb7
+#: ../../networking2.rst:865 ../../networking2.rst:930
+msgid "****Domain****: The domain associated with the account."
+msgstr "****域****:域账号关联的域。"
+
+# 57dd5ad50af947868ed60fb4f4871b8e
+# fd71c947508a4b19a74d5e8e68ab028a
+# df1c4b86b0574044b3b1e2f59f86e433
+# 911725135046474fbb858f58a060c70c
+# 7f4d32193a8e441ba5d3ba76afdc660d
+# 0d1a59ac450f4913861519bb5690af46
+# 68ec8457b8f6477a877539749238ecd7
+#: ../../networking2.rst:874 ../../networking2.rst:1935
+#: ../../networking2.rst:3493 ../../networking2.rst:3595
+#: ../../networking2.rst:3751 ../../networking2.rst:3984
+#: ../../networking2.rst:5732
+msgid "Click Add."
+msgstr "点击 添加"
+
+# 6ef67854e5d346c7913e58e20a2b72f4
+#: ../../networking2.rst:877
+msgid "Dedicating VLAN Ranges to an Account"
+msgstr "确定需要分配的IP范围"
+
+# 37745b0f98834f4b805af70b9546e2d7
+#: ../../networking2.rst:881
+msgid ""
+"After the CloudStack Management Server is installed, log in to the "
+"CloudStack UI as administrator."
+msgstr "安装好CloudStack管理端后,使用管理员帐号登录CloudStack用户界面。"
+
+# f8bb5c0c781349a6ad62cac445eb11cc
+# eab05b15433e427aa1bb42cc204ab3e9
+#: ../../networking2.rst:902 ../../networking2.rst:1376
+msgid "In the Guest node of the diagram, click Configure."
+msgstr "在图中的来宾节点上,点击配置"
+
+# 61505cd3d4344e769a534aed469c073d
+#: ../../networking2.rst:906
+msgid "Select the Dedicated VLAN Ranges tab."
+msgstr "选择分配VLAN范围页签"
+
+# 1df8c107f4854732a4f8a3a50c9cec49
+#: ../../networking2.rst:910
+msgid "Click Dedicate VLAN Range."
+msgstr "点击分配VLAN范围"
+
+# c02ef1fcb0e642a28e69bd463286ec33
+#: ../../networking2.rst:912
+msgid "The Dedicate VLAN Range dialog is displayed."
+msgstr "会弹出分配VLAN对话框。"
+
+# acd323fd8ca8468880666db446b5d222
+#: ../../networking2.rst:920
+msgid ""
+"****VLAN Range****: The VLAN range that you want to assign to an account."
+msgstr "VLAN范围:即需要指定给帐户的VLAN范围"
+
+# 1a79b0742f1a4aefa692f541aa4b5892
+#: ../../networking2.rst:925
+msgid ""
+"****Account****: The account to which you want to assign the selected VLAN "
+"range."
+msgstr "帐户:即需要指定选定的VLAN的帐户"
+
+# fe1be017fe7644368cd98ae4c68575eb
+#: ../../networking2.rst:933
+msgid "Configuring Multiple IP Addresses on a Single NIC"
+msgstr "在单网卡配置多个IP地址"
+
+# c38d77c3c3a04ece8ca7568348264c1c
+#: ../../networking2.rst:935
+msgid ""
+"CloudStack provides you the ability to associate multiple private IP "
+"addresses per guest VM NIC. In addition to the primary IP, you can assign "
+"additional IPs to the guest VM NIC. This feature is supported on all the "
+"network configurations: Basic, Advanced, and VPC. Security Groups, Static "
+"NAT and Port forwarding services are supported on these additional IPs."
+msgstr "CloudStack能够让你给每个客户虚拟机网卡配置多个私有IP地址,除主IP地址外,你可以指定额外的IP地址到客户虚拟机网卡。在所有的网络配置中,如基础配置,高级配置,VPC,均支持这一功能。安全组,静态NAT及端口转发服务在额外的IP地址上也都被支持。"
+
+# f6ae31a4bdbf477bb30c85f877c5c6b6
+#: ../../networking2.rst:942
+msgid ""
+"As always, you can specify an IP from the guest subnet; if not specified, an"
+" IP is automatically picked up from the guest VM subnet. You can view the "
+"IPs associated with for each guest VM NICs on the UI. You can apply NAT on "
+"these additional guest IPs by using network configuration option in the "
+"CloudStack UI. You must specify the NIC to which the IP should be "
+"associated."
+msgstr "当然,你也可以从来宾子网中指定一个IP,如果没有指定,将会从来宾虚拟机子网中自动选择一个。可以从UI中查看每一个与来宾虚拟机网卡关联的IP地址。也可以在CloudStack界面中通过网络配置选项在那些额外的来宾虚拟机上应用NAT。但必须指明网卡与哪一个IP关联。"
+
+# e122667851cc41cbb7ee1643ac94d437
+#: ../../networking2.rst:949
+msgid ""
+"This feature is supported on XenServer, KVM, and VMware hypervisors. Note "
+"that Basic zone security groups are not supported on VMware."
+msgstr "在XenServer,KVM和VMware虚拟机中,都支持这些功能。注意,VMware不支持基础区域的安全组。"
+
+# d244bec96a6742dcba6445489ebe5218
+#: ../../networking2.rst:953
+msgid "Use Cases"
+msgstr "使用案例"
+
+# 6bb7477d1acc4f3fbd79cd0dbfc2ca5e
+#: ../../networking2.rst:955
+msgid "Some of the use cases are described below:"
+msgstr "一些使用案例见以下描述"
+
+# deaccf09c30b469a945f6c92f5b3e9e8
+#: ../../networking2.rst:959
+msgid ""
+"Network devices, such as firewalls and load balancers, generally work best "
+"when they have access to multiple IP addresses on the network interface."
+msgstr "网络设备,如防火墙或负责均衡设备,一般来讲,当他们在网络接口上接入更多的IP地址时,他们能够更好的工作。"
+
+# b3bb1a633fb0431687fc030d4f1135d3
+#: ../../networking2.rst:965
+msgid ""
+"Moving private IP addresses between interfaces or instances. Applications "
+"that are bound to specific IP addresses can be moved between instances."
+msgstr "在接口和实例中迁移IP地址。绑定到特定IP地址的应用可以在实例中迁移。"
+
+# 5d372ef180164330a3adddfbf3c1cc0f
+#: ../../networking2.rst:971
+msgid ""
+"Hosting multiple SSL Websites on a single instance. You can install multiple"
+" SSL certificates on a single instance, each associated with a distinct IP "
+"address."
+msgstr "在单个实例上开启多个SSL网站。可以在单个实例上安装多个SSL认证,每一个认证都关联一个单独的IP地址。"
+
+# 37f9e5af46a34673a930879c2e5cba6f
+# c7db437925a34c6a87c825ef10de2e9a
+# 3f3eba9611d84d6aae271d271019803b
+#: ../../networking2.rst:976 ../../networking2.rst:1194
+#: ../../networking2.rst:6425
+msgid "Guidelines"
+msgstr "指导方针"
+
+# 3e292b09263b4b97bfd6c423204dbc2f
+#: ../../networking2.rst:978
+msgid ""
+"To prevent IP conflict, configure different subnets when multiple networks "
+"are connected to the same VM."
+msgstr "为防止IP冲突,当多个网络连接至同一个虚拟机时,要配置不同的子网。"
+
+# 95785c3d19f449f78cc05d757ee25d24
+#: ../../networking2.rst:982
+msgid "Assigning Additional IPs to a VM"
+msgstr "指定额外的IP给虚拟机"
+
+# 59a152d36896406a8e27bc6d934ee420
+#: ../../networking2.rst:986
+msgid "Log in to the CloudStack UI."
+msgstr "登录到CloudStack的界面"
+
+# 62ef4fc700f2458282be770129fbe8f3
+#: ../../networking2.rst:990
+msgid "In the left navigation bar, click Instances."
+msgstr "在左侧导航栏,点击实例"
+
+# e481a0bf01464ec993e94b0b35787eed
+#: ../../networking2.rst:994
+msgid "Click the name of the instance you want to work with."
+msgstr "点击拟配置的实例"
+
+# 040e0aa0901c4a738201d7f2b345c0f1
+#: ../../networking2.rst:998
+msgid "In the Details tab, click NICs."
+msgstr "在详细 页签,点击网卡"
+
+# 783db8f186394495ad0ab1546a97951e
+#: ../../networking2.rst:1002
+msgid "Click View Secondary IPs."
+msgstr "点击查看二级地址"
+
+# 81df8a9f3f814aaa861dd841284985ef
+#: ../../networking2.rst:1006
+msgid ""
+"Click Acquire New Secondary IP, and click Yes in the confirmation dialog."
+msgstr "点击获取新二级IP,在确认对话框点击确定。"
+
+# 5bee3ae73622433aaf3ff3502d16bfcb
+#: ../../networking2.rst:1009
+msgid ""
+"You need to configure the IP on the guest VM NIC manually. CloudStack will "
+"not automatically configure the acquired IP address on the VM. Ensure that "
+"the IP address configuration persist on VM reboot."
+msgstr "需要手动配置来宾虚拟机的网卡。在虚拟机上,CloudStack不会自动配置获取IP。确保在虚拟机重启IP地址配置仍有效。"
+
+# f5aed3f52f76443b9810ed9d0bd1d47c
+#: ../../networking2.rst:1013
+msgid ""
+"Within a few moments, the new IP address should appear with the state "
+"Allocated. You can now use the IP address in Port Forwarding or StaticNAT "
+"rules."
+msgstr "稍等一会,新的IP地址会出现,状态栏为会显示为分配。现在可以在端口转发或静态NAT规则中使用此IP地址了。"
+
+# 91390ddfe5794441a909d512aaf69b16
+#: ../../networking2.rst:1018
+msgid "Port Forwarding and StaticNAT Services Changes"
+msgstr "更改端口转发和静态NAT服务"
+
+# 178e8a8fb2244a73af81938965720ec0
+#: ../../networking2.rst:1020
+msgid ""
+"Because multiple IPs can be associated per NIC, you are allowed to select a "
+"desired IP for the Port Forwarding and StaticNAT services. The default is "
+"the primary IP. To enable this functionality, an extra optional parameter "
+"'vmguestip' is added to the Port forwarding and StaticNAT APIs "
+"(enableStaticNat, createIpForwardingRule) to indicate on what IP address NAT"
+" need to be configured. If vmguestip is passed, NAT is configured on the "
+"specified private IP of the VM. if not passed, NAT is configured on the "
+"primary IP of the VM."
+msgstr "因为每一个网卡都可关联至多IP,CloudStack可以允许为端口转发及静态NAT服务选择一个目标IP。默认为主IP。为开启此功能,另一个可选的配置参数  虚拟机来宾IP 需要被加至端口转发及静态NAT 的API中去(开启静态NAT,创建IP端口转发),以示IP地址NAT需要配置。如果虚拟机来宾IP 没有设置,NAT会配置在虚拟机的私有IP上,如果设置了,NAT会配置在虚拟机的主IP上。"
+
+# 9a799b4a628a476f9d231bc81b470264
+#: ../../networking2.rst:1030
+msgid "About Multiple IP Ranges"
+msgstr "关于多IP范围"
+
+# 028ff8cab15f440e877ecf3ac468a1a2
+#: ../../networking2.rst:1032
+msgid "The feature can only be implemented on IPv4 addresses."
+msgstr "这些功能仅能在IPV4的地址是实现。"
+
+# e4d2239d0d0c410c8f96922f8da73fd8
+#: ../../networking2.rst:1034
+msgid ""
+"CloudStack provides you with the flexibility to add guest IP ranges from "
+"different subnets in Basic zones and security groups-enabled Advanced zones."
+" For security groups-enabled Advanced zones, it implies multiple subnets can"
+" be added to the same VLAN. With the addition of this feature, you will be "
+"able to add IP address ranges from the same subnet or from a different one "
+"when IP address are exhausted. This would in turn allows you to employ "
+"higher number of subnets and thus reduce the address management overhead. To"
+" support this feature, the capability of ``createVlanIpRange`` API is "
+"extended to add IP ranges also from a different subnet."
+msgstr "在基础区域以及高级区域的开启安全组,CloudStack能够让你从不同的子网添加来宾IP范围。对于高级区域的开启安全组,多个子网可被加至同一个VLAN。随着此功能的增加,当IP地址耗尽时,你能够从同一个子网或从不同的子网添加IP范围。这会允许你添加更多的子网,因此减少了了地址管理的问题。为支持这一特性,创建VLANIP范围的API被加以扩展,这样就能从不同的子网添加IP范围"
+
+# 2881a530808e42f5be3d6298eeb47271
+#: ../../networking2.rst:1045
+msgid ""
+"Ensure that you manually configure the gateway of the new subnet before "
+"adding the IP range. Note that CloudStack supports only one gateway for a "
+"subnet; overlapping subnets are not currently supported."
+msgstr "确实在添加IP范围前,手动配置了子网的网关。注意,CloudStack仅支持一个子网有一个网关。不支持重叠的子网。"
+
+# 003e5d07c0794227bc714b0f29892867
+#: ../../networking2.rst:1049
+msgid ""
+"Use the ``deleteVlanRange`` API to delete IP ranges. This operation fails if"
+" an IP from the remove range is in use. If the remove range contains the IP "
+"address on which the DHCP server is running, CloudStack acquires a new IP "
+"from the same subnet. If no IP is available in the subnet, the remove "
+"operation fails."
+msgstr "使用删除VLAN范围的API删除IP范围。如果拟删除的IP在被使用时,此操作会失败。如果删除的范围包含DHCP服务器拟分配的IP地址CloudStack会从同一个子网下获取新的IP。如果在子网内没有可供利用的IP时,删除操作会失败。"
+
+# b8a91ec2e02844bd85db4f28846aad2b
+#: ../../networking2.rst:1055
+msgid "This feature is supported on KVM, xenServer, and VMware hypervisors."
+msgstr "在KVM, xenServer以及VMware虚拟机中,都支持这项功能。 "
+
+# ed378b716b614e5ea18ea508d7ecccb8
+#: ../../networking2.rst:1058
+msgid "About Elastic IP"
+msgstr "关于弹性IP"
+
+# cb979912025d4652b170b423b3323451
+#: ../../networking2.rst:1060
+msgid ""
+"Elastic IP (EIP) addresses are the IP addresses that are associated with an "
+"account, and act as static IP addresses. The account owner has the complete "
+"control over the Elastic IP addresses that belong to the account. As an "
+"account owner, you can allocate an Elastic IP to a VM of your choice from "
+"the EIP pool of your account. Later if required you can reassign the IP "
+"address to a different VM. This feature is extremely helpful during VM "
+"failure. Instead of replacing the VM which is down, the IP address can be "
+"reassigned to a new VM in your account."
+msgstr "弹性IP(EIP)地址是指与帐户关联的IP地址,能起到静态IP地址的作用。帐户所有者能完全控制隶属于此账户的弹性IP。作为帐户拥有者,你可以从你帐户的EIP池中选择一个IP分配给虚拟机。如果后续需要,你可以继续分配此IP地址给另一个虚拟机。在VM宕机时,此功能特别有用。此IP地址可以重新指定给一个新的虚拟机,而不是取代已经宕机的虚拟机。"
+
+# a05811529f014d1aa52b2974f0bba51e
+#: ../../networking2.rst:1069
+msgid ""
+"Similar to the public IP address, Elastic IP addresses are mapped to their "
+"associated private IP addresses by using StaticNAT. The EIP service is "
+"equipped with StaticNAT (1:1) service in an EIP-enabled basic zone. The "
+"default network offering, DefaultSharedNetscalerEIPandELBNetworkOffering, "
+"provides your network with EIP and ELB network services if a NetScaler "
+"device is deployed in your zone. Consider the following illustration for "
+"more details."
+msgstr "与公共IP地址一样,弹性IP地址通过使用静态NAT关联至与之相关的私有IP地址。在起用了EIP的基础域中,EIP的服务与静态NAT的服务一一对应。默认的网络方案,默认共享EIP与负载均衡网络方案,在区域部署了NetScaler设备的前提下,能够提供EIP以及ELB网络服务。参见以下更详细的说明。"
+
+# d254f6b5f23f4583bf38593e35204bd5
+#: ../../networking2.rst:1077
+msgid "|eip-ns-basiczone.png|"
+msgstr "|eip-ns-basiczone.png|"
+
+# ec87f8235ad14731b88fa165faf2855f
+#: ../../networking2.rst:1079
+msgid ""
+"In the illustration, a NetScaler appliance is the default entry or exit "
+"point for the CloudStack instances, and firewall is the default entry or "
+"exit point for the rest of the data center. Netscaler provides LB services "
+"and staticNAT service to the guest networks. The guest traffic in the pods "
+"and the Management Server are on different subnets / VLANs. The policy-based"
+" routing in the data center core switch sends the public traffic through the"
+" NetScaler, whereas the rest of the data center goes through the firewall."
+msgstr "在图中,NetScaler设备对CloudStack的实例而言是一个默认的入口或出口,防火墙是剩余数据中心的出口或入口。Netscaler对来宾网络提供负载均衡以及静态NAT的服务。在机架和管理服务器上,来宾流量是不同的子网或VLAN。在数据中心的核心交换机的基础路由策略是通过NetScaler转发公共流量,其他数据中心的流量则通过防火墙。"
+
+# cccbede2f664419a97a65174be17cfba
+#: ../../networking2.rst:1088
+msgid "The EIP work flow is as follows:"
+msgstr "EIP的工作流如下:"
+
+# 748bdba8746d4237862652eeefe51b0c
+#: ../../networking2.rst:1092
+msgid ""
+"When a user VM is deployed, a public IP is automatically acquired from the "
+"pool of public IPs configured in the zone. This IP is owned by the VM's "
+"account."
+msgstr "当部署一个用户虚拟机时,会从区域配置的IP中自动获得一个公共IP。这个IP为虚拟机帐户所拥有。"
+
+# b453f18754a649e5913c58ce4a28993b
+#: ../../networking2.rst:1098
+msgid ""
+"Each VM will have its own private IP. When the user VM starts, Static NAT is"
+" provisioned on the NetScaler device by using the Inbound Network Address "
+"Translation (INAT) and Reverse NAT (RNAT) rules between the public IP and "
+"the private IP."
+msgstr "每一个虚拟机都有自己的私有IP。当来客户虚拟机启动时,通过使用在公共IP和私有IP之间的入口网络地址转换(INAT)以及预留地址转换(RNAT),NetScaler设备可以提供静态NAT"
+
+# 6e1a151b2c704623941c8c05d3a90134
+#: ../../networking2.rst:1104
+msgid ""
+"Inbound NAT (INAT) is a type of NAT supported by NetScaler, in which the "
+"destination IP address is replaced in the packets from the public network, "
+"such as the Internet, with the private IP address of a VM in the private "
+"network. Reverse NAT (RNAT) is a type of NAT supported by NetScaler, in "
+"which the source IP address is replaced in the packets generated by a VM in "
+"the private network with the public IP address."
+msgstr "入口网络地址转换(INAT)是NetScaler支持的一类NAT类型,在此类型中,来自公共网络(如Internet)的数据包中的目标IP地址被私有网络中虚拟机的私有地址取代。预留地址转换(RNAT)也是NetScaler支持的一类NAT类型,私有网络中虚拟机产生的数据包中的源IP地址被公共IP地址取代。"
+
+# e64823a0214b46d8a6326da740b47131
+#: ../../networking2.rst:1113
+msgid "This default public IP will be released in two cases:"
+msgstr "默认的公共IP在两种情况下会被释放:"
+
+# ec3de61219d640b2baa722270d509f9b
+#: ../../networking2.rst:1117
+msgid ""
+"When the VM is stopped. When the VM starts, it again receives a new public "
+"IP, not necessarily the same one allocated initially, from the pool of "
+"Public IPs."
+msgstr "当虚拟机停止时。当虚拟机启动时,可以重新获取一个新的公共IP,并不必须是从公共IP地址池中最初分配的那一个。"
+
+# 9429fa004e17414e88ed8a023486ac59
+#: ../../networking2.rst:1123
+msgid ""
+"The user acquires a public IP (Elastic IP). This public IP is associated "
+"with the account, but will not be mapped to any private IP. However, the "
+"user can enable Static NAT to associate this IP to the private IP of a VM in"
+" the account. The Static NAT rule for the public IP can be disabled at any "
+"time. When Static NAT is disabled, a new public IP is allocated from the "
+"pool, which is not necessarily be the same one allocated initially."
+msgstr "当用户获取公共IP(弹性IP)时。这些公共IP与帐户相关联,但不与任何私有IP相关。然而,用户可以开启静态NAT将帐户中虚拟机的私有IP与之关联。对应公共IP的静态NAT规则可随时取消。当静态NAT关闭时,会从地址池中分配的一个新的公共IP,并不必须是最初分配的那一个。"
+
+# 469830a9248b4593a5aac71adbba4340
+#: ../../networking2.rst:1131
+msgid ""
+"For the deployments where public IPs are limited resources, you have the "
+"flexibility to choose not to allocate a public IP by default. You can use "
+"the Associate Public IP option to turn on or off the automatic public IP "
+"assignment in the EIP-enabled Basic zones. If you turn off the automatic "
+"public IP assignment while creating a network offering, only a private IP is"
+" assigned to a VM when the VM is deployed with that network offering. Later,"
+" the user can acquire an IP for the VM and enable static NAT."
+msgstr "对部署而言,公共IP会受限于资源,可以灵活的选择默认不分配公共IP。可以在开启了EIP的基础区域中,通过关联公共IP选项来打开或关闭自动公共IP指定。如果在创建网络方案时,你关闭了自动公共IP指定,则在使用此网络方案部署时,仅会分配一个私有IP给虚拟机。此后,用户虚拟机可以获取一个IP,并可以开启静态NAT。"
+
+# 0ecd0ac61194408a98281da0aadd9e1a
+#: ../../networking2.rst:1140
+msgid ""
+"For more information on the Associate Public IP option, see `\"Creating a "
+"New Network Offering\" <networking.html#creating-a-new-network-offering>`_."
+msgstr "要了解更多关于关联公共IP的选项,请参考`\"创建一个新的网络方案\" <networking.html#creating-a-new-network-offering>`_."
+
+# 3cd8dd1307094741b10ebb57dc03d260
+#: ../../networking2.rst:1144
+msgid ""
+"The Associate Public IP feature is designed only for use with user VMs. The "
+"System VMs continue to get both public IP and private by default, "
+"irrespective of the network offering configuration."
+msgstr "设计关联公共IP的功能,仅是为使用用户虚拟机。系统虚拟机仍然默认会获取公共IP和私有IP,与网络配置并不相关。"
+
+# 3ff9c04d9cd44e088c20dfd89e9b3b8b
+#: ../../networking2.rst:1148
+msgid ""
+"New deployments which use the default shared network offering with EIP and "
+"ELB services to create a shared network in the Basic zone will continue "
+"allocating public IPs to each user VM."
+msgstr "在基础区域中,使用默认具有EIP和ELB服务的网络方案来创建共享网络时,仍然会给每一个用户虚拟机分配公共IP。"
+
+# 16c8dc460b214f4894425176314b9cb3
+#: ../../networking2.rst:1153
+msgid "Portable IPs"
+msgstr "端口IP"
+
+# 3a5bf095b28f463397be53d043c810c8
+#: ../../networking2.rst:1156
+msgid "About Portable IP"
+msgstr "关于端口IP"
+
+# 5458a5ed86214e4c93481bcc51808719
+#: ../../networking2.rst:1158
+msgid ""
+"Portable IPs in CloudStack are region-level pool of IPs, which are elastic "
+"in nature, that can be transferred across geographically separated zones. As"
+" an administrator, you can provision a pool of portable public IPs at region"
+" level and are available for user consumption. The users can acquire "
+"portable IPs if admin has provisioned portable IPs at the region level they "
+"are part of. These IPs can be use for any service within an advanced zone. "
+"You can also use portable IPs for EIP services in basic zones."
+msgstr "在CloudStack中,端口IP是地域级的IP地址池,其天然具有弹性,亦即可以在地理隔离的区域中进行转发。作为管理员,可以在地域级提供IP地址池供用户使用。如果在用户所属的地域,其管理员提供了端口IP,用户就可以获取此类IP。在高级区域内,这些IP可用于任一服务。也可以在基础区域中为EIP服务使用端口IP。"
+
+# 7315df7ef52e4cf1b934b6af1441d884
+#: ../../networking2.rst:1167
+msgid "The salient features of Portable IP are as follows:"
+msgstr "端口IP的主要功能如下:"
+
+# 891115e5cf6a48ada1f4095573352338
+#: ../../networking2.rst:1171
+msgid "IP is statically allocated"
+msgstr "IP是静态分配的。"
+
+# 4d10cf62b6c743b8b592cc802be6cc92
+#: ../../networking2.rst:1175
+msgid "IP need not be associated with a network"
+msgstr "IP与网络无关。"
+
+# 24d3e403f0aa4c39ad463d1fa0ae207d
+#: ../../networking2.rst:1179
+msgid "IP association is transferable across networks"
+msgstr "IP关联是可以通过网络转发的。"
+
+# 74cb916a3d374a76b971841f8b2379a5
+#: ../../networking2.rst:1183
+msgid "IP is transferable across both Basic and Advanced zones"
+msgstr "IP可以在基础区域和高级区域中转发。"
+
+# 7d33ab9a52444bbe9b3f7b3128209e6b
+#: ../../networking2.rst:1187
+msgid "IP is transferable across VPC, non-VPC isolated and shared networks"
+msgstr "IP可通过VPC,非VPC隔离和共享网络进行转发。"
+
+# df1a612ddd7d4098a0ddf9b83ad8a93e
+#: ../../networking2.rst:1191
+msgid "Portable IP transfer is available only for static NAT."
+msgstr "端口IP转发仅对静态NAT可用。"
+
+# bb4f9954dc894d61abfa568fb2e16957
+#: ../../networking2.rst:1196
+msgid ""
+"Before transferring to another network, ensure that no network rules "
+"(Firewall, Static NAT, Port Forwarding, and so on) exist on that portable "
+"IP."
+msgstr "在转发至另一网络前,确保没有网络规则(如防火墙,静态NAT,端口转发等等)不存在于端口IP。"
+
+# 6219f205752d4e34a5f1fbf3a5de51cc
+#: ../../networking2.rst:1201
+msgid "Configuring Portable IPs"
+msgstr "配置端口IP"
+
+# d64282ef04d447a599ddece7139055f7
+#: ../../networking2.rst:1209
+msgid "In the left navigation, click Regions."
+msgstr "在左侧导航栏中,点击地域"
+
+# 8b31c7af9d8541d79d6b98d0ed76d82d
+#: ../../networking2.rst:1213
+msgid "Choose the Regions that you want to work with."
+msgstr "选择拟修改的地域。"
+
+# 1938f07ea2c94222a20b08898972dc0c
+#: ../../networking2.rst:1217
+msgid "Click View Portable IP."
+msgstr "点击查看端口IP"
+
+# 3fd59fc0c5804ab58ed115888d070d9d
+#: ../../networking2.rst:1221
+msgid "Click Portable IP Range."
+msgstr "点击端口IP范围"
+
+# 289d79706e0d4aac949867e57202c169
+#: ../../networking2.rst:1223
+msgid "The Add Portable IP Range window is displayed."
+msgstr "会出现 添加端口IP范围的窗口"
+
+# 6ba39db9be5d430986ffe15997a7b655
+#: ../../networking2.rst:1231
+msgid ""
+"**Start IP/ End IP**: A range of IP addresses that are accessible from the "
+"Internet and will be allocated to guest VMs. Enter the first and last IP "
+"addresses that define a range that CloudStack can assign to guest VMs."
+msgstr "起始IP/结束IP:从Internet可以访问的一个IP地址范围,将会分配给客户虚拟机。输入起始IP以及结束IP,定义CloudStack指定给客户虚拟机的IP范围。"
+
+# a79eef6844454a7e8d9fe27202723b53
+#: ../../networking2.rst:1238
+msgid ""
+"**Gateway**: The gateway in use for the Portable IP addresses you are "
+"configuring."
+msgstr "网关:配置端口IP地址所使用的网关。"
+
+# ade2b585b1ff4b51b25c1f72d1f5a03e
+#: ../../networking2.rst:1243
+msgid "**Netmask**: The netmask associated with the Portable IP range."
+msgstr "掩码:与端口IP范围关联的掩码。"
+
+# 2cce53fcfa9e4ebdb7cec25d4dd3f797
+#: ../../networking2.rst:1247
+msgid "**VLAN**: The VLAN that will be used for public traffic."
+msgstr "VLAN:公共流量拟使用的VLAN。"
+
+# 5c4576cb4d01410ea44f66b3560eec1c
+#: ../../networking2.rst:1254
+msgid "Acquiring a Portable IP"
+msgstr "获取端口IP。"
+
+# fd1b3a3c5e574a7ebb4e782d04f0746b
+# 3ec5393b7aa8486ca2b52df1597e7a98
+# b4889435dd5a4b8986acad62a13ddd6a
+# bfc4acd9c38f49138744c5671d7deb8b
+# 9eae88f558024bafa1c71d5b5f8f6d94
+#: ../../networking2.rst:1266 ../../networking2.rst:3292
+#: ../../networking2.rst:3335 ../../networking2.rst:3378
+#: ../../networking2.rst:3452
+msgid "Click the name of the network where you want to work with."
+msgstr "点击拟修改的网络名称。"
+
+# e986c959252444b99b7c5594762994fb
+# 2809642deff2421db1593ab57615dc68
+# d64bfe77233d4d59b07129a931a574b3
+# 15c8b96721f3464380599d2d5d2f02bc
+# 9751f6d58300447198381c3549bd481e
+# f8c3a0b896d14361b59692083c989410
+# 4bccc75dc7d0449097629003483b3545
+#: ../../networking2.rst:1270 ../../networking2.rst:2223
+#: ../../networking2.rst:3296 ../../networking2.rst:3339
+#: ../../networking2.rst:3382 ../../networking2.rst:3456
+#: ../../networking2.rst:3870
+msgid "Click View IP Addresses."
+msgstr "点击查看IP地址。"
+
+# 667a207d51d24ec19784a9167e8565b8
+# 5605f1edaf4a463a84ae99cdd32825a4
+#: ../../networking2.rst:1274 ../../networking2.rst:3300
+msgid "Click Acquire New IP."
+msgstr "点击获取新IP。"
+
+# 6f484ad19a9e4e70b96bf198ddbcf3f4
+# ac45a6f42e5e42a29e4eb09f827d12a3
+#: ../../networking2.rst:1276 ../../networking2.rst:3302
+msgid "The Acquire New IP window is displayed."
+msgstr "获取新IP的窗口会出现。"
+
+# a62089adc7304fe1a0c39b6e337ddca2
+# 9baf10608a674ae292c3dea0a0859da7
+#: ../../networking2.rst:1280 ../../networking2.rst:3306
+msgid "Specify whether you want cross-zone IP or not."
+msgstr "说明是否需要IP跨区。"
+
+# 3bb7d4dc99f341248a9c5c892bc12485
+#: ../../networking2.rst:1284
+msgid "Click Yes in the confirmation dialog."
+msgstr "在确认对话框中点击确定。"
+
+# 38c1b6967ebb4ec9852ba01c1f005f98
+# 197a1c50649d486ca45fb94f4900aa2d
+#: ../../networking2.rst:1286 ../../networking2.rst:3314
+msgid ""
+"Within a few moments, the new IP address should appear with the state "
+"Allocated. You can now use the IP address in port forwarding or static NAT "
+"rules."
+msgstr "稍等一会,新的IP地址会出现,状态栏为会显示为分配。现在可以在端口转发或静态NAT规则中使用此IP地址了。"
+
+# 524a4bfc4e03495584030002db87273b
+#: ../../networking2.rst:1291
+msgid "Transferring Portable IP"
+msgstr "便携式IP"
+
+# 68465770f0cb4381ac7ce0eb0b65ecbc
+#: ../../networking2.rst:1293
+msgid ""
+"An IP can be transferred from one network to another only if Static NAT is "
+"enabled. However, when a portable IP is associated with a network, you can "
+"use it for any service in the network."
+msgstr "IP要从一个网络转换至另一网络的话,只需启用静态NAT。但是,当一个portable IP对应一个网络的时候,你可以在网络中为任何服务使用它 。"
+
+# b51d59c49aad4d2c82dc7ff551a1e515
+#: ../../networking2.rst:1297
+msgid ""
+"To transfer a portable IP across the networks, execute the following API:"
+msgstr "要跨网络转换一个portable IP,执行下列API:"
+
+# baaa47d9664443df8004dbd797ca37f0
+#: ../../networking2.rst:1304
+msgid ""
+"Replace the UUID with appropriate UUID. For example, if you want to transfer"
+" a portable IP to network X and VM Y in a network, execute the following:"
+msgstr "用正确的UUID替换此处的UUID。比如,如果你想转换一个portable IP至X网络和一个网络中的VM Y,请执行下列操作:"
+
+# 2ab16bedc435498fa54a92c12d41873b
+#: ../../networking2.rst:1313
+msgid "Multiple Subnets in Shared Network"
+msgstr "共享网络中的多子网"
+
+# 052e7dd83a5d49f6830d255583296f7d
+#: ../../networking2.rst:1315
+msgid ""
+"CloudStack provides you with the flexibility to add guest IP ranges from "
+"different subnets in Basic zones and security groups-enabled Advanced zones."
+" For security groups-enabled Advanced zones, it implies multiple subnets can"
+" be added to the same VLAN. With the addition of this feature, you will be "
+"able to add IP address ranges from the same subnet or from a different one "
+"when IP address are exhausted. This would in turn allows you to employ "
+"higher number of subnets and thus reduce the address management overhead. "
+"You can delete the IP ranges you have added."
+msgstr "CloudStack为你提供了在基本zones和启用了安全组的高级zones不同的子网中灵活的添加来宾IP段功能 。在启用了安全组的高级zones中,这意味着多子网可以被添加到同一个VLAN。这个特性还意味着,当IP地址用尽的时候,你可以从同一个子网或从不同的子网添加IP地址范围。这将允许你使用更多的子网,降低地址管理工作量。你也可以删除已经添加的IP地址范围。"
+
+# 39d6185c2a9142778ebfcfaa45d53ea4
+# a87fd7c6cc4d4983be85e89d3f15de49
+# dff9442af85b489c8e6c974a633e5646
+#: ../../networking2.rst:1326 ../../networking2.rst:2963
+#: ../../networking2.rst:3510
+msgid "Prerequisites and Guidelines"
+msgstr "先决条件和指南"
+
+# b12da91685134a71866c8fa74aeaa4de
+#: ../../networking2.rst:1330
+msgid "This feature can only be implemented:"
+msgstr "这个特性只能被实现在:"
+
+# 1393ad33a993459f81ea3de1149b6a09
+#: ../../networking2.rst:1334
+msgid "on IPv4 addresses"
+msgstr "IPv4地址"
+
+# 4764589edb39403a9fd8558614490a61
+#: ../../networking2.rst:1338
+msgid "if virtual router is the DHCP provider"
+msgstr "如果虚拟路由是由DHCP提供的"
+
+# b1541de5c3f0486faa35809ad77b0359
+#: ../../networking2.rst:1342
+msgid "on KVM, xenServer, and VMware hypervisors"
+msgstr "在KVM,XenServer和VMware hypervisors"
+
+# 2422d92308cd49628de0caa0efcad9c7
+#: ../../networking2.rst:1346
+msgid ""
+"Manually configure the gateway of the new subnet before adding the IP range."
+msgstr "在添加IP范围之前,手动配置新子网的网关。"
+
+# bf5e159cb4c54583a861e417824b26a3
+#: ../../networking2.rst:1351
+msgid ""
+"CloudStack supports only one gateway for a subnet; overlapping subnets are "
+"not currently supported"
+msgstr "CloudStack只支持一个子网对应一个网关;交叉子网目前不支持。"
+
+# 7e64cd24270240e9bef22bc1491bf837
+#: ../../networking2.rst:1355
+msgid "Adding Multiple Subnets to a Shared Network"
+msgstr "给共享网络添加多子网"
+
+# 1f05243395c24667a0f7e9c75bbc190f
+#: ../../networking2.rst:1367
+msgid ""
+"On Zones, click View More, then click the zone to which you want to work "
+"with.."
+msgstr "在Zones上,点击查看更多,然后点击你要进行操作的zone.."
+
+# 2b58f0a641ae4d80a61839330e31435b
+#: ../../networking2.rst:1372
+msgid "Click Physical Network."
+msgstr "点击物理网络。"
+
+# 01147d3437e04c6c93201551e05eec93
+#: ../../networking2.rst:1380
+msgid "Click Networks."
+msgstr "点击网络。"
+
+# f5611c1c2d6f4bc2935f6fcb462429ac
+#: ../../networking2.rst:1384
+msgid "Select the networks you want to work with."
+msgstr "选择你想要操作的网络。"
+
+# 8c8af6183f054d4b87cd5369985f279b
+#: ../../networking2.rst:1388
+msgid "Click View IP Ranges."
+msgstr "点击查看IP范围。"
+
+# 27bfee4a94154becadc04d190e2248f0
+#: ../../networking2.rst:1392
+msgid "Click Add IP Range."
+msgstr "点击添加IP范围。"
+
+# 0b8e9d89d4724266b4f358cddb5b5dae
+#: ../../networking2.rst:1394
+msgid "The Add IP Range dialog is displayed, as follows:"
+msgstr "显示的添加IP范围对话框如下:"
+
+# b80689bd7547487da595f615e2462e55
+#: ../../networking2.rst:1396
+msgid "|add-ip-range.png|"
+msgstr "|add-ip-range.png|"
+
+# ecfac85bd0504455b3d64af38c930d89
+# b0284174465747738037a24f289b32cd
+#: ../../networking2.rst:1402 ../../networking2.rst:5168
+msgid "All the fields are mandatory."
+msgstr "所有的区域必须填写的。"
+
+# 2a42d646d37c4df6add5bdf38ceca64d
+# d96a1cf974414215858b14602328707b
+#: ../../networking2.rst:1406 ../../networking2.rst:5186
+msgid ""
+"**Gateway**: The gateway for the tier you create. Ensure that the gateway is"
+" within the Super CIDR range that you specified while creating the VPC, and "
+"is not overlapped with the CIDR of any existing tier within the VPC."
+msgstr "**网关**:你创建网络层的网关。确保网关在你创建VPC时指定的超级CIDR范围内,并且不能与已存在VPC的任何网络层的CIDR重叠。"
+
+# 135026f2c8ab4d77a877e4d100640178
+# 035c6987b29147ebb036cad74b0ca7e2
+#: ../../networking2.rst:1413 ../../networking2.rst:5203
+msgid "**Netmask**: The netmask for the tier you create."
+msgstr "**子网掩码**:你创建的网络层的子网掩码。"
+
+# ff580244e12e4780b2df473d710b2271
+# 8323a108551a443f8e02e4e8bf7cb1cc
+#: ../../networking2.rst:1415 ../../networking2.rst:5205
+msgid ""
+"For example, if the VPC CIDR is 10.0.0.0/16 and the network tier CIDR is "
+"10.0.1.0/24, the gateway of the tier is 10.0.1.1, and the netmask of the "
+"tier is 255.255.255.0."
+msgstr "比如,如果VPC CIDR是10.0.0.0/16并且该网络层CIDR是10.0.1.0/24,那么这个网络层的网关是10.0.1.1,子网掩码是255.255.255.0."
+
+# e68e024d0d01404c95c2dfc37f213a3e
+#: ../../networking2.rst:1421
+msgid ""
+"**Start IP/ End IP**: A range of IP addresses that are accessible from the "
+"Internet and will be allocated to guest VMs. Enter the first and last IP "
+"addresses that define a range that CloudStack can assign to guest VMs ."
+msgstr "**起始/结束IP**:从互联网获得的和将被分配给来宾VMsIP地址范围。输入第一个和最后一个IP地址,该地址范围定义的是CloudStack能分配给来宾VMs的范围。"
+
+# 878c548f176b4ef18a4c21be8ace7a7b
+#: ../../networking2.rst:1431
+msgid "Isolation in Advanced Zone Using Private VLAN"
+msgstr "使用Private VLAN隔离高级Zone中的网络"
+
+# a24c2265540a4aef9c82390bf465ff16
+#: ../../networking2.rst:1433
+msgid ""
+"Isolation of guest traffic in shared networks can be achieved by using "
+"Private VLANs (PVLAN). PVLANs provide Layer 2 isolation between ports within"
+" the same VLAN. In a PVLAN-enabled shared network, a user VM cannot reach "
+"other user VM though they can reach the DHCP server and gateway, this would "
+"in turn allow users to control traffic within a network and help them deploy"
+" multiple applications without communication between application as well as "
+"prevent communication with other users' VMs."
+msgstr "在共享网络中的隔离来宾流量能被Private VLAN(PVLAN)获取。PVLANs提供同一个VLAN里端口间的2层网络隔离。在启用了PVLAN的共享网络,一个用户VM不能到达其他用户VM,但是他们能与DHCP服务器和网关通讯,反过来这样能允许用户去控制网络内部的流量,并且帮助他们像阻止与其他用户VMs通讯一样的去部署无需通讯的多个应用程序。"
+
+# 4a22b32ca020436b81dd8f07f34306f4
+#: ../../networking2.rst:1444
+msgid "Isolate VMs in a shared networks by using Private VLANs."
+msgstr "使用PVLAN在共享网络中隔离VMs。"
+
+# abb78195383c40838e8616f04b87f7f2
+#: ../../networking2.rst:1448
+msgid "Supported on KVM, XenServer, and VMware hypervisors"
+msgstr "在KVM,XenServer和VMware hypervisors中支持"
+
+# 2b02488a70fc420996644982994ac6eb
+#: ../../networking2.rst:1452
+msgid ""
+"PVLAN-enabled shared network can be a part of multiple networks of a guest "
+"VM."
+msgstr "启用了PVLAN的共享网络可以是来宾VM的多个网络的一部分。"
+
+# d86c07b7947d412799db280d59e3f9e5
+#: ../../networking2.rst:1456
+msgid "About Private VLAN"
+msgstr "关于Private VLAN"
+
+# 892b94b696954a8e9527248d969742c6
+#: ../../networking2.rst:1458
+msgid ""
+"In an Ethernet switch, a VLAN is a broadcast domain where hosts can "
+"establish direct communication with each another at Layer 2. Private VLAN is"
+" designed as an extension of VLAN standard to add further segmentation of "
+"the logical broadcast domain. A regular VLAN is a single broadcast domain, "
+"whereas a private VLAN partitions a larger VLAN broadcast domain into "
+"smaller sub-domains. A sub-domain is represented by a pair of VLANs: a "
+"Primary VLAN and a Secondary VLAN. The original VLAN that is being divided "
+"into smaller groups is called Primary, which implies that all VLAN pairs in "
+"a private VLAN share the same Primary VLAN. All the secondary VLANs exist "
+"only inside the Primary. Each Secondary VLAN has a specific VLAN ID "
+"associated to it, which differentiates one sub-domain from another."
+msgstr "在以太网交换机中,VLAN是二层网络中的一个主机之间主机能建立直接通讯的广播域 。Private VLAN被设计成一个标准的VLAN的延伸,为了进一步细分逻辑广播域。一个规则的VLAN是单一广播域,但是一个 private VLAN将一个较大的VLAN广播域划分为较小的多个子域。子域表现为一对VLANs:一个主VLAN和一个辅助VLAN。被划分为较小组的原始VLAN叫主,这意味着所有的在private VLAN中的VLAN对共享着同一个主VLAN。所有的辅助VLANs存在与主VLAN中。每个辅助VLAN有一个特定的区别于其他子域VLAN ID。"
+
+# 65264ae745f94985b736d5abe4446401
+#: ../../networking2.rst:1471
+msgid ""
+"Three types of ports exist in a private VLAN domain, which essentially "
+"determine the behaviour of the participating hosts. Each ports will have its"
+" own unique set of rules, which regulate a connected host's ability to "
+"communicate with other connected host within the same private VLAN domain. "
+"Configure each host that is part of a PVLAN pair can be by using one of "
+"these three port designation:"
+msgstr "在private VLAN中有三种端口类型,它们实质上决定了所包含的主机的流量走势。每组端口都有自己唯一的策略,它能控制配置同一个private VLAN域中连接到端口的主机与其他已连接主机的通讯。使用下面三种端口定义中的一种来配置每个PVLAN对中的主机:"
+
+# 65ce874571f0428cbe807261ef5c91ff
+#: ../../networking2.rst:1480
+msgid ""
+"**Promiscuous**: A promiscuous port can communicate with all the interfaces,"
+" including the community and isolated host ports that belong to the "
+"secondary VLANs. In Promiscuous mode, hosts are connected to promiscuous "
+"ports and are able to communicate directly with resources on both primary "
+"and secondary VLAN. Routers, DHCP servers, and other trusted devices are "
+"typically attached to promiscuous ports."
+msgstr "**混杂模式(Promiscuous)**:混杂模式的端口能与所有的接口通讯,包括可通讯与隔离属于辅助VLANs的主机端口。在混杂模式中,主机被连接到混在模式端口并且能够直接与主VLAN和辅助VLAN中的资源。典型的连接到混杂模式端口的是路由器,DHCP服务器和其他受信任的设备。"
+
+# 11d7e1e2a07f44da85da53d61de9130b
+#: ../../networking2.rst:1490
+msgid ""
+"**Isolated VLANs**: The ports within an isolated VLAN cannot communicate "
+"with each other at the layer-2 level. The hosts that are connected to "
+"Isolated ports can directly communicate only with the Promiscuous resources."
+" If your customer device needs to have access only to a gateway router, "
+"attach it to an isolated port."
+msgstr "**隔离模式(Isolated)VLANs**隔离模式VLAN中的端口不能与其他二层网络中的端口通讯。连接隔离模式端口上的主机只能直接与混杂模式下的资源通讯。如果你的客户设备只访问网关路由器,请将其附加至隔离端口。"
+
+# c008cae9b2a74d48a4170c54a17a63d6
+#: ../../networking2.rst:1498
+msgid ""
+"**Community VLANs**: The ports within a community VLAN can communicate with "
+"each other and with the promiscuous ports, but they cannot communicate with "
+"the ports in other communities at the layer-2 level. In a Community mode, "
+"direct communication is permitted only with the hosts in the same community "
+"and those that are connected to the Primary PVLAN in promiscuous mode. If "
+"your customer has two devices that need to be isolated from other customers'"
+" devices, but to be able to communicate among themselves, deploy them in "
+"community ports."
+msgstr "**Community VLANs**:中的端口能与其他端口和混杂模式下的端口通讯,但是他们不能与二层网络中的其他community VLAN中的端口通讯。在Community模式下,主机能与同一community中的主机和连接到混杂模式中的主VLAN的主机可以通讯。如果你的客户有两个设备需要与其他客户的设备隔离,但是他们之间又要通讯,请将他们部署至 community 端口。"
+
+# eca73570aa5c496ba46877b3392feba4
+#: ../../networking2.rst:1508
+msgid "For further reading:"
+msgstr "延伸阅读:"
+
+# 3fb1a7985e5143939ea6ed3db5517634
+#: ../../networking2.rst:1512
+msgid ""
+"`Understanding Private VLANs "
+"<http://www.cisco.com/en/US/docs/switches/lan/catalyst3750/software/release/12.2_25_see/configuration/guide/swpvlan.html#wp1038379>`_"
+msgstr "`理解 Private VLANs <http://www.cisco.com/en/US/docs/switches/lan/catalyst3750/software/release/12.2_25_see/configuration/guide/swpvlan.html#wp1038379>`_"
+
+# 413321509f2d47a8b184ec2e8adbfcb5
+#: ../../networking2.rst:1517
+msgid ""
+"`Cisco Systems' Private VLANs: Scalable Security in a Multi-Client "
+"Environment <http://tools.ietf.org/html/rfc5517>`_"
+msgstr "`Cisco Systems' Private VLANs: Scalable Security in a Multi-Client Environment <http://tools.ietf.org/html/rfc5517>`_"
+
+# d92ce4bc2e25409b903ed61ed410286d
+#: ../../networking2.rst:1522
+msgid ""
+"`Private VLAN (PVLAN) on vNetwork Distributed Switch - Concept Overview "
+"(1010691) <http://kb.vmware.com>`_"
+msgstr "`Private VLAN (PVLAN) on vNetwork Distributed Switch - Concept Overview (1010691) <http://kb.vmware.com>`_"
+
+# 7b72e0b764624a06bcaed4e13da2da3d
+#: ../../networking2.rst:1530
+msgid "Use a PVLAN supported switch."
+msgstr "在支持的交换机上使用PVLAN。"
+
+# 4c3023eb7cbe49fdbc0af7708061b61c
+#: ../../networking2.rst:1532
+msgid ""
+"See `Private VLAN Catalyst Switch Support Matrix "
+"<http://www.cisco.com/en/US/products/hw/switches/ps708/products_tech_note09186a0080094830.shtml>`_"
+" for more information."
+msgstr "更多信息,请参考 `Private VLAN Catalyst Switch Support Matrix <http://www.cisco.com/en/US/products/hw/switches/ps708/products_tech_note09186a0080094830.shtml>`_ "
+
+# 3d53c6dd5e0c47c98d6a7945385c1baa
+#: ../../networking2.rst:1538
+msgid ""
+"All the layer 2 switches, which are PVLAN-aware, are connected to each "
+"other, and one of them is connected to a router. All the ports connected to "
+"the host would be configured in trunk mode. Open Management VLAN, Primary "
+"VLAN (public) and Secondary Isolated VLAN ports. Configure the switch port "
+"connected to the router in PVLAN promiscuous trunk mode, which would "
+"translate an isolated VLAN to primary VLAN for the PVLAN-unaware router."
+msgstr "将所有能识别PVLAN的二层交换机之间互连,并且其中一个要连至一个路由器。主机连接到的所有端口需配置为trunk模式。打开VLAN管理,主VLAN(公共网

<TRUNCATED>

[27/40] git commit: Adding mo files as the build seems to break otherwise

Posted by ra...@apache.org.
Adding mo files as the build seems to break otherwise


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

Branch: refs/heads/4.4
Commit: e54cd2489c1be37d43ef825fc1752e480eb4364f
Parents: 19e54c2
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Jun 30 11:23:26 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Jun 30 11:23:26 2014 +0200

----------------------------------------------------------------------
 source/locale/zh_CN/LC_MESSAGES/accounts.mo       | Bin 0 -> 21351 bytes
 source/locale/zh_CN/LC_MESSAGES/administration.mo | Bin 0 -> 4620 bytes
 source/locale/zh_CN/LC_MESSAGES/api.mo            | Bin 0 -> 5134 bytes
 source/locale/zh_CN/LC_MESSAGES/events.mo         | Bin 0 -> 14137 bytes
 source/locale/zh_CN/LC_MESSAGES/hosts.mo          | Bin 0 -> 37120 bytes
 source/locale/zh_CN/LC_MESSAGES/index.mo          | Bin 0 -> 1581 bytes
 source/locale/zh_CN/LC_MESSAGES/management.mo     | Bin 0 -> 21220 bytes
 source/locale/zh_CN/LC_MESSAGES/networking.mo     | Bin 0 -> 28699 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.mo    | Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/projects.mo       | Bin 0 -> 26456 bytes
 source/locale/zh_CN/LC_MESSAGES/reliability.mo    | Bin 0 -> 17965 bytes
 .../locale/zh_CN/LC_MESSAGES/service_offerings.mo | Bin 0 -> 40909 bytes
 source/locale/zh_CN/LC_MESSAGES/storage.mo        | Bin 0 -> 54484 bytes
 source/locale/zh_CN/LC_MESSAGES/systemvm.mo       | Bin 0 -> 31949 bytes
 source/locale/zh_CN/LC_MESSAGES/templates.mo      | Bin 0 -> 53480 bytes
 .../locale/zh_CN/LC_MESSAGES/troubleshooting.mo   | Bin 0 -> 17278 bytes
 source/locale/zh_CN/LC_MESSAGES/tuning.mo         | Bin 0 -> 6792 bytes
 source/locale/zh_CN/LC_MESSAGES/ui.mo             | Bin 0 -> 17237 bytes
 source/locale/zh_CN/LC_MESSAGES/usage.mo          | Bin 0 -> 42805 bytes
 .../locale/zh_CN/LC_MESSAGES/virtual_machines.mo  | Bin 0 -> 65215 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/accounts.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/accounts.mo b/source/locale/zh_CN/LC_MESSAGES/accounts.mo
new file mode 100644
index 0000000..8cb6d09
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/accounts.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/administration.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/administration.mo b/source/locale/zh_CN/LC_MESSAGES/administration.mo
new file mode 100644
index 0000000..aaf0abf
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/administration.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/api.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/api.mo b/source/locale/zh_CN/LC_MESSAGES/api.mo
new file mode 100644
index 0000000..cbe1413
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/api.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/events.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/events.mo b/source/locale/zh_CN/LC_MESSAGES/events.mo
new file mode 100644
index 0000000..a461140
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/events.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/hosts.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/hosts.mo b/source/locale/zh_CN/LC_MESSAGES/hosts.mo
new file mode 100644
index 0000000..913f8c4
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/hosts.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/index.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/index.mo b/source/locale/zh_CN/LC_MESSAGES/index.mo
new file mode 100644
index 0000000..6c034c7
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/index.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/management.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/management.mo b/source/locale/zh_CN/LC_MESSAGES/management.mo
new file mode 100644
index 0000000..0b1ed5d
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/management.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/networking.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/networking.mo b/source/locale/zh_CN/LC_MESSAGES/networking.mo
new file mode 100644
index 0000000..353f3d3
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/networking.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/networking2.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/networking2.mo b/source/locale/zh_CN/LC_MESSAGES/networking2.mo
new file mode 100644
index 0000000..20f8247
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/networking2.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/projects.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/projects.mo b/source/locale/zh_CN/LC_MESSAGES/projects.mo
new file mode 100644
index 0000000..29eefc5
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/projects.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/reliability.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/reliability.mo b/source/locale/zh_CN/LC_MESSAGES/reliability.mo
new file mode 100644
index 0000000..90f3fcf
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/reliability.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/service_offerings.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/service_offerings.mo b/source/locale/zh_CN/LC_MESSAGES/service_offerings.mo
new file mode 100644
index 0000000..2a9d34e
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/service_offerings.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/storage.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/storage.mo b/source/locale/zh_CN/LC_MESSAGES/storage.mo
new file mode 100644
index 0000000..eb30eff
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/storage.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/systemvm.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/systemvm.mo b/source/locale/zh_CN/LC_MESSAGES/systemvm.mo
new file mode 100644
index 0000000..1df0256
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/systemvm.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/templates.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/templates.mo b/source/locale/zh_CN/LC_MESSAGES/templates.mo
new file mode 100644
index 0000000..42942b5
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/templates.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/troubleshooting.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/troubleshooting.mo b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.mo
new file mode 100644
index 0000000..415c3e6
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/tuning.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/tuning.mo b/source/locale/zh_CN/LC_MESSAGES/tuning.mo
new file mode 100644
index 0000000..63c3e1a
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/tuning.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/ui.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/ui.mo b/source/locale/zh_CN/LC_MESSAGES/ui.mo
new file mode 100644
index 0000000..6436e06
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/ui.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/usage.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/usage.mo b/source/locale/zh_CN/LC_MESSAGES/usage.mo
new file mode 100644
index 0000000..6be50e9
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/usage.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/virtual_machines.mo
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/virtual_machines.mo b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.mo
new file mode 100644
index 0000000..169e063
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.mo differ


[09/40] Fixed formatting by Will stevens

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/usage.rst
----------------------------------------------------------------------
diff --git a/source/usage.rst b/source/usage.rst
index 16d6e9c..6324bbb 100644
--- a/source/usage.rst
+++ b/source/usage.rst
@@ -29,48 +29,35 @@ template storage space, consumed by guest instances.
 The Usage Server runs at least once per day. It can be configured to run
 multiple times per day.
 
+
 Configuring the Usage Server
 ----------------------------
 
 To configure the usage server:
 
-#. 
-
-   Be sure the Usage Server has been installed. This requires extra
+#. Be sure the Usage Server has been installed. This requires extra
    steps beyond just installing the CloudStack software. See Installing
    the Usage Server (Optional) in the Advanced Installation Guide.
 
-#. 
-
-   Log in to the CloudStack UI as administrator.
-
-#. 
-
-   Click Global Settings.
+#. Log in to the CloudStack UI as administrator.
 
-#. 
+#. Click Global Settings.
 
-   In Search, type usage. Find the configuration parameter that controls
+#. In Search, type usage. Find the configuration parameter that controls
    the behavior you want to set. See the table below for a description
    of the available parameters.
 
-#. 
+#. In Actions, click the Edit icon.
 
-   In Actions, click the Edit icon.
+#. Type the desired value and click the Save icon.
 
-#. 
-
-   Type the desired value and click the Save icon.
-
-#. 
-
-   Restart the Management Server (as usual with any global configuration
+#. Restart the Management Server (as usual with any global configuration
    change) and also the Usage Server:
 
    .. code:: bash
 
-       # service cloudstack-management restart
-       # service cloudstack-usage restart
+      # service cloudstack-management restart
+      # service cloudstack-usage restart
 
 The following table shows the global configuration settings that control
 the behavior of the Usage Server.
@@ -88,18 +75,20 @@ for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:
 
 .. code:: bash
 
-    usage.stats.job.exec.time = 00:15   
-    usage.execution.timezone = PST
-    usage.aggregation.timezone = GMT
+   usage.stats.job.exec.time = 00:15   
+   usage.execution.timezone = PST
+   usage.aggregation.timezone = GMT
 
-Valid values for the time zone are specified in `Appendix A, *Time Zones* <http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones#time-zones>`_
+Valid values for the time zone are specified in `Appendix A, *Time Zones* 
+<http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones#time-zones>`_
 
 Default: GMT
 
 usage.execution.timezone
 
 The time zone of usage.stats.job.exec.time. Valid values for the time
-zone are specified in `Appendix A, *Time Zones* <http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones#time-zones>`_
+zone are specified in `Appendix A, *Time Zones* 
+<http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones#time-zones>`_
 
 Default: The time zone of the management server.
 
@@ -150,33 +139,26 @@ predominantly in the East Coast of the United States, and you would like
 to process usage records every night at 2 AM local (EST) time. Choose
 these settings:
 
--  
-
-   enable.usage.server = true
-
--  
+-  enable.usage.server = true
 
-   usage.execution.timezone = America/New\_York
+-  usage.execution.timezone = America/New\_York
 
--  
-
-   usage.stats.job.exec.time = 07:00. This will run the Usage job at
+-  usage.stats.job.exec.time = 07:00. This will run the Usage job at
    2:00 AM EST. Note that this will shift by an hour as the East Coast
    of the U.S. enters and exits Daylight Savings Time.
 
--  
-
-   usage.stats.job.aggregation.range = 1440
+-  usage.stats.job.aggregation.range = 1440
 
 With this configuration, the Usage job will run every night at 2 AM EST
 and will process records for the previous day’s midnight-midnight as
 defined by the EST (America/New\_York) time zone.
 
 .. note:: 
-    Because the special value 1440 has been used for
-    usage.stats.job.aggregation.range, the Usage Server will ignore the data
-    between midnight and 2 AM. That data will be included in the next day's
-    run.
+   Because the special value 1440 has been used for
+   usage.stats.job.aggregation.range, the Usage Server will ignore the data
+   between midnight and 2 AM. That data will be included in the next day's
+   run.
+
 
 Setting Usage Limits
 --------------------
@@ -186,6 +168,7 @@ resource usage by users. Some of these limits are global configuration
 parameters. Others are applied at the ROOT domain and may be overridden
 on a per-account basis.
 
+
 Globally Configured Limits
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -241,21 +224,13 @@ classified as CPU, RAM, Primary storage, and Secondary storage. The root
 administrator is able to impose resource usage limit by the following
 resource types for Domain, Project, and Accounts.
 
--  
-
-   CPUs
+-  CPUs
 
--  
+-  Memory (RAM)
 
-   Memory (RAM)
+-  Primary Storage (Volumes)
 
--  
-
-   Primary Storage (Volumes)
-
--  
-
-   Secondary Storage (Snapshots, Templates, ISOs)
+-  Secondary Storage (Snapshots, Templates, ISOs)
 
 To control the behaviour of this feature, the following configuration
 parameters have been added:
@@ -281,6 +256,7 @@ max.project.secondary.storage (GB)  Maximum secondary storage space that can be
                                     Default is 400.
 =================================== =================================================================
 
+
 User Permission
 ~~~~~~~~~~~~~~~
 
@@ -288,53 +264,38 @@ The root administrator, domain administrators and users are able to list
 resources. Ensure that proper logs are maintained in the ``vmops.log``
 and ``api.log`` files.
 
--  
-
-   The root admin will have the privilege to list and update resource
+-  The root admin will have the privilege to list and update resource
    limits.
 
--  
-
-   The domain administrators are allowed to list and change these
+-  The domain administrators are allowed to list and change these
    resource limits only for the sub-domains and accounts under their own
    domain or the sub-domains.
 
--  
-
-   The end users will the privilege to list resource limits. Use the
+-  The end users will the privilege to list resource limits. Use the
    listResourceLimits API.
 
+
 Limit Usage Considerations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   Primary or Secondary storage space refers to the stated size of the
+-  Primary or Secondary storage space refers to the stated size of the
    volume and not the physical size— the actual consumed size on disk in
    case of thin provisioning.
 
--  
-
-   If the admin reduces the resource limit for an account and set it to
+-  If the admin reduces the resource limit for an account and set it to
    less than the resources that are currently being consumed, the
    existing VMs/templates/volumes are not destroyed. Limits are imposed
    only if the user under that account tries to execute a new operation
    using any of these resources. For example, the existing behavior in
    the case of a VM are:
 
-   -  
-
-      migrateVirtualMachine: The users under that account will be able
+   -  migrateVirtualMachine: The users under that account will be able
       to migrate the running VM into any other host without facing any
       limit issue.
 
-   -  
-
-      recoverVirtualMachine: Destroyed VMs cannot be recovered.
-
--  
+   -  recoverVirtualMachine: Destroyed VMs cannot be recovered.
 
-   For any resource type, if a domain has limit X, sub-domains or
+-  For any resource type, if a domain has limit X, sub-domains or
    accounts under that domain can have there own limits. However, the
    sum of resource allocated to a sub-domain or accounts under the
    domain at any point of time should not exceed the value X.
@@ -344,15 +305,14 @@ Limit Usage Considerations
    time the resource allocated to D1 and A1 should not exceed the limit
    of 40.
 
--  
-
-   If any operation needs to pass through two of more resource limit
+-  If any operation needs to pass through two of more resource limit
    check, then the lower of 2 limits will be enforced, For example: if
    an account has the VM limit of 10 and CPU limit of 20, and a user
    under that account requests 5 VMs of 4 CPUs each. The user can deploy
    5 more VMs because VM limit is 10. However, the user cannot deploy
    any more instances because the CPU limit has been exhausted.
 
+
 Limiting Resource Usage in a Domain
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -367,76 +327,65 @@ domain.
 
 To set a domain limit:
 
-#. 
-
-   Log in to the CloudStack UI.
-
-#. 
-
-   In the left navigation tree, click Domains.
+#. Log in to the CloudStack UI.
 
-#. 
+#. In the left navigation tree, click Domains.
 
-   Select the domain you want to modify. The current domain limits are
+#. Select the domain you want to modify. The current domain limits are
    displayed.
 
    A value of -1 shows that there is no limit in place.
 
-#. 
+#. Click the Edit button |editbutton.png|
 
-   Click the Edit button |editbutton.png|
+#. Edit the following as per your requirement:
 
-#. 
+   -  Parameter Name
 
-   Edit the following as per your requirement:
+   -  Description
 
-   Parameter Name
+   -  Instance Limits
 
-   Description
+      The number of instances that can be used in a domain.
 
-   Instance Limits
+   -  Public IP Limits
 
-   The number of instances that can be used in a domain.
+      The number of public IP addresses that can be used in a domain.
 
-   Public IP Limits
+   -  Volume Limits
 
-   The number of public IP addresses that can be used in a domain.
+      The number of disk volumes that can be created in a domain.
 
-   Volume Limits
+   -  Snapshot Limits
 
-   The number of disk volumes that can be created in a domain.
+      The number of snapshots that can be created in a domain.
 
-   Snapshot Limits
+   -  Template Limits
 
-   The number of snapshots that can be created in a domain.
+      The number of templates that can be registered in a domain.
 
-   Template Limits
+   -  VPC limits
 
-   The number of templates that can be registered in a domain.
+      The number of VPCs that can be created in a domain.
 
-   VPC limits
+   -  CPU limits
 
-   The number of VPCs that can be created in a domain.
+      The number of CPU cores that can be used for a domain.
 
-   CPU limits
+   -  Memory limits (MB)
 
-   The number of CPU cores that can be used for a domain.
+      The number of RAM that can be used for a domain.
 
-   Memory limits (MB)
+   -  Primary Storage limits (GB)
 
-   The number of RAM that can be used for a domain.
+      The primary storage space that can be used for a domain.
 
-   Primary Storage limits (GB)
+   -  Secondary Storage limits (GB)
 
-   The primary storage space that can be used for a domain.
+      The secondary storage space that can be used for a domain.
 
-   Secondary Storage limits (GB)
+#. Click Apply.
 
-   The secondary storage space that can be used for a domain.
-
-#. 
-
-   Click Apply.
 
 Default Account Resource Limits
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -449,96 +398,84 @@ max.account, for example: max.account.snapshots.
 To override a default limit for a particular account, set a per-account
 resource limit.
 
-#. 
-
-   Log in to the CloudStack UI.
-
-#. 
+#. Log in to the CloudStack UI.
 
-   In the left navigation tree, click Accounts.
+#. In the left navigation tree, click Accounts.
 
-#. 
-
-   Select the account you want to modify. The current limits are
+#. Select the account you want to modify. The current limits are
    displayed.
 
    A value of -1 shows that there is no limit in place.
 
-#. 
-
-   Click the Edit button. |editbutton.png|
-
-#. 
+#. Click the Edit button. |editbutton.png|
 
-   Edit the following as per your requirement:
+#. Edit the following as per your requirement:
 
-   Parameter Name
+   -  Parameter Name
 
-   Description
+   -  Description
 
-   Instance Limits
+   -  Instance Limits
 
-   The number of instances that can be used in an account.
+      The number of instances that can be used in an account.
 
-   The default is 20.
+      The default is 20.
 
-   Public IP Limits
+   -  Public IP Limits
 
-   The number of public IP addresses that can be used in an account.
+      The number of public IP addresses that can be used in an account.
 
-   The default is 20.
+      The default is 20.
 
-   Volume Limits
+   -  Volume Limits
 
-   The number of disk volumes that can be created in an account.
+      The number of disk volumes that can be created in an account.
 
-   The default is 20.
+      The default is 20.
 
-   Snapshot Limits
+   -  Snapshot Limits
 
-   The number of snapshots that can be created in an account.
+      The number of snapshots that can be created in an account.
 
-   The default is 20.
+      The default is 20.
 
-   Template Limits
+   -  Template Limits
 
-   The number of templates that can be registered in an account.
+      The number of templates that can be registered in an account.
 
-   The default is 20.
+      The default is 20.
 
-   VPC limits
+   -  VPC limits
 
-   The number of VPCs that can be created in an account.
+      The number of VPCs that can be created in an account.
 
-   The default is 20.
+      The default is 20.
 
-   CPU limits
+   -  CPU limits
 
-   The number of CPU cores that can be used for an account.
+      The number of CPU cores that can be used for an account.
 
-   The default is 40.
+      The default is 40.
 
-   Memory limits (MB)
+   -  Memory limits (MB)
 
-   The number of RAM that can be used for an account.
+      The number of RAM that can be used for an account.
 
-   The default is 40960.
+      The default is 40960.
 
-   Primary Storage limits (GB)
+   -  Primary Storage limits (GB)
 
-   The primary storage space that can be used for an account.
+      The primary storage space that can be used for an account.
 
-   The default is 200.
+      The default is 200.
 
-   Secondary Storage limits (GB)
+   -  Secondary Storage limits (GB)
 
-   The secondary storage space that can be used for an account.
+      The secondary storage space that can be used for an account.
 
-   The default is 400.
+      The default is 400.
 
-#. 
-
-   Click Apply.
+#. Click Apply.
 
 
 Usage Record Format
@@ -550,450 +487,257 @@ Virtual Machine Usage Record Format
 For running and allocated virtual machine usage, the following fields
 exist in a usage record:
 
--  
-
-   account – name of the account
-
--  
-
-   accountid – ID of the account
-
--  
-
-   domainid – ID of the domain in which this account resides
-
--  
+-  account – name of the account
 
-   zoneid – Zone where the usage occurred
+-  accountid – ID of the account
 
--  
+-  domainid – ID of the domain in which this account resides
 
-   description – A string describing what the usage record is tracking
+-  zoneid – Zone where the usage occurred
 
--  
+-  description – A string describing what the usage record is tracking
 
-   usage – String representation of the usage, including the units of
+-  usage – String representation of the usage, including the units of
    usage (e.g. 'Hrs' for VM running time)
 
--  
+-  usagetype – A number representing the usage type (see Usage Types)
 
-   usagetype – A number representing the usage type (see Usage Types)
+-  rawusage – A number representing the actual usage in hours
 
--  
+-  virtualMachineId – The ID of the virtual machine
 
-   rawusage – A number representing the actual usage in hours
+-  name – The name of the virtual machine
 
--  
+-  offeringid – The ID of the service offering
 
-   virtualMachineId – The ID of the virtual machine
-
--  
-
-   name – The name of the virtual machine
-
--  
-
-   offeringid – The ID of the service offering
-
--  
-
-   templateid – The ID of the template or the ID of the parent template.
+-  templateid – The ID of the template or the ID of the parent template.
    The parent template value is present when the current template was
    created from a volume.
 
--  
-
-   usageid – Virtual machine
-
--  
-
-   type – Hypervisor
+-  usageid – Virtual machine
 
--  
+-  type – Hypervisor
 
-   startdate, enddate – The range of time for which the usage is
+-  startdate, enddate – The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
+
 Network Usage Record Format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For network usage (bytes sent/received), the following fields exist in a
 usage record.
 
--  
-
-   account – name of the account
-
--  
-
-   accountid – ID of the account
-
--  
-
-   domainid – ID of the domain in which this account resides
-
--  
-
-   zoneid – Zone where the usage occurred
-
--  
+-  account – name of the account
 
-   description – A string describing what the usage record is tracking
+-  accountid – ID of the account
 
--  
+-  domainid – ID of the domain in which this account resides
 
-   usagetype – A number representing the usage type (see Usage Types)
+-  zoneid – Zone where the usage occurred
 
--  
+-  description – A string describing what the usage record is tracking
 
-   rawusage – A number representing the actual usage in hours
+-  usagetype – A number representing the usage type (see Usage Types)
 
--  
+-  rawusage – A number representing the actual usage in hours
 
-   usageid – Device ID (virtual router ID or external device ID)
+-  usageid – Device ID (virtual router ID or external device ID)
 
--  
+-  type – Device type (domain router, external load balancer, etc.)
 
-   type – Device type (domain router, external load balancer, etc.)
-
--  
-
-   startdate, enddate – The range of time for which the usage is
+-  startdate, enddate – The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
+
 IP Address Usage Record Format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For IP address usage the following fields exist in a usage record.
 
--  
-
-   account - name of the account
-
--  
-
-   accountid - ID of the account
-
--  
-
-   domainid - ID of the domain in which this account resides
-
--  
+-  account - name of the account
 
-   zoneid - Zone where the usage occurred
+-  accountid - ID of the account
 
--  
+-  domainid - ID of the domain in which this account resides
 
-   description - A string describing what the usage record is tracking
+-  zoneid - Zone where the usage occurred
 
--  
+-  description - A string describing what the usage record is tracking
 
-   usage - String representation of the usage, including the units of
+-  usage - String representation of the usage, including the units of
    usage
 
--  
+-  usagetype - A number representing the usage type (see Usage Types)
 
-   usagetype - A number representing the usage type (see Usage Types)
+-  rawusage - A number representing the actual usage in hours
 
--  
+-  usageid - IP address ID
 
-   rawusage - A number representing the actual usage in hours
-
--  
-
-   usageid - IP address ID
-
--  
-
-   startdate, enddate - The range of time for which the usage is
+-  startdate, enddate - The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
--  
-
-   issourcenat - Whether source NAT is enabled for the IP address
+-  issourcenat - Whether source NAT is enabled for the IP address
 
--  
+-  iselastic - True if the IP address is elastic.
 
-   iselastic - True if the IP address is elastic.
 
 Disk Volume Usage Record Format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For disk volumes, the following fields exist in a usage record.
 
--  
-
-   account – name of the account
-
--  
-
-   accountid – ID of the account
-
--  
-
-   domainid – ID of the domain in which this account resides
+-  account – name of the account
 
--  
+-  accountid – ID of the account
 
-   zoneid – Zone where the usage occurred
+-  domainid – ID of the domain in which this account resides
 
--  
+-  zoneid – Zone where the usage occurred
 
-   description – A string describing what the usage record is tracking
+-  description – A string describing what the usage record is tracking
 
--  
-
-   usage – String representation of the usage, including the units of
+-  usage – String representation of the usage, including the units of
    usage (e.g. 'Hrs' for hours)
 
--  
-
-   usagetype – A number representing the usage type (see Usage Types)
-
--  
-
-   rawusage – A number representing the actual usage in hours
-
--  
-
-   usageid – The volume ID
-
--  
-
-   offeringid – The ID of the disk offering
-
--  
+-  usagetype – A number representing the usage type (see Usage Types)
 
-   type – Hypervisor
+-  rawusage – A number representing the actual usage in hours
 
--  
+-  usageid – The volume ID
 
-   templateid – ROOT template ID
+-  offeringid – The ID of the disk offering
 
--  
+-  type – Hypervisor
 
-   size – The amount of storage allocated
+-  templateid – ROOT template ID
 
--  
+-  size – The amount of storage allocated
 
-   startdate, enddate – The range of time for which the usage is
+-  startdate, enddate – The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
+
 Template, ISO, and Snapshot Usage Record Format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   account – name of the account
-
--  
-
-   accountid – ID of the account
-
--  
+-  account – name of the account
 
-   domainid – ID of the domain in which this account resides
+-  accountid – ID of the account
 
--  
+-  domainid – ID of the domain in which this account resides
 
-   zoneid – Zone where the usage occurred
+-  zoneid – Zone where the usage occurred
 
--  
+-  description – A string describing what the usage record is tracking
 
-   description – A string describing what the usage record is tracking
-
--  
-
-   usage – String representation of the usage, including the units of
+-  usage – String representation of the usage, including the units of
    usage (e.g. 'Hrs' for hours)
 
--  
-
-   usagetype – A number representing the usage type (see Usage Types)
-
--  
+-  usagetype – A number representing the usage type (see Usage Types)
 
-   rawusage – A number representing the actual usage in hours
+-  rawusage – A number representing the actual usage in hours
 
--  
+-  usageid – The ID of the the template, ISO, or snapshot
 
-   usageid – The ID of the the template, ISO, or snapshot
+-  offeringid – The ID of the disk offering
 
--  
-
-   offeringid – The ID of the disk offering
-
--  
-
-   templateid – – Included only for templates (usage type 7). Source
+-  templateid – – Included only for templates (usage type 7). Source
    template ID.
 
--  
-
-   size – Size of the template, ISO, or snapshot
-
--  
+-  size – Size of the template, ISO, or snapshot
 
-   startdate, enddate – The range of time for which the usage is
+-  startdate, enddate – The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
+
 Load Balancer Policy or Port Forwarding Rule Usage Record Format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   account - name of the account
-
--  
-
-   accountid - ID of the account
+-  account - name of the account
 
--  
+-  accountid - ID of the account
 
-   domainid - ID of the domain in which this account resides
+-  domainid - ID of the domain in which this account resides
 
--  
+-  zoneid - Zone where the usage occurred
 
-   zoneid - Zone where the usage occurred
+-  description - A string describing what the usage record is tracking
 
--  
-
-   description - A string describing what the usage record is tracking
-
--  
-
-   usage - String representation of the usage, including the units of
+-  usage - String representation of the usage, including the units of
    usage (e.g. 'Hrs' for hours)
 
--  
-
-   usagetype - A number representing the usage type (see Usage Types)
-
--  
+-  usagetype - A number representing the usage type (see Usage Types)
 
-   rawusage - A number representing the actual usage in hours
+-  rawusage - A number representing the actual usage in hours
 
--  
+-  usageid - ID of the load balancer policy or port forwarding rule
 
-   usageid - ID of the load balancer policy or port forwarding rule
+-  usagetype - A number representing the usage type (see Usage Types)
 
--  
-
-   usagetype - A number representing the usage type (see Usage Types)
-
--  
-
-   startdate, enddate - The range of time for which the usage is
+-  startdate, enddate - The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
+
 Network Offering Usage Record Format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   account – name of the account
+-  account – name of the account
 
--  
+-  accountid – ID of the account
 
-   accountid – ID of the account
+-  domainid – ID of the domain in which this account resides
 
--  
+-  zoneid – Zone where the usage occurred
 
-   domainid – ID of the domain in which this account resides
+-  description – A string describing what the usage record is tracking
 
--  
-
-   zoneid – Zone where the usage occurred
-
--  
-
-   description – A string describing what the usage record is tracking
-
--  
-
-   usage – String representation of the usage, including the units of
+-  usage – String representation of the usage, including the units of
    usage (e.g. 'Hrs' for hours)
 
--  
-
-   usagetype – A number representing the usage type (see Usage Types)
-
--  
-
-   rawusage – A number representing the actual usage in hours
-
--  
+-  usagetype – A number representing the usage type (see Usage Types)
 
-   usageid – ID of the network offering
+-  rawusage – A number representing the actual usage in hours
 
--  
+-  usageid – ID of the network offering
 
-   usagetype – A number representing the usage type (see Usage Types)
+-  usagetype – A number representing the usage type (see Usage Types)
 
--  
+-  offeringid – Network offering ID
 
-   offeringid – Network offering ID
+-  virtualMachineId – The ID of the virtual machine
 
--  
+-  virtualMachineId – The ID of the virtual machine
 
-   virtualMachineId – The ID of the virtual machine
-
--  
-
-   virtualMachineId – The ID of the virtual machine
-
--  
-
-   startdate, enddate – The range of time for which the usage is
+-  startdate, enddate – The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
+
 VPN User Usage Record Format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   account – name of the account
-
--  
-
-   accountid – ID of the account
-
--  
+-  account – name of the account
 
-   domainid – ID of the domain in which this account resides
+-  accountid – ID of the account
 
--  
+-  domainid – ID of the domain in which this account resides
 
-   zoneid – Zone where the usage occurred
+-  zoneid – Zone where the usage occurred
 
--  
+-  description – A string describing what the usage record is tracking
 
-   description – A string describing what the usage record is tracking
-
--  
-
-   usage – String representation of the usage, including the units of
+-  usage – String representation of the usage, including the units of
    usage (e.g. 'Hrs' for hours)
 
--  
-
-   usagetype – A number representing the usage type (see Usage Types)
-
--  
-
-   rawusage – A number representing the actual usage in hours
+-  usagetype – A number representing the usage type (see Usage Types)
 
--  
+-  rawusage – A number representing the actual usage in hours
 
-   usageid – VPN user ID
+-  usageid – VPN user ID
 
--  
+-  usagetype – A number representing the usage type (see Usage Types)
 
-   usagetype – A number representing the usage type (see Usage Types)
-
--  
-
-   startdate, enddate – The range of time for which the usage is
+-  startdate, enddate – The range of time for which the usage is
    aggregated; see Dates in the Usage Record
 
 
@@ -1115,29 +859,30 @@ the following whether in HTTP or HTTPS:
 
 ::
 
-                <listusagerecordsresponse>
-                      <count>1816</count>
-                     <usagerecord>
-                        <account>user5</account>
-                        <accountid>10004</accountid>
-                        <domainid>1</domainid>
-                        <zoneid>1</zoneid>
-                            <description>i-3-4-WC running time (ServiceOffering: 1) (Template: 3)</description>
-                        <usage>2.95288 Hrs</usage>
-                           <usagetype>1</usagetype>
-                        <rawusage>2.95288</rawusage>
-                           <virtualmachineid>4</virtualmachineid>
-                        <name>i-3-4-WC</name>
-                           <offeringid>1</offeringid>
-                        <templateid>3</templateid>
-                        <usageid>245554</usageid>
-                        <type>XenServer</type>
-                        <startdate>2009-09-15T00:00:00-0700</startdate>
-                        <enddate>2009-09-18T16:14:26-0700</enddate>
-                      </usagerecord>
-
-                   … (1,815 more usage records)
-                </listusagerecordsresponse>
+   <listusagerecordsresponse>
+      <count>1816</count>
+      <usagerecord>
+         <account>user5</account>
+         <accountid>10004</accountid>
+         <domainid>1</domainid>
+         <zoneid>1</zoneid>
+         <description>i-3-4-WC running time (ServiceOffering: 1) (Template: 3)</description>
+         <usage>2.95288 Hrs</usage>
+         <usagetype>1</usagetype>
+         <rawusage>2.95288</rawusage>
+         <virtualmachineid>4</virtualmachineid>
+         <name>i-3-4-WC</name>
+         <offeringid>1</offeringid>
+         <templateid>3</templateid>
+         <usageid>245554</usageid>
+         <type>XenServer</type>
+         <startdate>2009-09-15T00:00:00-0700</startdate>
+         <enddate>2009-09-18T16:14:26-0700</enddate>
+      </usagerecord>
+
+      … (1,815 more usage records)
+   </listusagerecordsresponse>
+
 
 Dates in the Usage Record
 -------------------------
@@ -1174,5 +919,6 @@ date and time of the earliest event. For other types of usage, such as
 IP addresses and VMs, the old unprocessed data is not included in daily
 aggregation.
 
+
 .. |editbutton.png| image:: _static/images/edit-icon.png
    :alt: edits the settings.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/virtual_machines.rst
----------------------------------------------------------------------
diff --git a/source/virtual_machines.rst b/source/virtual_machines.rst
index 2c9e8a3..a4db70f 100644
--- a/source/virtual_machines.rst
+++ b/source/virtual_machines.rst
@@ -30,24 +30,20 @@ CloudStack and are available for end users to organize their VMs. Each
 VM can have three names for use in different contexts. Only two of these
 names can be controlled by the user:
 
--  
-
-   Instance name – a unique, immutable ID that is generated by
+-  Instance name – a unique, immutable ID that is generated by
    CloudStack and can not be modified by the user. This name conforms to
    the requirements in IETF RFC 1123.
 
--  
-
-   Display name – the name displayed in the CloudStack web UI. Can be
+-  Display name – the name displayed in the CloudStack web UI. Can be
    set by the user. Defaults to instance name.
 
--  
-
-   Name – host name that the DHCP server assigns to the VM. Can be set
+-  Name – host name that the DHCP server assigns to the VM. Can be set
    by the user. Defaults to instance name
 
 .. note:: 
-   You can append the display name of a guest VM to its internal name. For more information, see `“Appending a Display Name to the Guest VM’s Internal Name” <#appending-a-display-name-to-the-guest-vms-internal-name>`_.
+   You can append the display name of a guest VM to its internal name. 
+   For more information, see `“Appending a Display Name to the Guest VM’s 
+   Internal Name” <#appending-a-display-name-to-the-guest-vms-internal-name>`_.
 
 Guest VMs can be configured to be Highly Available (HA). An HA-enabled
 VM is monitored by the system. If the system detects that the VM is
@@ -74,10 +70,13 @@ unexpectedly. If an HA-enabled VM is shut down from inside the VM,
 CloudStack will restart it. To shut down an HA-enabled VM, you must go
 through the CloudStack UI or API.
 
+
 Best Practices for Virtual Machines
 -----------------------------------
 
-For VMs to work as expected and provide excellent service, follow these guidelines.
+For VMs to work as expected and provide excellent service, follow these 
+guidelines.
+
 
 Monitor VMs for Max Capacity
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -99,45 +98,37 @@ cluster is at most (N-1) \* (per-host-limit). Once a cluster reaches
 this number of VMs, use the CloudStack UI to disable allocation of more
 VMs to the cluster.
 
+
 Install Required Tools and Drivers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Be sure the following are installed on each VM:
 
--  
-
-   For XenServer, install PV drivers and Xen tools on each VM. This will
+-  For XenServer, install PV drivers and Xen tools on each VM. This will
    enable live migration and clean guest shutdown. Xen tools are
    required in order for dynamic CPU and RAM scaling to work.
 
--  
-
-   For vSphere, install VMware Tools on each VM. This will enable
+-  For vSphere, install VMware Tools on each VM. This will enable
    console view to work properly. VMware Tools are required in order for
    dynamic CPU and RAM scaling to work.
 
 To be sure that Xen tools or VMware Tools is installed, use one of the
 following techniques:
 
--  
-
-   Create each VM from a template that already has the tools installed;
+-  Create each VM from a template that already has the tools installed;
    or,
 
--  
-
-   When registering a new template, the administrator or user can
+-  When registering a new template, the administrator or user can
    indicate whether tools are installed on the template. This can be
    done through the UI or using the updateTemplate API; or,
 
--  
-
-   If a user deploys a virtual machine with a template that does not
+-  If a user deploys a virtual machine with a template that does not
    have Xen tools or VMware Tools, and later installs the tools on the
    VM, then the user can inform CloudStack using the
    updateVirtualMachine API. After installing the tools and updating the
    virtual machine, stop and start the VM.
 
+
 VM Lifecycle
 ------------
 
@@ -171,6 +162,7 @@ The user can manually restart the virtual machine from the down state.
 The system will start the virtual machine from the down state
 automatically if the virtual machine is marked as HA-enabled.
 
+
 Creating VMs
 ------------
 
@@ -180,72 +172,55 @@ machine without an OS template. Users can attach an ISO file and install
 the OS from the CD/DVD-ROM.
 
 .. note:: 
-   You can create a VM without starting it. You can determine whether the VM needs to be started as part of the VM deployment. A request parameter, startVM, in the deployVm API provides this feature. For more information, see the Developer's Guide.
+   You can create a VM without starting it. You can determine whether the 
+   VM needs to be started as part of the VM deployment. A request parameter, 
+   startVM, in the deployVm API provides this feature. For more information, 
+   see the Developer's Guide.
 
 To create a VM from a template:
 
-#. 
-
-   Log in to the CloudStack UI as an administrator or user.
-
-#. 
-
-   In the left navigation bar, click Instances.
-
-#. 
+#. Log in to the CloudStack UI as an administrator or user.
 
-   Click Add Instance.
+#. In the left navigation bar, click Instances.
 
-#. 
+#. Click Add Instance.
 
-   Select a zone.
+#. Select a zone.
 
-#. 
-
-   Select a template, then follow the steps in the wizard. For more
+#. Select a template, then follow the steps in the wizard. For more
    information about how the templates came to be in this list, see
    `*Working with Templates* <templates.html>`_.
 
-#. 
-
-   Be sure that the hardware you have allows starting the selected
+#. Be sure that the hardware you have allows starting the selected
    service offering.
 
-#. 
-
-   Click Submit and your VM will be created and started.
+#. Click Submit and your VM will be created and started.
 
    .. note:: 
-      For security reason, the internal name of the VM is visible only to the root admin.
+      For security reason, the internal name of the VM is visible 
+      only to the root admin.
 
 To create a VM from an ISO:
 
 .. note:: 
-   (XenServer) Windows VMs running on XenServer require PV drivers, which may be provided in the template or added after the VM is created. The PV drivers are necessary for essential management functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown.
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or user.
+   (XenServer) Windows VMs running on XenServer require PV drivers, 
+   which may be provided in the template or added after the VM is 
+   created. The PV drivers are necessary for essential management 
+   functions such as mounting additional volumes and ISO images, 
+   live migration, and graceful shutdown.
 
-#. 
+#. Log in to the CloudStack UI as an administrator or user.
 
-   In the left navigation bar, click Instances.
+#. In the left navigation bar, click Instances.
 
-#. 
+#. Click Add Instance.
 
-   Click Add Instance.
+#. Select a zone.
 
-#. 
+#. Select ISO Boot, and follow the steps in the wizard.
 
-   Select a zone.
+#. Click Submit and your VM will be created and started.
 
-#. 
-
-   Select ISO Boot, and follow the steps in the wizard.
-
-#. 
-
-   Click Submit and your VM will be created and started.
 
 Accessing VMs
 -------------
@@ -255,43 +230,32 @@ access all VMs running in the cloud.
 
 To access a VM through the CloudStack UI:
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
-
-#. 
-
-   Click Instances, then click the name of a running VM.
+#. Log in to the CloudStack UI as a user or admin.
 
-#. 
+#. Click Instances, then click the name of a running VM.
 
-   Click the View Console button |console-icon.png|.
+#. Click the View Console button |console-icon.png|.
 
 To access a VM directly over the network:
 
-#. 
-
-   The VM must have some port open to incoming traffic. For example, in
+#. The VM must have some port open to incoming traffic. For example, in
    a basic zone, a new VM might be assigned to a security group which
    allows incoming traffic. This depends on what security group you
    picked when creating the VM. In other cases, you can open a port by
    setting up a port forwarding policy. See `“IP
    Forwarding and Firewalling” <networking2.html#ip-forwarding-and-firewalling>`_.
 
-#. 
-
-   If a port is open but you can not access the VM using ssh, it’s
+#. If a port is open but you can not access the VM using ssh, it’s
    possible that ssh is not already enabled on the VM. This will depend
    on whether ssh is enabled in the template you picked when creating
    the VM. Access the VM through the CloudStack UI and enable ssh on the
    machine using the commands for the VM’s operating system.
 
-#. 
-
-   If the network has an external firewall device, you will need to
+#. If the network has an external firewall device, you will need to
    create a firewall rule to allow access. See `“IP
    Forwarding and Firewalling” <networking2.html#ip-forwarding-and-firewalling>`_.
 
+
 Stopping and Starting VMs
 -------------------------
 
@@ -299,6 +263,7 @@ Once a VM instance is created, you can stop, restart, or delete it as
 needed. In the CloudStack UI, click Instances, select the VM, and use
 the Stop, Start, Reboot, and Destroy buttons.
 
+
 Assigning VMs to Hosts
 ----------------------
 
@@ -306,14 +271,10 @@ At any point in time, each virtual machine instance is running on a
 single host. How does CloudStack determine which host to place a VM on?
 There are several ways:
 
--  
-
-   Automatic default host allocation. CloudStack can automatically pick
+-  Automatic default host allocation. CloudStack can automatically pick
    the most appropriate host to run each virtual machine.
 
--  
-
-   Instance type preferences. CloudStack administrators can specify that
+-  Instance type preferences. CloudStack administrators can specify that
    certain hosts should have a preference for particular types of guest
    instances. For example, an administrator could state that a host
    should have a preference to run Windows guests. The default host
@@ -321,41 +282,32 @@ There are several ways:
    first. If no such host is available, the allocator will place the
    instance wherever there is sufficient physical capacity.
 
--  
-
-   Vertical and horizontal allocation. Vertical allocation consumes all
+-  Vertical and horizontal allocation. Vertical allocation consumes all
    the resources of a given host before allocating any guests on a
    second host. This reduces power consumption in the cloud. Horizontal
    allocation places a guest on each host in a round-robin fashion. This
    may yield better performance to the guests in some cases.
 
--  
-
-   End user preferences. Users can not control exactly which host will
+-  End user preferences. Users can not control exactly which host will
    run a given VM instance, but they can specify a zone for the VM.
    CloudStack is then restricted to allocating the VM only to one of the
    hosts in that zone.
 
--  
-
-   Host tags. The administrator can assign tags to hosts. These tags can
+-  Host tags. The administrator can assign tags to hosts. These tags can
    be used to specify which host a VM should use. The CloudStack
    administrator decides whether to define host tags, then create a
    service offering using those tags and offer it to the user.
 
--  
-
-   Affinity groups. By defining affinity groups and assigning VMs to
+-  Affinity groups. By defining affinity groups and assigning VMs to
    them, the user or administrator can influence (but not dictate) which
    VMs should run on separate hosts. This feature is to let users
    specify that certain VMs won't be on the same host.
 
--  
-
-   CloudStack also provides a pluggable interface for adding new
+-  CloudStack also provides a pluggable interface for adding new
    allocators. These custom allocators can provide any policy the
    administrator desires.
 
+
 Affinity Groups
 ~~~~~~~~~~~~~~~
 
@@ -369,77 +321,57 @@ running on another host.
 
 The scope of an affinity group is per user account.
 
+
 Creating a New Affinity Group
 '''''''''''''''''''''''''''''
 
 To add an affinity group:
 
-#. 
-
-   Log in to the CloudStack UI as an administrator or user.
-
-#. 
+#. Log in to the CloudStack UI as an administrator or user.
 
-   In the left navigation bar, click Affinity Groups.
+#. In the left navigation bar, click Affinity Groups.
 
-#. 
-
-   Click Add affinity group. In the dialog box, fill in the following
+#. Click Add affinity group. In the dialog box, fill in the following
    fields:
 
-   -  
-
-      Name. Give the group a name.
-
-   -  
+   -  Name. Give the group a name.
 
-      Description. Any desired text to tell more about the purpose of
+   -  Description. Any desired text to tell more about the purpose of
       the group.
 
-   -  
-
-      Type. The only supported type shipped with CloudStack is Host
+   -  Type. The only supported type shipped with CloudStack is Host
       Anti-Affinity. This indicates that the VMs in this group should
       avoid being placed on the same host with each other. If you see
       other types in this list, it means that your installation of
       CloudStack has been extended with customized affinity group
       plugins.
 
+
 Assign a New VM to an Affinity Group
 ''''''''''''''''''''''''''''''''''''
 
 To assign a new VM to an affinity group:
 
--  
+-  Create the VM as usual, as described in `“Creating
+   VMs” <virtual_machines.html#creating-vms>`_. In the Add Instance 
+   wizard, there is a new Affinity tab where you can select the 
+   affinity group.
 
-   Create the VM as usual, as described in `“Creating
-   VMs” <virtual_machines.html#creating-vms>`_. In the Add Instance wizard, there is a new
-   Affinity tab where you can select the affinity group.
 
 Change Affinity Group for an Existing VM
 ''''''''''''''''''''''''''''''''''''''''
 
 To assign an existing VM to an affinity group:
 
-#. 
-
-   Log in to the CloudStack UI as an administrator or user.
+#. Log in to the CloudStack UI as an administrator or user.
 
-#. 
+#. In the left navigation bar, click Instances.
 
-   In the left navigation bar, click Instances.
+#. Click the name of the VM you want to work with.
 
-#. 
+#. Stop the VM by clicking the Stop button.
 
-   Click the name of the VM you want to work with.
-
-#. 
-
-   Stop the VM by clicking the Stop button.
-
-#. 
-
-   Click the Change Affinity button. |change-affinity-button.png|
+#. Click the Change Affinity button. |change-affinity-button.png|
 
 
 View Members of an Affinity Group
@@ -447,37 +379,26 @@ View Members of an Affinity Group
 
 To see which VMs are currently assigned to a particular affinity group:
 
-#. 
-
-   In the left navigation bar, click Affinity Groups.
+#. In the left navigation bar, click Affinity Groups.
 
-#. 
+#. Click the name of the group you are interested in.
 
-   Click the name of the group you are interested in.
-
-#. 
-
-   Click View Instances. The members of the group are listed.
+#. Click View Instances. The members of the group are listed.
 
    From here, you can click the name of any VM in the list to access all
    its details and controls.
 
+
 Delete an Affinity Group
 ''''''''''''''''''''''''
 
 To delete an affinity group:
 
-#. 
-
-   In the left navigation bar, click Affinity Groups.
-
-#. 
-
-   Click the name of the group you are interested in.
+#. In the left navigation bar, click Affinity Groups.
 
-#. 
+#. Click the name of the group you are interested in.
 
-   Click Delete.
+#. Click Delete.
 
    Any VM that is a member of the affinity group will be disassociated
    from the group. The former group members will continue to run
@@ -485,6 +406,7 @@ To delete an affinity group:
    longer follow the host allocation rules from its former affinity
    group.
 
+
 Virtual Machine Snapshots
 -------------------------
 
@@ -515,37 +437,31 @@ original.
 
 If you need more information about VM snapshots on VMware, check out the
 VMware documentation and the VMware Knowledge Base, especially
-`Understanding virtual machine
-snapshots <http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180>`_.
+`Understanding virtual machine snapshots 
+<http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180>`_.
+
 
 Limitations on VM Snapshots
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   If a VM has some stored snapshots, you can't attach new volume to the
+-  If a VM has some stored snapshots, you can't attach new volume to the
    VM or delete any existing volumes. If you change the volumes on the
    VM, it would become impossible to restore the VM snapshot which was
    created with the previous volume structure. If you want to attach a
    volume to such a VM, first delete its snapshots.
 
--  
-
-   VM snapshots which include both data volumes and memory can't be kept
+-  VM snapshots which include both data volumes and memory can't be kept
    if you change the VM's service offering. Any existing VM snapshots of
    this type will be discarded.
 
--  
-
-   You can't make a VM snapshot at the same time as you are taking a
+-  You can't make a VM snapshot at the same time as you are taking a
    volume snapshot.
 
--  
-
-   You should use only CloudStack to create VM snapshots on hosts
+-  You should use only CloudStack to create VM snapshots on hosts
    managed by CloudStack. Any snapshots that you make directly on the
    hypervisor will not be tracked in CloudStack.
 
+
 Configuring VM Snapshots
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -570,45 +486,34 @@ vmsnapshot.create.wait
 Number of seconds to wait for a snapshot job to succeed before declaring
 failure and issuing an error.
 
+
 Using VM Snapshots
 ~~~~~~~~~~~~~~~~~~
 
 To create a VM snapshot using the CloudStack UI:
 
-#. 
-
-   Log in to the CloudStack UI as a user or administrator.
-
-#. 
-
-   Click Instances.
+#. Log in to the CloudStack UI as a user or administrator.
 
-#. 
+#. Click Instances.
 
-   Click the name of the VM you want to snapshot.
+#. Click the name of the VM you want to snapshot.
 
-#. 
+#. Click the Take VM Snapshot button. |VMSnapshotButton.png|
 
-   Click the Take VM Snapshot button. |VMSnapshotButton.png|
-
-   .. note:: If a snapshot is already in progress, then clicking this button will have no effect.
-
-#. 
+   .. note:: 
+      If a snapshot is already in progress, then clicking this button 
+      will have no effect.
 
-   Provide a name and description. These will be displayed in the VM
+#. Provide a name and description. These will be displayed in the VM
    Snapshots list.
 
-#. 
-
-   (For running VMs only) If you want to include the VM's memory in the
+#. (For running VMs only) If you want to include the VM's memory in the
    snapshot, click the Memory checkbox. This saves the CPU and memory
    state of the virtual machine. If you don't check this box, then only
    the current state of the VM disk is saved. Checking this box makes
    the snapshot take longer.
 
-#. 
-
-   Quiesce VM: check this box if you want to quiesce the file system on
+#. Quiesce VM: check this box if you want to quiesce the file system on
    the VM before taking the snapshot. Not supported on XenServer when
    used with CloudStack-provided primary storage.
 
@@ -618,35 +523,28 @@ To create a VM snapshot using the CloudStack UI:
    vendor's plugin, the quiesce operation is provided according to the
    vendor's implementation.
 
-#. 
-
-   Click OK.
+#. Click OK.
 
 To delete a snapshot or restore a VM to the state saved in a particular
 snapshot:
 
-#. 
-
-   Navigate to the VM as described in the earlier steps.
-
-#. 
+#. Navigate to the VM as described in the earlier steps.
 
-   Click View VM Snapshots.
+#. Click View VM Snapshots.
 
-#. 
-
-   In the list of snapshots, click the name of the snapshot you want to
+#. In the list of snapshots, click the name of the snapshot you want to
    work with.
 
-#. 
-
-   Depending on what you want to do:
+#. Depending on what you want to do:
 
    To delete the snapshot, click the Delete button. |delete-button.png|
 
    To revert to the snapshot, click the Revert button. |revert-vm.png|
 
-.. note:: VM snapshots are deleted automatically when a VM is destroyed. You don't have to manually delete the snapshots in this case.
+.. note:: 
+   VM snapshots are deleted automatically when a VM is destroyed. You don't 
+   have to manually delete the snapshots in this case.
+
 
 Changing the VM Name, OS, or Group
 ----------------------------------
@@ -656,46 +554,27 @@ system, and the group it belongs to.
 
 To access a VM through the CloudStack UI:
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
-
-#. 
-
-   In the left navigation, click Instances.
-
-#. 
+#. Log in to the CloudStack UI as a user or admin.
 
-   Select the VM that you want to modify.
+#. In the left navigation, click Instances.
 
-#. 
+#. Select the VM that you want to modify.
 
-   Click the Stop button to stop the VM. |StopButton.png|
-
-#. 
-
-   Click Edit. |EditButton.png|
+#. Click the Stop button to stop the VM. |StopButton.png|
 
-#. 
+#. Click Edit. |EditButton.png|
 
-   Make the desired changes to the following:
+#. Make the desired changes to the following:
 
-#. 
-
-   **Display name**: Enter a new display name if you want to change the
+#. **Display name**: Enter a new display name if you want to change the
    name of the VM.
 
-#. 
-
-   **OS Type**: Select the desired operating system.
-
-#. 
+#. **OS Type**: Select the desired operating system.
 
-   **Group**: Enter the group name for the VM.
+#. **Group**: Enter the group name for the VM.
 
-#. 
+#. Click Apply.
 
-   Click Apply.
 
 Appending a Display Name to the Guest VM’s Internal Name
 --------------------------------------------------------
@@ -736,38 +615,25 @@ Changing the Service Offering for a VM
 To upgrade or downgrade the level of compute resources available to a
 virtual machine, you can change the VM's compute offering.
 
-#. 
+#. Log in to the CloudStack UI as a user or admin.
 
-   Log in to the CloudStack UI as a user or admin.
+#. In the left navigation, click Instances.
 
-#. 
+#. Choose the VM that you want to work with.
 
-   In the left navigation, click Instances.
-
-#. 
-
-   Choose the VM that you want to work with.
-
-#. 
-
-   (Skip this step if you have enabled dynamic VM scaling; see
+#. (Skip this step if you have enabled dynamic VM scaling; see
    :ref:`cpu-and-memory-scaling`.)
 
    Click the Stop button to stop the VM. |StopButton.png|
 
-#. 
-
-   Click the Change Service button. |ChangeServiceButton.png|
+#. Click the Change Service button. |ChangeServiceButton.png|
 
    The Change service dialog box is displayed.
 
-#. 
+#. Select the offering you want to apply to the selected VM.
 
-   Select the offering you want to apply to the selected VM.
+#. Click OK.
 
-#. 
-
-   Click OK.
 
 .. _cpu-and-memory-scaling:
 
@@ -784,32 +650,23 @@ without incurring any downtime.
 
 Dynamic CPU and RAM scaling can be used in the following cases:
 
--  
-
-   User VMs on hosts running VMware and XenServer.
-
--  
+-  User VMs on hosts running VMware and XenServer.
 
-   System VMs on VMware.
+-  System VMs on VMware.
 
--  
-
-   VMware Tools or XenServer Tools must be installed on the virtual
+-  VMware Tools or XenServer Tools must be installed on the virtual
    machine.
 
--  
-
-   The new requested CPU and RAM values must be within the constraints
+-  The new requested CPU and RAM values must be within the constraints
    allowed by the hypervisor and the VM operating system.
 
--  
-
-   New VMs that are created after the installation of CloudStack 4.2 can
+-  New VMs that are created after the installation of CloudStack 4.2 can
    use the dynamic scaling feature. If you are upgrading from a previous
    version of CloudStack, your existing VMs created with previous
    versions will not have the dynamic scaling capability unless you
    update them using the following procedure.
 
+
 Updating Existing VMs
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -817,37 +674,24 @@ If you are upgrading from a previous version of CloudStack, and you want
 your existing VMs created with previous versions to have the dynamic
 scaling capability, update the VMs using the following steps:
 
-#. 
-
-   Make sure the zone-level setting enable.dynamic.scale.vm is set to
+#. Make sure the zone-level setting enable.dynamic.scale.vm is set to
    true. In the left navigation bar of the CloudStack UI, click
    Infrastructure, then click Zones, click the zone you want, and click
    the Settings tab.
 
-#. 
-
-   Install Xen tools (for XenServer hosts) or VMware Tools (for VMware
+#. Install Xen tools (for XenServer hosts) or VMware Tools (for VMware
    hosts) on each VM if they are not already installed.
 
-#. 
-
-   Stop the VM.
-
-#. 
+#. Stop the VM.
 
-   Click the Edit button.
+#. Click the Edit button.
 
-#. 
+#. Click the Dynamically Scalable checkbox.
 
-   Click the Dynamically Scalable checkbox.
+#. Click Apply.
 
-#. 
+#. Restart the VM.
 
-   Click Apply.
-
-#. 
-
-   Restart the VM.
 
 Configuring Dynamic CPU and RAM Scaling
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -855,16 +699,13 @@ Configuring Dynamic CPU and RAM Scaling
 To configure this feature, use the following new global configuration
 variables:
 
--  
-
-   enable.dynamic.scale.vm: Set to True to enable the feature. By
+-  enable.dynamic.scale.vm: Set to True to enable the feature. By
    default, the feature is turned off.
 
--  
-
-   scale.retry: How many times to attempt the scaling operation. Default
+-  scale.retry: How many times to attempt the scaling operation. Default
    = 2.
 
+
 How to Dynamically Scale CPU and RAM
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -883,42 +724,34 @@ cluster. If there is no host in the cluster that can fulfill the
 requested level of CPU and RAM, the scaling operation will fail. The VM
 will continue to run as it was before.
 
+
 Limitations
 ~~~~~~~~~~~
 
--  
+-  You can not do dynamic scaling for system VMs on XenServer.
 
-   You can not do dynamic scaling for system VMs on XenServer.
-
--  
-
-   CloudStack will not check to be sure that the new CPU and RAM levels
+-  CloudStack will not check to be sure that the new CPU and RAM levels
    are compatible with the OS running on the VM.
 
--  
-
-   When scaling memory or CPU for a Linux VM on VMware, you might need
+-  When scaling memory or CPU for a Linux VM on VMware, you might need
    to run scripts in addition to the other steps mentioned above. For
    more information, see `Hot adding memory in Linux
    (1012764) <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1012764>`_
    in the VMware Knowledge Base.
 
--  
-
-   (VMware) If resources are not available on the current host, scaling
+-  (VMware) If resources are not available on the current host, scaling
    up will fail on VMware because of a known issue where CloudStack and
    vCenter calculate the available capacity differently. For more
    information, see
    `https://issues.apache.org/jira/browse/CLOUDSTACK-1809 <https://issues.apache.org/jira/browse/CLOUDSTACK-1809>`_.
 
--  
-
-   On VMs running Linux 64-bit and Windows 7 32-bit operating systems,
+-  On VMs running Linux 64-bit and Windows 7 32-bit operating systems,
    if the VM is initially assigned a RAM of less than 3 GB, it can be
    dynamically scaled up to 3 GB, but not more. This is due to a known
    issue with these operating systems, which will freeze if an attempt
    is made to dynamically scale from less than 3 GB to more than 3 GB.
 
+
 Resetting the Virtual Machine Root Volume on Reboot
 ---------------------------------------------------
 
@@ -927,6 +760,7 @@ across reboots, you can reset the root disk. For more information, see
 `“Reset VM to New Root Disk on
 Reboot” <storage.html#reset-vm-to-new-root-disk-on-reboot>`_.
 
+
 Moving VMs Between Hosts (Manual Live Migration)
 ------------------------------------------------
 
@@ -935,63 +769,44 @@ another without interrupting service to users or going into maintenance
 mode. This is called manual live migration, and can be done under the
 following conditions:
 
--  
-
-   The root administrator is logged in. Domain admins and users can not
+-  The root administrator is logged in. Domain admins and users can not
    perform manual live migration of VMs.
 
--  
+-  The VM is running. Stopped VMs can not be live migrated.
 
-   The VM is running. Stopped VMs can not be live migrated.
-
--  
-
-   The destination host must have enough available capacity. If not, the
+-  The destination host must have enough available capacity. If not, the
    VM will remain in the "migrating" state until memory becomes
    available.
 
--  
-
-   (KVM) The VM must not be using local disk storage. (On XenServer and
+-  (KVM) The VM must not be using local disk storage. (On XenServer and
    VMware, VM live migration with local disk is enabled by CloudStack
    support for XenMotion and vMotion.)
 
--  
-
-   (KVM) The destination host must be in the same cluster as the
+-  (KVM) The destination host must be in the same cluster as the
    original host. (On XenServer and VMware, VM live migration from one
    cluster to another is enabled by CloudStack support for XenMotion and
    vMotion.)
 
 To manually live migrate a virtual machine
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
-
-#. 
-
-   In the left navigation, click Instances.
-
-#. 
+#. Log in to the CloudStack UI as a user or admin.
 
-   Choose the VM that you want to migrate.
+#. In the left navigation, click Instances.
 
-#. 
+#. Choose the VM that you want to migrate.
 
-   Click the Migrate Instance button. |Migrateinstance.png|
+#. Click the Migrate Instance button. |Migrateinstance.png|
 
-#. 
-
-   From the list of suitable hosts, choose the one to which you want to
+#. From the list of suitable hosts, choose the one to which you want to
    move the VM.
 
    .. note:: 
-      If the VM's storage has to be migrated along with the VM, this will be noted in the host list. CloudStack will take care of the storage migration for you.
+      If the VM's storage has to be migrated along with the VM, this will 
+      be noted in the host list. CloudStack will take care of the storage 
+      migration for you.
 
-#. 
+#. Click OK.
 
-   Click OK.
 
 Deleting VMs
 ------------
@@ -1002,21 +817,14 @@ any virtual machines.
 
 To delete a virtual machine:
 
-#. 
-
-   Log in to the CloudStack UI as a user or admin.
-
-#. 
+#. Log in to the CloudStack UI as a user or admin.
 
-   In the left navigation, click Instances.
+#. In the left navigation, click Instances.
 
-#. 
+#. Choose the VM that you want to delete.
 
-   Choose the VM that you want to delete.
+#. Click the Destroy Instance button. |Destroyinstance.png|
 
-#. 
-
-   Click the Destroy Instance button. |Destroyinstance.png|
 
 Working with ISOs
 -----------------
@@ -1041,6 +849,7 @@ can also attach ISO images to guest VMs. For example, this enables
 installing PV drivers into Windows. ISO images are not
 hypervisor-specific.
 
+
 Adding an ISO
 ~~~~~~~~~~~~~
 
@@ -1050,166 +859,121 @@ an operating system image, but you can also add ISOs for other types of
 software, such as desktop applications that you want to be installed as
 part of a template.
 
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation bar, click Templates.
-
-#. 
-
-   In Select View, choose ISOs.
-
-#. 
+#. Log in to the CloudStack UI as an administrator or end user.
 
-   Click Add ISO.
+#. In the left navigation bar, click Templates.
 
-#. 
+#. In Select View, choose ISOs.
 
-   In the Add ISO screen, provide the following:
+#. Click Add ISO.
 
-   -  
+#. In the Add ISO screen, provide the following:
 
-      **Name**: Short name for the ISO image. For example, CentOS 6.2
+   -  **Name**: Short name for the ISO image. For example, CentOS 6.2
       64-bit.
 
-   -  
-
-      **Description**: Display test for the ISO image. For example,
+   -  **Description**: Display test for the ISO image. For example,
       CentOS 6.2 64-bit.
 
-   -  
-
-      **URL**: The URL that hosts the ISO image. The Management Server
+   -  **URL**: The URL that hosts the ISO image. The Management Server
       must be able to access this location via HTTP. If needed you can
       place the ISO image directly on the Management Server
 
-   -  
-
-      **Zone**: Choose the zone where you want the ISO to be available,
+   -  **Zone**: Choose the zone where you want the ISO to be available,
       or All Zones to make it available throughout CloudStack.
 
-   -  
-
-      **Bootable**: Whether or not a guest could boot off this ISO
+   -  **Bootable**: Whether or not a guest could boot off this ISO
       image. For example, a CentOS ISO is bootable, a Microsoft Office
       ISO is not bootable.
 
-   -  
-
-      **OS Type**: This helps CloudStack and the hypervisor perform
+   -  **OS Type**: This helps CloudStack and the hypervisor perform
       certain operations and make assumptions that improve the
       performance of the guest. Select one of the following.
 
-      -  
-
-         If the operating system of your desired ISO image is listed,
+      -  If the operating system of your desired ISO image is listed,
          choose it.
 
-      -  
-
-         If the OS Type of the ISO is not listed or if the ISO is not
+      -  If the OS Type of the ISO is not listed or if the ISO is not
          bootable, choose Other.
 
-      -  
-
-         (XenServer only) If you want to boot from this ISO in PV mode,
+      -  (XenServer only) If you want to boot from this ISO in PV mode,
          choose Other PV (32-bit) or Other PV (64-bit)
 
-      -  
-
-         (KVM only) If you choose an OS that is PV-enabled, the VMs
+      -  (KVM only) If you choose an OS that is PV-enabled, the VMs
          created from this ISO will have a SCSI (virtio) root disk. If
          the OS is not PV-enabled, the VMs will have an IDE root disk.
          The PV-enabled types are:
 
-         Fedora 13
+         -  Fedora 13
 
-         Fedora 12
+         -  Fedora 12
 
-         Fedora 11
+         -  Fedora 11
 
-         Fedora 10
+         -  Fedora 10
 
-         Fedora 9
+         -  Fedora 9
 
-         Other PV
+         -  Other PV
 
-         Debian GNU/Linux
+         -  Debian GNU/Linux
 
-         CentOS 5.3
+         -  CentOS 5.3
 
-         CentOS 5.4
+         -  CentOS 5.4
 
-         CentOS 5.5
+         -  CentOS 5.5
 
-         Red Hat Enterprise Linux 5.3
+         -  Red Hat Enterprise Linux 5.3
 
-         Red Hat Enterprise Linux 5.4
+         -  Red Hat Enterprise Linux 5.4
 
-         Red Hat Enterprise Linux 5.5
+         -  Red Hat Enterprise Linux 5.5
 
-         Red Hat Enterprise Linux 6
+         -  Red Hat Enterprise Linux 6
 
       .. note:: 
-         It is not recommended to choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not work. In these cases, choose Other.
+         It is not recommended to choose an older version of the OS than 
+         the version in the image. For example, choosing CentOS 5.4 to 
+         support a CentOS 6.2 image will usually not work. In these 
+         cases, choose Other.
 
-   -  
-
-      **Extractable**: Choose Yes if the ISO should be available for
+   -  **Extractable**: Choose Yes if the ISO should be available for
       extraction.
 
-   -  
-
-      **Public**: Choose Yes if this ISO should be available to other
+   -  **Public**: Choose Yes if this ISO should be available to other
       users.
 
-   -  
-
-      **Featured**: Choose Yes if you would like this ISO to be more
+   -  **Featured**: Choose Yes if you would like this ISO to be more
       prominent for users to select. The ISO will appear in the Featured
       ISOs list. Only an administrator can make an ISO Featured.
 
-#. 
-
-   Click OK.
+#. Click OK.
 
    The Management Server will download the ISO. Depending on the size of
    the ISO, this may take a long time. The ISO status column will
    display Ready once it has been successfully downloaded into secondary
    storage. Clicking Refresh updates the download percentage.
 
-#. 
-
-   **Important**: Wait for the ISO to finish downloading. If you move on
+#. **Important**: Wait for the ISO to finish downloading. If you move on
    to the next task and try to use the ISO right away, it will appear to
    fail. The entire ISO must be available before CloudStack can work
    with it.
 
+
 Attaching an ISO to a VM
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#. 
-
-   In the left navigation, click Instances.
-
-#. 
+#. In the left navigation, click Instances.
 
-   Choose the virtual machine you want to work with.
+#. Choose the virtual machine you want to work with.
 
-#. 
+#. Click the Attach ISO button. |iso.png|
 
-   Click the Attach ISO button. |iso.png|
+#. In the Attach ISO dialog box, select the desired ISO.
 
-#. 
+#. Click OK.
 
-   In the Attach ISO dialog box, select the desired ISO.
-
-#. 
-
-   Click OK.
 
 Changing a VM's Base Image
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1243,6 +1007,7 @@ restoreVirtualMachine call. In this case, the VM's root disk is
 destroyed and recreated, but from the same template or ISO that was
 already in use by the VM.
 
+
 Using SSH Keys for Authentication
 ---------------------------------
 
@@ -1255,52 +1020,44 @@ Because each cloud user has their own SSH key, one cloud user cannot log
 in to another cloud user's instances unless they share their SSH key
 files. Using a single SSH key pair, you can manage multiple instances.
 
+
 Creating an Instance Template that Supports SSH Keys
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Create an instance template that supports SSH Keys.
 
-#. 
-
-   Create a new instance by using the template provided by cloudstack.
+#. Create a new instance by using the template provided by cloudstack.
 
    For more information on creating a new instance, see
 
-#. 
-
-   Download the cloudstack script from `The SSH Key Gen Script <http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`_ to the instance you have created.
+#. Download the cloudstack script from `The SSH Key Gen Script 
+   <http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`_ 
+   to the instance you have created.
 
    .. sourcecode:: bash
 
-       wget http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/cloud-set-guest-sshkey.in?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcloudstack%2Ffiles%2FSSH%2520Key%2520Gen%2520Script%2F&ts=1331225219&use_mirror=iweb
-
-#. 
+      wget http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/cloud-set-guest-sshkey.in?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcloudstack%2Ffiles%2FSSH%2520Key%2520Gen%2520Script%2F&ts=1331225219&use_mirror=iweb
 
-   Copy the file to /etc/init.d.
+#. Copy the file to /etc/init.d.
 
    .. sourcecode:: bash
 
-       cp cloud-set-guest-sshkey.in /etc/init.d/
-
-#. 
+      cp cloud-set-guest-sshkey.in /etc/init.d/
 
-   Give the necessary permissions on the script:
+#. Give the necessary permissions on the script:
 
    .. sourcecode:: bash
 
-       chmod +x /etc/init.d/cloud-set-guest-sshkey.in
+      chmod +x /etc/init.d/cloud-set-guest-sshkey.in
 
-#. 
-
-   Run the script while starting up the operating system:
+#. Run the script while starting up the operating system:
 
    .. sourcecode:: bash
 
-       chkconfig --add cloud-set-guest-sshkey.in
+      chkconfig --add cloud-set-guest-sshkey.in
 
-#. 
+#. Stop the instance.
 
-   Stop the instance.
 
 Creating the SSH Keypair
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1313,56 +1070,53 @@ For example, make a call from the cloudstack server to create a SSH
 keypair called "keypair-doc" for the admin account in the root domain:
 
 .. note:: 
-    Ensure that you adjust these values to meet your needs. If you are making the API call from a different server, your URL/PORT will be different, and you will need to use the API keys.
-
-#. 
+   Ensure that you adjust these values to meet your needs. If you are 
+   making the API call from a different server, your URL/PORT will be 
+   different, and you will need to use the API keys.
 
-   Run the following curl command:
+#. Run the following curl command:
 
    .. sourcecode:: bash
 
-       curl --globoff "http://localhost:8096/?command=createSSHKeyPair&name=keypair-doc&account=admin&domainid=5163440e-c44b-42b5-9109-ad75cae8e8a2"
+      curl --globoff "http://localhost:8096/?command=createSSHKeyPair&name=keypair-doc&account=admin&domainid=5163440e-c44b-42b5-9109-ad75cae8e8a2"
 
    The output is something similar to what is given below:
 
    .. sourcecode:: bash
 
-       <?xml version="1.0" encoding="ISO-8859-1"?><createsshkeypairresponse cloud-stack-version="3.0.0.20120228045507"><keypair><name>keypair-doc</name><fingerprint>f6:77:39:d5:5e:77:02:22:6a:d8:7f:ce:ab:cd:b3:56</fingerprint><privatekey>-----BEGIN RSA PRIVATE KEY-----
-       MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
-       dXYBeZVwakDVsU2MLGl/K+wefwefwefwefwefJyKJaogMKn7BperPD6n1wIDAQAB
-       AoGAdXaJ7uyZKeRDoy6wA0UmF0kSPbMZCR+UTIHNkS/E0/4U+6lhMokmFSHtu
-       mfDZ1kGGDYhMsdytjDBztljawfawfeawefawfawfawQQDCjEsoRdgkduTy
-       QpbSGDIa11Jsc+XNDx2fgRinDsxXI/zJYXTKRhSl/LIPHBw/brW8vzxhOlSOrwm7
-       VvemkkgpAkEAwSeEw394LYZiEVv395ar9MLRVTVLwpo54jC4tsOxQCBlloocK
-       lYaocpk0yBqqOUSBawfIiDCuLXSdvBo1Xz5ICTM19vgvEp/+kMuECQBzm
-       nVo8b2Gvyagqt/KEQo8wzH2THghZ1qQ1QRhIeJG2aissEacF6bGB2oZ7Igim5L14
-       4KR7OeEToyCLC2k+02UCQQCrniSnWKtDVoVqeK/zbB32JhW3Wullv5p5zUEcd
-       KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3
-       -----END RSA PRIVATE KEY-----
-       </privatekey></keypair></createsshkeypairresponse>
-
-#. 
-
-   Copy the key data into a file. The file looks like this:
+      <?xml version="1.0" encoding="ISO-8859-1"?><createsshkeypairresponse cloud-stack-version="3.0.0.20120228045507"><keypair><name>keypair-doc</name><fingerprint>f6:77:39:d5:5e:77:02:22:6a:d8:7f:ce:ab:cd:b3:56</fingerprint><privatekey>-----BEGIN RSA PRIVATE KEY-----
+      MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
+      dXYBeZVwakDVsU2MLGl/K+wefwefwefwefwefJyKJaogMKn7BperPD6n1wIDAQAB
+      AoGAdXaJ7uyZKeRDoy6wA0UmF0kSPbMZCR+UTIHNkS/E0/4U+6lhMokmFSHtu
+      mfDZ1kGGDYhMsdytjDBztljawfawfeawefawfawfawQQDCjEsoRdgkduTy
+      QpbSGDIa11Jsc+XNDx2fgRinDsxXI/zJYXTKRhSl/LIPHBw/brW8vzxhOlSOrwm7
+      VvemkkgpAkEAwSeEw394LYZiEVv395ar9MLRVTVLwpo54jC4tsOxQCBlloocK
+      lYaocpk0yBqqOUSBawfIiDCuLXSdvBo1Xz5ICTM19vgvEp/+kMuECQBzm
+      nVo8b2Gvyagqt/KEQo8wzH2THghZ1qQ1QRhIeJG2aissEacF6bGB2oZ7Igim5L14
+      4KR7OeEToyCLC2k+02UCQQCrniSnWKtDVoVqeK/zbB32JhW3Wullv5p5zUEcd
+      KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3
+      -----END RSA PRIVATE KEY-----
+      </privatekey></keypair></createsshkeypairresponse>
+
+#. Copy the key data into a file. The file looks like this:
 
    .. sourcecode:: bash
 
-       -----BEGIN RSA PRIVATE KEY-----
-       MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
-       dXYBeZVwakDVsU2MLGl/K+wefwefwefwefwefJyKJaogMKn7BperPD6n1wIDAQAB
-       AoGAdXaJ7uyZKeRDoy6wA0UmF0kSPbMZCR+UTIHNkS/E0/4U+6lhMokmFSHtu
-       mfDZ1kGGDYhMsdytjDBztljawfawfeawefawfawfawQQDCjEsoRdgkduTy
-       QpbSGDIa11Jsc+XNDx2fgRinDsxXI/zJYXTKRhSl/LIPHBw/brW8vzxhOlSOrwm7
-       VvemkkgpAkEAwSeEw394LYZiEVv395ar9MLRVTVLwpo54jC4tsOxQCBlloocK
-       lYaocpk0yBqqOUSBawfIiDCuLXSdvBo1Xz5ICTM19vgvEp/+kMuECQBzm
-       nVo8b2Gvyagqt/KEQo8wzH2THghZ1qQ1QRhIeJG2aissEacF6bGB2oZ7Igim5L14
-       4KR7OeEToyCLC2k+02UCQQCrniSnWKtDVoVqeK/zbB32JhW3Wullv5p5zUEcd
-       KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3
-       -----END RSA PRIVATE KEY-----
+      -----BEGIN RSA PRIVATE KEY-----
+      MIICXQIBAAKBgQCSydmnQ67jP6lNoXdX3noZjQdrMAWNQZ7y5SrEu4wDxplvhYci
+      dXYBeZVwakDVsU2MLGl/K+wefwefwefwefwefJyKJaogMKn7BperPD6n1wIDAQAB
+      AoGAdXaJ7uyZKeRDoy6wA0UmF0kSPbMZCR+UTIHNkS/E0/4U+6lhMokmFSHtu
+      mfDZ1kGGDYhMsdytjDBztljawfawfeawefawfawfawQQDCjEsoRdgkduTy
+      QpbSGDIa11Jsc+XNDx2fgRinDsxXI/zJYXTKRhSl/LIPHBw/brW8vzxhOlSOrwm7
+      VvemkkgpAkEAwSeEw394LYZiEVv395ar9MLRVTVLwpo54jC4tsOxQCBlloocK
+      lYaocpk0yBqqOUSBawfIiDCuLXSdvBo1Xz5ICTM19vgvEp/+kMuECQBzm
+      nVo8b2Gvyagqt/KEQo8wzH2THghZ1qQ1QRhIeJG2aissEacF6bGB2oZ7Igim5L14
+      4KR7OeEToyCLC2k+02UCQQCrniSnWKtDVoVqeK/zbB32JhW3Wullv5p5zUEcd
+      KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3
+      -----END RSA PRIVATE KEY-----
 
-#. 
+#. Save the file.
 
-   Save the file.
 
 Creating an Instance
 ~~~~~~~~~~~~~~~~~~~~
@@ -1374,19 +1128,20 @@ Ensure that you use the same SSH key name that you created at
 `Section 5.2.2, “Creating the SSH Keypair” <#create-ssh-keypair>`__.
 
 .. note:: 
-
-   You cannot create the instance by using the GUI at this time and associate the instance with the newly created SSH keypair.
+   You cannot create the instance by using the GUI at this time and 
+   associate the instance with the newly created SSH keypair.
 
 A sample curl command to create a new instance is:
 
 .. sourcecode:: bash
 
-    curl --globoff http://localhost:<port number>/?command=deployVirtualMachine\&zoneId=1\&serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&account=admin\&domainid=1\&keypair=keypair-doc
+   curl --globoff http://localhost:<port number>/?command=deployVirtualMachine\&zoneId=1\&serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&account=admin\&domainid=1\&keypair=keypair-doc
 
 Substitute the template, service offering and security group IDs (if you
 are using the security group feature) that are in your cloud
 environment.
 
+
 Logging In Using the SSH Keypair
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1397,11 +1152,12 @@ For example, from a Linux OS, run:
 
 .. sourcecode:: bash
 
-    ssh -i ~/.ssh/keypair-doc <ip address>
+   ssh -i ~/.ssh/keypair-doc <ip address>
 
 The -i parameter tells the ssh client to use a ssh key found at
 ~/.ssh/keypair-doc.
 
+
 Resetting SSH Keys
 ~~~~~~~~~~~~~~~~~~
 
@@ -1411,6 +1167,7 @@ compromised SSH keypair can be changed, and the user can access the VM
 by using the new keypair. Just create or register a new keypair, then
 call resetSSHKeyForVirtualMachine.
 
+
 .. |basic-deployment.png| image:: _static/images/basic-deployment.png
    :alt: Basic two-machine CloudStack deployment
 .. |VMSnapshotButton.png| image:: _static/images/VMSnapshotButton.png


[06/40] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/remote_access_vpn.rst
----------------------------------------------------------------------
diff --git a/source/networking/remote_access_vpn.rst b/source/networking/remote_access_vpn.rst
new file mode 100644
index 0000000..94e9733
--- /dev/null
+++ b/source/networking/remote_access_vpn.rst
@@ -0,0 +1,696 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Remote Access VPN
+-----------------
+
+CloudStack account owners can create virtual private networks (VPN) to
+access their virtual machines. If the guest network is instantiated from
+a network offering that offers the Remote Access VPN service, the
+virtual router (based on the System VM) is used to provide the service.
+CloudStack provides a L2TP-over-IPsec-based remote access VPN service to
+guest virtual networks. Since each network gets its own virtual router,
+VPNs are not shared across the networks. VPN clients native to Windows,
+Mac OS X and iOS can be used to connect to the guest networks. The
+account owner can create and manage users for their VPN. CloudStack does
+not use its account database for this purpose but uses a separate table.
+The VPN user database is shared across all the VPNs created by the
+account owner. All VPN users get access to all VPNs created by the
+account owner.
+
+.. note:: 
+   Make sure that not all traffic goes through the VPN. That is, the route
+   installed by the VPN should be only for the guest network and not for
+   all traffic.
+
+-  **Road Warrior / Remote Access**. Users want to be able to connect
+   securely from a home or office to a private network in the cloud.
+   Typically, the IP address of the connecting client is dynamic and
+   cannot be preconfigured on the VPN server.
+
+-  **Site to Site**. In this scenario, two private subnets are connected
+   over the public Internet with a secure VPN tunnel. The cloud user's
+   subnet (for example, an office network) is connected through a
+   gateway to the network in the cloud. The address of the user's
+   gateway must be preconfigured on the VPN server in the cloud. Note
+   that although L2TP-over-IPsec can be used to set up Site-to-Site
+   VPNs, this is not the primary intent of this feature. For more
+   information, see ":ref:`setting-s2s-vpn-conn`".
+
+
+Configuring Remote Access VPN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To set up VPN for the cloud:
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, click Global Settings.
+
+#. Set the following global configuration parameters.
+
+   -  remote.access.vpn.client.ip.range - The range of IP addresses to
+      be allocated to remote access VPN clients. The first IP in the
+      range is used by the VPN server.
+
+   -  remote.access.vpn.psk.length - Length of the IPSec key.
+
+   -  remote.access.vpn.user.limit - Maximum number of VPN users per
+      account.
+
+To enable VPN for a particular network:
+
+#. Log in as a user or administrator to the CloudStack UI.
+
+#. In the left navigation, click Network.
+
+#. Click the name of the network you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click one of the displayed IP address names.
+
+#. Click the Enable VPN button. |vpn-icon.png|
+
+   The IPsec key is displayed in a popup window.
+
+
+Configuring Remote Access VPN in VPC
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On enabling Remote Access VPN on a VPC, any VPN client present outside
+the VPC can access VMs present in the VPC by using the Remote VPN
+connection. The VPN client can be present anywhere except inside the VPC
+on which the user enabled the Remote Access VPN service.
+
+To enable VPN for a VPC:
+
+#. Log in as a user or administrator to the CloudStack UI.
+
+#. In the left navigation, click Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. In the Router node, select Public IP Addresses.
+
+   The IP Addresses page is displayed.
+
+#. Click Source NAT IP address.
+
+#. Click the Enable VPN button. |vpn-icon.png|
+
+   Click OK to confirm. The IPsec key is displayed in a pop-up window.
+
+Now, you need to add the VPN users.
+
+#. Click the Source NAT IP.
+
+#. Select the VPN tab.
+
+#. Add the username and the corresponding password of the user you
+   wanted to add.
+
+#. Click Add.
+
+#. Repeat the same steps to add the VPN users.
+
+
+Using Remote Access VPN with Windows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The procedure to use VPN varies by Windows version. Generally, the user
+must edit the VPN properties and make sure that the default route is not
+the VPN. The following steps are for Windows L2TP clients on Windows
+Vista. The commands should be similar for other Windows versions.
+
+#. Log in to the CloudStack UI and click on the source NAT IP for the
+   account. The VPN tab should display the IPsec preshared key. Make a
+   note of this and the source NAT IP. The UI also lists one or more
+   users and their passwords. Choose one of these users, or, if none
+   exists, add a user and password.
+
+#. On the Windows box, go to Control Panel, then select Network and
+   Sharing center. Click Setup a connection or network.
+
+#. In the next dialog, select No, create a new connection.
+
+#. In the next dialog, select Use my Internet Connection (VPN).
+
+#. In the next dialog, enter the source NAT IP from step
+   #1 and give the connection a name. Check Don't
+   connect now.
+
+#. In the next dialog, enter the user name and password selected in step
+   #1.
+
+#. Click Create.
+
+#. Go back to the Control Panel and click Network Connections to see the
+   new connection. The connection is not active yet.
+
+#. Right-click the new connection and select Properties. In the
+   Properties dialog, select the Networking tab.
+
+#.
+
+   In Type of VPN, choose L2TP IPsec VPN, then click IPsec settings.
+   Select Use preshared key. Enter the preshared key from step #1.
+
+#. The connection is ready for activation. Go back to Control Panel ->
+   Network Connections and double-click the created connection.
+
+#. Enter the user name and password from step #1.
+
+
+Using Remote Access VPN with Mac OS X
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, be sure you've configured the VPN settings in your CloudStack
+install. This section is only concerned with connecting via Mac OS X to
+your VPN.
+
+Note, these instructions were written on Mac OS X 10.7.5. They may
+differ slightly in older or newer releases of Mac OS X.
+
+#. On your Mac, open System Preferences and click Network.
+
+#. Make sure Send all traffic over VPN connection is not checked.
+
+#. If your preferences are locked, you'll need to click the lock in the
+   bottom left-hand corner to make any changes and provide your
+   administrator credentials.
+
+#. You will need to create a new network entry. Click the plus icon on
+   the bottom left-hand side and you'll see a dialog that says "Select
+   the interface and enter a name for the new service." Select VPN from
+   the Interface drop-down menu, and "L2TP over IPSec" for the VPN Type.
+   Enter whatever you like within the "Service Name" field.
+
+#. You'll now have a new network interface with the name of whatever you
+   put in the "Service Name" field. For the purposes of this example,
+   we'll assume you've named it "CloudStack." Click on that interface
+   and provide the IP address of the interface for your VPN under the
+   Server Address field, and the user name for your VPN under Account
+   Name.
+
+#. Click Authentication Settings, and add the user's password under User
+   Authentication and enter the pre-shared IPSec key in the Shared
+   Secret field under Machine Authentication. Click OK.
+
+#. You may also want to click the "Show VPN status in menu bar" but
+   that's entirely optional.
+
+#. Now click "Connect" and you will be connected to the CloudStack VPN.
+
+
+.. _setting-s2s-vpn-conn:
+
+Setting Up a Site-to-Site VPN Connection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A Site-to-Site VPN connection helps you establish a secure connection
+from an enterprise datacenter to the cloud infrastructure. This allows
+users to access the guest VMs by establishing a VPN connection to the
+virtual router of the account from a device in the datacenter of the
+enterprise. You can also establish a secure connection between two VPC
+setups or high availability zones in your environment. Having this
+facility eliminates the need to establish VPN connections to individual
+VMs.
+
+The difference from Remote VPN is that Site-to-site VPNs connects entire
+networks to each other, for example, connecting a branch office network
+to a company headquarters network. In a site-to-site VPN, hosts do not
+have VPN client software; they send and receive normal TCP/IP traffic
+through a VPN gateway.
+
+The supported endpoints on the remote datacenters are:
+
+-  Cisco ISR with IOS 12.4 or later
+
+-  Juniper J-Series routers with JunOS 9.5 or later
+
+-  CloudStack virtual routers
+
+.. note:: 
+   In addition to the specific Cisco and Juniper devices listed above, the
+   expectation is that any Cisco or Juniper device running on the supported
+   operating systems are able to establish VPN connections.
+
+To set up a Site-to-Site VPN connection, perform the following:
+
+#. Create a Virtual Private Cloud (VPC).
+
+   See ":ref:`configuring-vpc`".
+
+#. Create a VPN Customer Gateway.
+
+#. Create a VPN gateway for the VPC that you created.
+
+#. Create VPN connection from the VPC VPN gateway to the customer VPN
+   gateway.
+
+
+Creating and Updating a VPN Customer Gateway
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. note:: 
+   A VPN customer gateway can be connected to only one VPN gateway at a time.
+
+To add a VPN Customer Gateway:
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPN Customer Gateway.
+
+#. Click Add VPN Customer Gateway.
+
+   |addvpncustomergateway.png|
+
+   Provide the following information:
+
+   -  **Name**: A unique name for the VPN customer gateway you create.
+
+   -  **Gateway**: The IP address for the remote gateway.
+
+   -  **CIDR list**: The guest CIDR list of the remote subnets. Enter a
+      CIDR or a comma-separated list of CIDRs. Ensure that a guest CIDR
+      list is not overlapped with the VPC's CIDR, or another guest CIDR.
+      The CIDR must be RFC1918-compliant.
+
+   -  **IPsec Preshared Key**: Preshared keying is a method where the
+      endpoints of the VPN share a secret key. This key value is used to
+      authenticate the customer gateway and the VPC VPN gateway to each
+      other.
+
+      .. note:: 
+         The IKE peers (VPN end points) authenticate each other by
+         computing and sending a keyed hash of data that includes the
+         Preshared key. If the receiving peer is able to create the same
+         hash independently by using its Preshared key, it knows that both
+         peers must share the same secret, thus authenticating the customer
+         gateway.
+
+   -  **IKE Encryption**: The Internet Key Exchange (IKE) policy for
+      phase-1. The supported encryption algorithms are AES128, AES192,
+      AES256, and 3DES. Authentication is accomplished through the
+      Preshared Keys.
+
+      .. note:: 
+         The phase-1 is the first phase in the IKE process. In this initial
+         negotiation phase, the two VPN endpoints agree on the methods to
+         be used to provide security for the underlying IP traffic. The
+         phase-1 authenticates the two VPN gateways to each other, by
+         confirming that the remote gateway has a matching Preshared Key.
+
+   -  **IKE Hash**: The IKE hash for phase-1. The supported hash
+      algorithms are SHA1 and MD5.
+
+   -  **IKE DH**: A public-key cryptography protocol which allows two
+      parties to establish a shared secret over an insecure
+      communications channel. The 1536-bit Diffie-Hellman group is used
+      within IKE to establish session keys. The supported options are
+      None, Group-5 (1536-bit) and Group-2 (1024-bit).
+
+   -  **ESP Encryption**: Encapsulating Security Payload (ESP) algorithm
+      within phase-2. The supported encryption algorithms are AES128,
+      AES192, AES256, and 3DES.
+
+      .. note:: 
+         The phase-2 is the second phase in the IKE process. The purpose of
+         IKE phase-2 is to negotiate IPSec security associations (SA) to
+         set up the IPSec tunnel. In phase-2, new keying material is
+         extracted from the Diffie-Hellman key exchange in phase-1, to
+         provide session keys to use in protecting the VPN data flow.
+
+   -  **ESP Hash**: Encapsulating Security Payload (ESP) hash for
+      phase-2. Supported hash algorithms are SHA1 and MD5.
+
+   -  **Perfect Forward Secrecy**: Perfect Forward Secrecy (or PFS) is
+      the property that ensures that a session key derived from a set of
+      long-term public and private keys will not be compromised. This
+      property enforces a new Diffie-Hellman key exchange. It provides
+      the keying material that has greater key material life and thereby
+      greater resistance to cryptographic attacks. The available options
+      are None, Group-5 (1536-bit) and Group-2 (1024-bit). The security
+      of the key exchanges increase as the DH groups grow larger, as
+      does the time of the exchanges.
+
+      .. note:: 
+         When PFS is turned on, for every negotiation of a new phase-2 SA
+         the two gateways must generate a new set of phase-1 keys. This
+         adds an extra layer of protection that PFS adds, which ensures if
+         the phase-2 SA's have expired, the keys used for new phase-2 SA's
+         have not been generated from the current phase-1 keying material.
+
+   -  **IKE Lifetime (seconds)**: The phase-1 lifetime of the security
+      association in seconds. Default is 86400 seconds (1 day). Whenever
+      the time expires, a new phase-1 exchange is performed.
+
+   -  **ESP Lifetime (seconds)**: The phase-2 lifetime of the security
+      association in seconds. Default is 3600 seconds (1 hour). Whenever
+      the value is exceeded, a re-key is initiated to provide a new
+      IPsec encryption and authentication session keys.
+
+   -  **Dead Peer Detection**: A method to detect an unavailable
+      Internet Key Exchange (IKE) peer. Select this option if you want
+      the virtual router to query the liveliness of its IKE peer at
+      regular intervals. It's recommended to have the same configuration
+      of DPD on both side of VPN connection.
+
+#. Click OK.
+
+
+Updating and Removing a VPN Customer Gateway
+''''''''''''''''''''''''''''''''''''''''''''
+
+You can update a customer gateway either with no VPN connection, or
+related VPN connection is in error state.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPN Customer Gateway.
+
+#. Select the VPN customer gateway you want to work with.
+
+#. To modify the required parameters, click the Edit VPN Customer
+   Gateway button |vpn-edit-icon.png|
+
+#. To remove the VPN customer gateway, click the Delete VPN Customer
+   Gateway button |delete.png|
+
+#. Click OK.
+
+
+Creating a VPN gateway for the VPC
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC to which you want to deploy the
+   VMs.
+
+   The VPC page is displayed where all the tiers you created are listed
+   in a diagram.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. Select Site-to-Site VPN.
+
+   If you are creating the VPN gateway for the first time, selecting
+   Site-to-Site VPN prompts you to create a VPN gateway.
+
+#. In the confirmation dialog, click Yes to confirm.
+
+   Within a few moments, the VPN gateway is created. You will be
+   prompted to view the details of the VPN gateway you have created.
+   Click Yes to confirm.
+
+   The following details are displayed in the VPN Gateway page:
+
+   -  IP Address
+
+   -  Account
+
+   -  Domain
+
+
+Creating a VPN Connection
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. note:: CloudStack supports creating up to 8 VPN connections.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you create for the account are listed in the page.
+
+#. Click the Configure button of the VPC to which you want to deploy the
+   VMs.
+
+   The VPC page is displayed where all the tiers you created are listed
+   in a diagram.
+
+#. Click the Settings icon.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. Select Site-to-Site VPN.
+
+   The Site-to-Site VPN page is displayed.
+
+#. From the Select View drop-down, ensure that VPN Connection is
+   selected.
+
+#. Click Create VPN Connection.
+
+   The Create VPN Connection dialog is displayed:
+
+   |createvpnconnection.png|
+
+#. Select the desired customer gateway.
+
+#. Select Passive if you want to establish a connection between two VPC
+   virtual routers.
+
+   If you want to establish a connection between two VPC virtual
+   routers, select Passive only on one of the VPC virtual routers, which
+   waits for the other VPC virtual router to initiate the connection. Do
+   not select Passive on the VPC virtual router that initiates the
+   connection.
+
+#. Click OK to confirm.
+
+   Within a few moments, the VPN Connection is displayed.
+
+   The following information on the VPN connection is displayed:
+
+   -  IP Address
+
+   -  Gateway
+
+   -  State
+
+   -  IPSec Preshared Key
+
+   -  IKE Policy
+
+   -  ESP Policy
+
+
+Site-to-Site VPN Connection Between VPC Networks
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+CloudStack provides you with the ability to establish a site-to-site VPN
+connection between CloudStack virtual routers. To achieve that, add a
+passive mode Site-to-Site VPN. With this functionality, users can deploy
+applications in multiple Availability Zones or VPCs, which can
+communicate with each other by using a secure Site-to-Site VPN Tunnel.
+
+This feature is supported on all the hypervisors.
+
+#. Create two VPCs. For example, VPC A and VPC B.
+
+   For more information, see ":ref:`configuring-vpc`".
+
+#. Create VPN gateways on both the VPCs you created.
+
+   For more information, see `"Creating a VPN gateway
+   for the VPC" <#creating-a-vpn-gateway-for-the-vpc>`_.
+
+#. Create VPN customer gateway for both the VPCs.
+
+   For more information, see `"Creating and Updating
+   a VPN Customer Gateway" <#creating-and-updating-a-vpn-customer-gateway>`_.
+
+#. Enable a VPN connection on VPC A in passive mode.
+
+   For more information, see `"Creating a VPN
+   Connection" <#creating-a-vpn-connection>`_.
+
+   Ensure that the customer gateway is pointed to VPC B. The VPN
+   connection is shown in the Disconnected state.
+
+#. Enable a VPN connection on VPC B.
+
+   Ensure that the customer gateway is pointed to VPC A. Because virtual
+   router of VPC A, in this case, is in passive mode and is waiting for
+   the virtual router of VPC B to initiate the connection, VPC B virtual
+   router should not be in passive mode.
+
+   The VPN connection is shown in the Disconnected state.
+
+   Creating VPN connection on both the VPCs initiates a VPN connection.
+   Wait for few seconds. The default is 30 seconds for both the VPN
+   connections to show the Connected state.
+
+
+Restarting and Removing a VPN Connection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC to which you want to deploy the
+   VMs.
+
+   The VPC page is displayed where all the tiers you created are listed
+   in a diagram.
+
+#. Click the Settings icon.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. Select Site-to-Site VPN.
+
+   The Site-to-Site VPN page is displayed.
+
+#. From the Select View drop-down, ensure that VPN Connection is
+   selected.
+
+   All the VPN connections you created are displayed.
+
+#. Select the VPN connection you want to work with.
+
+   The Details tab is displayed.
+
+#. To remove a VPN connection, click the Delete VPN connection button
+   |remove-vpn.png|
+
+   To restart a VPN connection, click the Reset VPN connection button
+   present in the Details tab. |reset-vpn.png|
+
+
+.. |vpn-icon.png| image:: /_static/images/vpn-icon.png
+   :alt: button to enable VPN.
+.. |addvpncustomergateway.png| image:: /_static/images/add-vpn-customer-gateway.png
+   :alt: adding a customer gateway.
+.. |createvpnconnection.png| image:: /_static/images/create-vpn-connection.png
+   :alt: creating a VPN connection to the customer gateway.
+.. |remove-vpn.png| image:: /_static/images/remove-vpn.png
+   :alt: button to remove a VPN connection
+.. |reset-vpn.png| image:: /_static/images/reset-vpn.png
+   :alt: button to reset a VPN connection
+.. |delete.png| image:: /_static/images/delete-button.png
+   :alt: button to remove a VPN customer gateway.
+.. |vpn-edit-icon.png| image:: /_static/images/edit-icon.png
+   :alt: button to edit.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/security_groups.rst
----------------------------------------------------------------------
diff --git a/source/networking/security_groups.rst b/source/networking/security_groups.rst
new file mode 100644
index 0000000..9ff2841
--- /dev/null
+++ b/source/networking/security_groups.rst
@@ -0,0 +1,214 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Security Groups
+---------------
+
+About Security Groups
+~~~~~~~~~~~~~~~~~~~~~
+
+Security groups provide a way to isolate traffic to VMs. A security
+group is a group of VMs that filter their incoming and outgoing traffic
+according to a set of rules, called ingress and egress rules. These
+rules filter network traffic according to the IP address that is
+attempting to communicate with the VM. Security groups are particularly
+useful in zones that use basic networking, because there is a single
+guest network for all guest VMs. In advanced zones, security groups are
+supported only on the KVM hypervisor.
+
+.. note:: 
+   In a zone that uses advanced networking, you can instead define multiple guest networks to isolate traffic to VMs.
+
+Each CloudStack account comes with a default security group that denies
+all inbound traffic and allows all outbound traffic. The default
+security group can be modified so that all new VMs inherit some other
+desired set of rules.
+
+Any CloudStack user can set up any number of additional security groups.
+When a new VM is launched, it is assigned to the default security group
+unless another user-defined security group is specified. A VM can be a
+member of any number of security groups. Once a VM is assigned to a
+security group, it remains in that group for its entire lifetime; you
+can not move a running VM from one security group to another.
+
+You can modify a security group by deleting or adding any number of
+ingress and egress rules. When you do, the new rules apply to all VMs in
+the group, whether running or stopped.
+
+If no ingress rules are specified, then no traffic will be allowed in,
+except for responses to any traffic that has been allowed out through an
+egress rule.
+
+
+Adding a Security Group
+~~~~~~~~~~~~~~~~~~~~~~~
+
+A user or administrator can define a new security group.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In Select view, choose Security Groups.
+
+#. Click Add Security Group.
+
+#. Provide a name and description.
+
+#. Click OK.
+
+   The new security group appears in the Security Groups Details tab.
+
+#. To make the security group useful, continue to Adding Ingress and
+   Egress Rules to a Security Group.
+
+
+Security Groups in Advanced Zones (KVM Only)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+CloudStack provides the ability to use security groups to provide
+isolation between guests on a single shared, zone-wide network in an
+advanced zone where KVM is the hypervisor. Using security groups in
+advanced zones rather than multiple VLANs allows a greater range of
+options for setting up guest isolation in a cloud.
+
+
+Limitations
+^^^^^^^^^^^
+
+The following are not supported for this feature:
+
+-  Two IP ranges with the same VLAN and different gateway or netmask in
+   security group-enabled shared network.
+
+-  Two IP ranges with the same VLAN and different gateway or netmask in
+   account-specific shared networks.
+
+-  Multiple VLAN ranges in security group-enabled shared network.
+
+-  Multiple VLAN ranges in account-specific shared networks.
+
+Security groups must be enabled in the zone in order for this feature to
+be used.
+
+
+Enabling Security Groups
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order for security groups to function in a zone, the security groups
+feature must first be enabled for the zone. The administrator can do
+this when creating a new zone, by selecting a network offering that
+includes security groups. The procedure is described in Basic Zone
+Configuration in the Advanced Installation Guide. The administrator can
+not enable security groups for an existing zone, only when creating a
+new zone.
+
+
+Adding Ingress and Egress Rules to a Security Group
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network
+
+#. In Select view, choose Security Groups, then click the security group
+   you want.
+
+#. To add an ingress rule, click the Ingress Rules tab and fill out the
+   following fields to specify what network traffic is allowed into VM
+   instances in this security group. If no ingress rules are specified,
+   then no traffic will be allowed in, except for responses to any
+   traffic that has been allowed out through an egress rule.
+
+   -  **Add by CIDR/Account**. Indicate whether the source of the
+      traffic will be defined by IP address (CIDR) or an existing
+      security group in a CloudStack account (Account). Choose Account
+      if you want to allow incoming traffic from all VMs in another
+      security group
+
+   -  **Protocol**. The networking protocol that sources will use to
+      send traffic to the security group. TCP and UDP are typically used
+      for data exchange and end-user communications. ICMP is typically
+      used to send error messages or network monitoring data.
+
+   -  **Start Port, End Port**. (TCP, UDP only) A range of listening
+      ports that are the destination for the incoming traffic. If you
+      are opening a single port, use the same number in both fields.
+
+   -  **ICMP Type, ICMP Code**. (ICMP only) The type of message and
+      error code that will be accepted.
+
+   -  **CIDR**. (Add by CIDR only) To accept only traffic from IP
+      addresses within a particular address block, enter a CIDR or a
+      comma-separated list of CIDRs. The CIDR is the base IP address of
+      the incoming traffic. For example, 192.168.0.0/22. To allow all
+      CIDRs, set to 0.0.0.0/0.
+
+   -  **Account, Security Group**. (Add by Account only) To accept only
+      traffic from another security group, enter the CloudStack account
+      and name of a security group that has already been defined in that
+      account. To allow traffic between VMs within the security group
+      you are editing now, enter the same name you used in step 7.
+
+   The following example allows inbound HTTP access from anywhere:
+
+   |httpaccess.png|
+
+#. To add an egress rule, click the Egress Rules tab and fill out the
+   following fields to specify what type of traffic is allowed to be
+   sent out of VM instances in this security group. If no egress rules
+   are specified, then all traffic will be allowed out. Once egress
+   rules are specified, the following types of traffic are allowed out:
+   traffic specified in egress rules; queries to DNS and DHCP servers;
+   and responses to any traffic that has been allowed in through an
+   ingress rule
+
+   -  **Add by CIDR/Account**. Indicate whether the destination of the
+      traffic will be defined by IP address (CIDR) or an existing
+      security group in a CloudStack account (Account). Choose Account
+      if you want to allow outgoing traffic to all VMs in another
+      security group.
+
+   -  **Protocol**. The networking protocol that VMs will use to send
+      outgoing traffic. TCP and UDP are typically used for data exchange
+      and end-user communications. ICMP is typically used to send error
+      messages or network monitoring data.
+
+   -  **Start Port, End Port**. (TCP, UDP only) A range of listening
+      ports that are the destination for the outgoing traffic. If you
+      are opening a single port, use the same number in both fields.
+
+   -  **ICMP Type, ICMP Code**. (ICMP only) The type of message and
+      error code that will be sent
+
+   -  **CIDR**. (Add by CIDR only) To send traffic only to IP addresses
+      within a particular address block, enter a CIDR or a
+      comma-separated list of CIDRs. The CIDR is the base IP address of
+      the destination. For example, 192.168.0.0/22. To allow all CIDRs,
+      set to 0.0.0.0/0.
+
+   -  **Account, Security Group**. (Add by Account only) To allow
+      traffic to be sent to another security group, enter the CloudStack
+      account and name of a security group that has already been defined
+      in that account. To allow traffic between VMs within the security
+      group you are editing now, enter its name.
+
+#. Click Add.
+
+
+.. |httpaccess.png| image:: /_static/images/http-access.png
+   :alt: allows inbound HTTP access from anywhere.
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/static_nat.rst
----------------------------------------------------------------------
diff --git a/source/networking/static_nat.rst b/source/networking/static_nat.rst
new file mode 100644
index 0000000..4e6199e
--- /dev/null
+++ b/source/networking/static_nat.rst
@@ -0,0 +1,56 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Static NAT
+----------
+
+A static NAT rule maps a public IP address to the private IP address of
+a VM in order to allow Internet traffic into the VM. The public IP
+address always remains the same, which is why it is called static NAT.
+This section tells how to enable or disable static NAT for a particular
+IP address.
+
+
+Enabling or Disabling Static NAT
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If port forwarding rules are already in effect for an IP address, you
+cannot enable static NAT to that IP.
+
+If a guest VM is part of more than one network, static NAT rules will
+function only if they are defined on the default network.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click the IP address you want to work with.
+
+#. Click the Static NAT |enabledisablenat.png| button.
+
+   The button toggles between Enable and Disable, depending on whether
+   static NAT is currently enabled for the IP address.
+
+#. If you are enabling static NAT, a dialog appears where you can choose
+   the destination VM and click Apply.
+
+
+.. |enabledisablenat.png| image:: /_static/images/enable-disable.png
+   :alt: button to enable/disable NAT.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/virtual_private_cloud_config.rst
----------------------------------------------------------------------
diff --git a/source/networking/virtual_private_cloud_config.rst b/source/networking/virtual_private_cloud_config.rst
new file mode 100644
index 0000000..87188aa
--- /dev/null
+++ b/source/networking/virtual_private_cloud_config.rst
@@ -0,0 +1,1438 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+.. _configuring-vpc:
+
+Configuring a Virtual Private Cloud
+-----------------------------------
+
+About Virtual Private Clouds
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+CloudStack Virtual Private Cloud is a private, isolated part of
+CloudStack. A VPC can have its own virtual network topology that
+resembles a traditional physical network. You can launch VMs in the
+virtual network that can have private addresses in the range of your
+choice, for example: 10.0.0.0/16. You can define network tiers within
+your VPC network range, which in turn enables you to group similar kinds
+of instances based on IP address range.
+
+For example, if a VPC has the private range 10.0.0.0/16, its guest
+networks can have the network ranges 10.0.1.0/24, 10.0.2.0/24,
+10.0.3.0/24, and so on.
+
+
+Major Components of a VPC
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A VPC is comprised of the following network components:
+
+-  **VPC**: A VPC acts as a container for multiple isolated networks
+   that can communicate with each other via its virtual router.
+
+-  **Network Tiers**: Each tier acts as an isolated network with its own
+   VLANs and CIDR list, where you can place groups of resources, such as
+   VMs. The tiers are segmented by means of VLANs. The NIC of each tier
+   acts as its gateway.
+
+-  **Virtual Router**: A virtual router is automatically created and
+   started when you create a VPC. The virtual router connect the tiers
+   and direct traffic among the public gateway, the VPN gateways, and
+   the NAT instances. For each tier, a corresponding NIC and IP exist in
+   the virtual router. The virtual router provides DNS and DHCP services
+   through its IP.
+
+-  **Public Gateway**: The traffic to and from the Internet routed to
+   the VPC through the public gateway. In a VPC, the public gateway is
+   not exposed to the end user; therefore, static routes are not support
+   for the public gateway.
+
+-  **Private Gateway**: All the traffic to and from a private network
+   routed to the VPC through the private gateway. For more information,
+   see ":ref:`adding-priv-gw-vpc`".
+
+-  **VPN Gateway**: The VPC side of a VPN connection.
+
+-  **Site-to-Site VPN Connection**: A hardware-based VPN connection
+   between your VPC and your datacenter, home network, or co-location
+   facility. For more information, see ":ref:`setting-s2s-vpn-conn`".
+
+-  **Customer Gateway**: The customer side of a VPN Connection. For more
+   information, see `"Creating and Updating a VPN
+   Customer Gateway" <#creating-and-updating-a-vpn-customer-gateway>`_.
+
+-  **NAT Instance**: An instance that provides Port Address Translation
+   for instances to access the Internet via the public gateway. For more
+   information, see ":ref:`enabling-disabling-static-nat-on-vpc`".
+
+-  **Network ACL**: Network ACL is a group of Network ACL items. Network
+   ACL items are nothing but numbered rules that are evaluated in order,
+   starting with the lowest numbered rule. These rules determine whether
+   traffic is allowed in or out of any tier associated with the network
+   ACL. For more information, see ":ref:`conf-net-acl`".
+
+
+Network Architecture in a VPC
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In a VPC, the following four basic options of network architectures are
+present:
+
+-  VPC with a public gateway only
+
+-  VPC with public and private gateways
+
+-  VPC with public and private gateways and site-to-site VPN access
+
+-  VPC with a private gateway only and site-to-site VPN access
+
+
+Connectivity Options for a VPC
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can connect your VPC to:
+
+-  The Internet through the public gateway.
+
+-  The corporate datacenter by using a site-to-site VPN connection
+   through the VPN gateway.
+
+-  Both the Internet and your corporate datacenter by using both the
+   public gateway and a VPN gateway.
+
+
+VPC Network Considerations
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Consider the following before you create a VPC:
+
+-  A VPC, by default, is created in the enabled state.
+
+-  A VPC can be created in Advance zone only, and can't belong to more
+   than one zone at a time.
+
+-  The default number of VPCs an account can create is 20. However, you
+   can change it by using the max.account.vpcs global parameter, which
+   controls the maximum number of VPCs an account is allowed to create.
+
+-  The default number of tiers an account can create within a VPC is 3.
+   You can configure this number by using the vpc.max.networks
+   parameter.
+
+-  Each tier should have an unique CIDR in the VPC. Ensure that the
+   tier's CIDR should be within the VPC CIDR range.
+
+-  A tier belongs to only one VPC.
+
+-  All network tiers inside the VPC should belong to the same account.
+
+-  When a VPC is created, by default, a SourceNAT IP is allocated to it.
+   The Source NAT IP is released only when the VPC is removed.
+
+-  A public IP can be used for only one purpose at a time. If the IP is
+   a sourceNAT, it cannot be used for StaticNAT or port forwarding.
+
+-  The instances can only have a private IP address that you provision.
+   To communicate with the Internet, enable NAT to an instance that you
+   launch in your VPC.
+
+-  Only new networks can be added to a VPC. The maximum number of
+   networks per VPC is limited by the value you specify in the
+   vpc.max.networks parameter. The default value is three.
+
+-  The load balancing service can be supported by only one tier inside
+   the VPC.
+
+-  If an IP address is assigned to a tier:
+
+   -  That IP can't be used by more than one tier at a time in the VPC.
+      For example, if you have tiers A and B, and a public IP1, you can
+      create a port forwarding rule by using the IP either for A or B,
+      but not for both.
+
+   -  That IP can't be used for StaticNAT, load balancing, or port
+      forwarding rules for another guest network inside the VPC.
+
+-  Remote access VPN is not supported in VPC networks.
+
+
+Adding a Virtual Private Cloud
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When creating the VPC, you simply provide the zone and a set of IP
+addresses for the VPC network address space. You specify this set of
+addresses in the form of a Classless Inter-Domain Routing (CIDR) block.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+#. Click Add VPC. The Add VPC page is displayed as follows:
+
+   |add-vpc.png|
+
+   Provide the following information:
+
+   -  **Name**: A short name for the VPC that you are creating.
+
+   -  **Description**: A brief description of the VPC.
+
+   -  **Zone**: Choose the zone where you want the VPC to be available.
+
+   -  **Super CIDR for Guest Networks**: Defines the CIDR range for all
+      the tiers (guest networks) within a VPC. When you create a tier,
+      ensure that its CIDR is within the Super CIDR value you enter. The
+      CIDR must be RFC1918 compliant.
+
+   -  **DNS domain for Guest Networks**: If you want to assign a special
+      domain name, specify the DNS suffix. This parameter is applied to
+      all the tiers within the VPC. That implies, all the tiers you
+      create in the VPC belong to the same DNS domain. If the parameter
+      is not specified, a DNS domain name is generated automatically.
+
+   -  **Public Load Balancer Provider**: You have two options: VPC
+      Virtual Router and Netscaler.
+
+#. Click OK.
+
+
+Adding Tiers
+~~~~~~~~~~~~
+
+Tiers are distinct locations within a VPC that act as isolated networks,
+which do not have access to other tiers by default. Tiers are set up on
+different VLANs that can communicate with each other by using a virtual
+router. Tiers provide inexpensive, low latency network connectivity to
+other tiers within the VPC.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPC that you have created for the account is listed in the
+   page.
+
+   .. note:: 
+      The end users can see their own VPCs, while root and domain admin can
+      see any VPC they are authorized to see.
+
+#. Click the Configure button of the VPC for which you want to set up
+   tiers.
+
+#. Click Create network.
+
+   The Add new tier dialog is displayed, as follows:
+
+   |add-tier.png|
+
+   If you have already created tiers, the VPC diagram is displayed.
+   Click Create Tier to add a new tier.
+
+#. Specify the following:
+
+   All the fields are mandatory.
+
+   -  **Name**: A unique name for the tier you create.
+
+   -  **Network Offering**: The following default network offerings are
+      listed: Internal LB,
+      DefaultIsolatedNetworkOfferingForVpcNetworksNoLB,
+      DefaultIsolatedNetworkOfferingForVpcNetworks
+
+      In a VPC, only one tier can be created by using LB-enabled network
+      offering.
+
+   -  **Gateway**: The gateway for the tier you create. Ensure that the
+      gateway is within the Super CIDR range that you specified while
+      creating the VPC, and is not overlapped with the CIDR of any
+      existing tier within the VPC.
+
+   -  **VLAN**: The VLAN ID for the tier that the root admin creates.
+
+      This option is only visible if the network offering you selected
+      is VLAN-enabled.
+
+      For more information, see `"Assigning VLANs to
+      Isolated Networks" <hosts.html#assigning-vlans-to-isolated-networks>`_.
+
+   -  **Netmask**: The netmask for the tier you create.
+
+      For example, if the VPC CIDR is 10.0.0.0/16 and the network tier
+      CIDR is 10.0.1.0/24, the gateway of the tier is 10.0.1.1, and the
+      netmask of the tier is 255.255.255.0.
+
+#. Click OK.
+
+#. Continue with configuring access control list for the tier.
+
+
+.. _conf-net-acl:
+
+Configuring Network Access Control List
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Define Network Access Control List (ACL) on the VPC virtual router to
+control incoming (ingress) and outgoing (egress) traffic between the VPC
+tiers, and the tiers and Internet. By default, all incoming traffic to
+the guest networks is blocked and all outgoing traffic from guest
+networks is allowed, once you add an ACL rule for outgoing traffic, then
+only outgoing traffic specified in this ACL rule is allowed, the rest is
+blocked. To open the ports, you must create a new network ACL. The
+network ACLs can be created for the tiers only if the NetworkACL service
+is supported.
+
+
+About Network ACL Lists
+^^^^^^^^^^^^^^^^^^^^^^^
+
+In CloudStack terminology, Network ACL is a group of Network ACL items.
+Network ACL items are nothing but numbered rules that are evaluated in
+order, starting with the lowest numbered rule. These rules determine
+whether traffic is allowed in or out of any tier associated with the
+network ACL. You need to add the Network ACL items to the Network ACL,
+then associate the Network ACL with a tier. Network ACL is associated
+with a VPC and can be assigned to multiple VPC tiers within a VPC. A
+Tier is associated with a Network ACL at all the times. Each tier can be
+associated with only one ACL.
+
+The default Network ACL is used when no ACL is associated. Default
+behavior is all the incoming traffic is blocked and outgoing traffic is
+allowed from the tiers. Default network ACL cannot be removed or
+modified. Contents of the default Network ACL is:
+
+===== ======== ============ ====== =========
+Rule  Protocol Traffic type Action CIDR
+===== ======== ============ ====== =========
+1     All      Ingress      Deny   0.0.0.0/0
+2     All      Egress       Deny   0.0.0.0/0
+===== ======== ============ ====== =========
+
+
+Creating ACL Lists
+^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. Select Network ACL Lists.
+
+   The following default rules are displayed in the Network ACLs page:
+   default\_allow, default\_deny.
+
+#. Click Add ACL Lists, and specify the following:
+
+   -  **ACL List Name**: A name for the ACL list.
+
+   -  **Description**: A short description of the ACL list that can be
+      displayed to users.
+
+
+Creating an ACL Rule
+^^^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC.
+
+#. Select Network ACL Lists.
+
+   In addition to the custom ACL lists you have created, the following
+   default rules are displayed in the Network ACLs page: default\_allow,
+   default\_deny.
+
+#. Select the desired ACL list.
+
+#. Select the ACL List Rules tab.
+
+   To add an ACL rule, fill in the following fields to specify what kind
+   of network traffic is allowed in the VPC.
+
+   -  **Rule Number**: The order in which the rules are evaluated.
+
+   -  **CIDR**: The CIDR acts as the Source CIDR for the Ingress rules,
+      and Destination CIDR for the Egress rules. To accept traffic only
+      from or to the IP addresses within a particular address block,
+      enter a CIDR or a comma-separated list of CIDRs. The CIDR is the
+      base IP address of the incoming traffic. For example,
+      192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.
+
+   -  **Action**: What action to be taken. Allow traffic or block.
+
+   -  **Protocol**: The networking protocol that sources use to send
+      traffic to the tier. The TCP and UDP protocols are typically used
+      for data exchange and end-user communications. The ICMP protocol
+      is typically used to send error messages or network monitoring
+      data. All supports all the traffic. Other option is Protocol
+      Number.
+
+   -  **Start Port**, **End Port** (TCP, UDP only): A range of listening
+      ports that are the destination for the incoming traffic. If you
+      are opening a single port, use the same number in both fields.
+
+   -  **Protocol Number**: The protocol number associated with IPv4 or
+      IPv6. For more information, see `Protocol Numbers 
+      <http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml>`_.
+
+   -  **ICMP Type**, **ICMP Code** (ICMP only): The type of message and
+      error code that will be sent.
+
+   -  **Traffic Type**: The type of traffic: Incoming or outgoing.
+
+#. Click Add. The ACL rule is added.
+
+   You can edit the tags assigned to the ACL rules and delete the ACL
+   rules you have created. Click the appropriate button in the Details
+   tab.
+
+
+Creating a Tier with Custom ACL List
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Create a VPC.
+
+#. Create a custom ACL list.
+
+#. Add ACL rules to the ACL list.
+
+#. Create a tier in the VPC.
+
+   Select the desired ACL list while creating a tier.
+
+#. Click OK.
+
+
+Assigning a Custom ACL List to a Tier
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Create a VPC.
+
+#. Create a tier in the VPC.
+
+#. Associate the tier with the default ACL rule.
+
+#. Create a custom ACL list.
+
+#. Add ACL rules to the ACL list.
+
+#. Select the tier for which you want to assign the custom ACL.
+
+#. Click the Replace ACL List icon. |replace-acl-icon.png|
+
+   The Replace ACL List dialog is displayed.
+
+#. Select the desired ACL list.
+
+#. Click OK.
+
+
+.. _adding-priv-gw-vpc:
+
+Adding a Private Gateway to a VPC
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A private gateway can be added by the root admin only. The VPC private
+network has 1:1 relationship with the NIC of the physical network. You
+can configure multiple private gateways to a single VPC. No gateways
+with duplicated VLAN and IP are allowed in the same data center.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC to which you want to configure
+   load balancing rules.
+
+   The VPC page is displayed where all the tiers you created are listed
+   in a diagram.
+
+#. Click the Settings icon.
+
+   The following options are displayed.
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. Select Private Gateways.
+
+   The Gateways page is displayed.
+
+#. Click Add new gateway:
+
+   |add-new-gateway-vpc.png|
+
+#. Specify the following:
+
+   -  **Physical Network**: The physical network you have created in the
+      zone.
+
+   -  **IP Address**: The IP address associated with the VPC gateway.
+
+   -  **Gateway**: The gateway through which the traffic is routed to
+      and from the VPC.
+
+   -  **Netmask**: The netmask associated with the VPC gateway.
+
+   -  **VLAN**: The VLAN associated with the VPC gateway.
+
+   -  **Source NAT**: Select this option to enable the source NAT
+      service on the VPC private gateway.
+
+      See ":ref:`source-nat-priv-gw`".
+
+   -  **ACL**: Controls both ingress and egress traffic on a VPC private
+      gateway. By default, all the traffic is blocked.
+
+      See ":ref:`acl-priv-gw`".
+
+   The new gateway appears in the list. You can repeat these steps to
+   add more gateway for this VPC.
+
+
+.. _source-nat-priv-gw:
+
+Source NAT on Private Gateway
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You might want to deploy multiple VPCs with the same super CIDR and
+guest tier CIDR. Therefore, multiple guest VMs from different VPCs can
+have the same IPs to reach a enterprise data center through the private
+gateway. In such cases, a NAT service need to be configured on the
+private gateway to avoid IP conflicts. If Source NAT is enabled, the
+guest VMs in VPC reaches the enterprise network via private gateway IP
+address by using the NAT service.
+
+The Source NAT service on a private gateway can be enabled while adding
+the private gateway. On deletion of a private gateway, source NAT rules
+specific to the private gateway are deleted.
+
+To enable source NAT on existing private gateways, delete them and
+create afresh with source NAT.
+
+
+.. _acl-priv-gw:
+
+ACL on Private Gateway
+^^^^^^^^^^^^^^^^^^^^^^
+
+The traffic on the VPC private gateway is controlled by creating both
+ingress and egress network ACL rules. The ACLs contains both allow and
+deny rules. As per the rule, all the ingress traffic to the private
+gateway interface and all the egress traffic out from the private
+gateway interface are blocked.
+
+You can change this default behaviour while creating a private gateway.
+Alternatively, you can do the following:
+
+#. In a VPC, identify the Private Gateway you want to work with.
+
+#. In the Private Gateway page, do either of the following:
+
+   -  Use the Quickview. See 3.
+
+   -  Use the Details tab. See 4 through .
+
+#. In the Quickview of the selected Private Gateway, click Replace ACL,
+   select the ACL rule, then click OK
+
+#. Click the IP address of the Private Gateway you want to work with.
+
+#. In the Detail tab, click the Replace ACL button.
+   |replace-acl-icon.png|
+
+   The Replace ACL dialog is displayed.
+
+#. select the ACL rule, then click OK.
+
+   Wait for few seconds. You can see that the new ACL rule is displayed
+   in the Details page.
+
+
+Creating a Static Route
+^^^^^^^^^^^^^^^^^^^^^^^
+
+CloudStack enables you to specify routing for the VPN connection you
+create. You can enter one or CIDR addresses to indicate which traffic is
+to be routed back to the gateway.
+
+#. In a VPC, identify the Private Gateway you want to work with.
+
+#. In the Private Gateway page, click the IP address of the Private
+   Gateway you want to work with.
+
+#. Select the Static Routes tab.
+
+#. Specify the CIDR of destination network.
+
+#. Click Add.
+
+   Wait for few seconds until the new route is created.
+
+
+Blacklisting Routes
+^^^^^^^^^^^^^^^^^^^
+
+CloudStack enables you to block a list of routes so that they are not
+assigned to any of the VPC private gateways. Specify the list of routes
+that you want to blacklist in the ``blacklisted.routes`` global
+parameter. Note that the parameter update affects only new static route
+creations. If you block an existing static route, it remains intact and
+continue functioning. You cannot add a static route if the route is
+blacklisted for the zone.
+
+
+Deploying VMs to the Tier
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC to which you want to deploy the
+   VMs.
+
+   The VPC page is displayed where all the tiers you have created are
+   listed.
+
+#. Click Virtual Machines tab of the tier to which you want to add a VM.
+
+   |add-vm-vpc.png|
+
+   The Add Instance page is displayed.
+
+   Follow the on-screen instruction to add an instance. For information
+   on adding an instance, see the Installation Guide.
+
+
+Deploying VMs to VPC Tier and Shared Networks
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+CloudStack allows you deploy VMs on a VPC tier and one or more shared
+networks. With this feature, VMs deployed in a multi-tier application
+can receive monitoring services via a shared network provided by a
+service provider.
+
+#. Log in to the CloudStack UI as an administrator.
+
+#. In the left navigation, choose Instances.
+
+#. Click Add Instance.
+
+#. Select a zone.
+
+#. Select a template or ISO, then follow the steps in the wizard.
+
+#. Ensure that the hardware you have allows starting the selected
+   service offering.
+
+#. Under Networks, select the desired networks for the VM you are
+   launching.
+
+   You can deploy a VM to a VPC tier and multiple shared networks.
+
+   |addvm-tier-sharednw.png|
+
+#. Click Next, review the configuration and click Launch.
+
+   Your VM will be deployed to the selected VPC tier and shared network.
+
+
+Acquiring a New IP Address for a VPC
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you acquire an IP address, all IP addresses are allocated to VPC,
+not to the guest networks within the VPC. The IPs are associated to the
+guest network only when the first port-forwarding, load balancing, or
+Static NAT rule is created for the IP or the network. IP can't be
+associated to more than one network at a time.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC to which you want to deploy the
+   VMs.
+
+   The VPC page is displayed where all the tiers you created are listed
+   in a diagram.
+
+   The following options are displayed.
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. Select IP Addresses.
+
+   The Public IP Addresses page is displayed.
+
+#. Click Acquire New IP, and click Yes in the confirmation dialog.
+
+   You are prompted for confirmation because, typically, IP addresses
+   are a limited resource. Within a few moments, the new IP address
+   should appear with the state Allocated. You can now use the IP
+   address in port forwarding, load balancing, and static NAT rules.
+
+
+Releasing an IP Address Alloted to a VPC
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The IP address is a limited resource. If you no longer need a particular
+IP, you can disassociate it from its VPC and return it to the pool of
+available addresses. An IP address can be released from its tier, only
+when all the networking ( port forwarding, load balancing, or StaticNAT
+) rules are removed for this IP address. The released IP address will
+still belongs to the same VPC.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC whose IP you want to release.
+
+   The VPC page is displayed where all the tiers you created are listed
+   in a diagram.
+
+   The following options are displayed.
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. Select Public IP Addresses.
+
+   The IP Addresses page is displayed.
+
+#. Click the IP you want to release.
+
+#. In the Details tab, click the Release IP button |release-ip-icon.png|
+
+
+.. _enabling-disabling-static-nat-on-vpc:
+
+Enabling or Disabling Static NAT on a VPC
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A static NAT rule maps a public IP address to the private IP address of
+a VM in a VPC to allow Internet traffic to it. This section tells how to
+enable or disable static NAT for a particular IP address in a VPC.
+
+If port forwarding rules are already in effect for an IP address, you
+cannot enable static NAT to that IP.
+
+If a guest VM is part of more than one network, static NAT rules will
+function only if they are defined on the default network.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC to which you want to deploy the
+   VMs.
+
+   The VPC page is displayed where all the tiers you created are listed
+   in a diagram.
+
+   For each tier, the following options are displayed.
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. In the Router node, select Public IP Addresses.
+
+   The IP Addresses page is displayed.
+
+#. Click the IP you want to work with.
+
+#. In the Details tab,click the Static NAT button. |enable-disable.png| 
+   The button toggles between Enable and
+   Disable, depending on whether static NAT is currently enabled for the
+   IP address.
+
+#. If you are enabling static NAT, a dialog appears as follows:
+
+   |select-vmstatic-nat.png|
+
+#. Select the tier and the destination VM, then click Apply.
+
+
+Adding Load Balancing Rules on a VPC
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In a VPC, you can configure two types of load balancing: external LB and
+internal LB. External LB is nothing but a LB rule created to redirect
+the traffic received at a public IP of the VPC virtual router. The
+traffic is load balanced within a tier based on your configuration.
+Citrix NetScaler and VPC virtual router are supported for external LB.
+When you use internal LB service, traffic received at a tier is load
+balanced across different VMs within that tier. For example, traffic
+reached at Web tier is redirected to another VM in that tier. External
+load balancing devices are not supported for internal LB. The service is
+provided by a internal LB VM configured on the target tier.
+
+
+Load Balancing Within a Tier (External LB)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A CloudStack user or administrator may create load balancing rules that
+balance traffic received at a public IP to one or more VMs that belong
+to a network tier that provides load balancing service in a VPC. A user
+creates a rule, specifies an algorithm, and assigns the rule to a set of
+VMs within a tier.
+
+
+Enabling NetScaler as the LB Provider on a VPC Tier
+'''''''''''''''''''''''''''''''''''''''''''''''''''
+
+#. Add and enable Netscaler VPX in dedicated mode.
+
+   Netscaler can be used in a VPC environment only if it is in dedicated
+   mode.
+
+#. Create a network offering, as given in ":ref:`create-net-offering-ext-lb`".
+
+#. Create a VPC with Netscaler as the Public LB provider.
+
+   For more information, see `"Adding a Virtual Private
+   Cloud" <#adding-a-virtual-private-cloud>`_.
+
+#. For the VPC, acquire an IP.
+
+#. Create an external load balancing rule and apply, as given in
+   :ref:`create-ext-lb-rule`.
+
+
+.. _create-net-offering-ext-lb:
+
+Creating a Network Offering for External LB
+'''''''''''''''''''''''''''''''''''''''''''
+
+To have external LB support on VPC, create a network offering as
+follows:
+
+#. Log in to the CloudStack UI as a user or admin.
+
+#. From the Select Offering drop-down, choose Network Offering.
+
+#. Click Add Network Offering.
+
+#. In the dialog, make the following choices:
+
+   -  **Name**: Any desired name for the network offering.
+
+   -  **Description**: A short description of the offering that can be
+      displayed to users.
+
+   -  **Network Rate**: Allowed data transfer rate in MB per second.
+
+   -  **Traffic Type**: The type of network traffic that will be carried
+      on the network.
+
+   -  **Guest Type**: Choose whether the guest network is isolated or
+      shared.
+
+   -  **Persistent**: Indicate whether the guest network is persistent
+      or not. The network that you can provision without having to
+      deploy a VM on it is termed persistent network.
+
+   -  **VPC**: This option indicate whether the guest network is Virtual
+      Private Cloud-enabled. A Virtual Private Cloud (VPC) is a private,
+      isolated part of CloudStack. A VPC can have its own virtual
+      network topology that resembles a traditional physical network.
+      For more information on VPCs, see `"About Virtual Private Clouds" <#about-virtual-private-clouds>`_.
+
+   -  **Specify VLAN**: (Isolated guest networks only) Indicate whether
+      a VLAN should be specified when this offering is used.
+
+   -  **Supported Services**: Select Load Balancer. Use Netscaler or
+      VpcVirtualRouter.
+
+   -  **Load Balancer Type**: Select Public LB from the drop-down.
+
+   -  **LB Isolation**: Select Dedicated if Netscaler is used as the
+      external LB provider.
+
+   -  **System Offering**: Choose the system service offering that you
+      want virtual routers to use in this network.
+
+   -  **Conserve mode**: Indicate whether to use conserve mode. In this
+      mode, network resources are allocated only when the first virtual
+      machine starts in the network.
+
+#. Click OK and the network offering is created.
+
+
+.. _create-ext-lb-rule:
+
+Creating an External LB Rule
+''''''''''''''''''''''''''''
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC, for which you want to
+   configure load balancing rules.
+
+   The VPC page is displayed where all the tiers you created listed in a
+   diagram.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. In the Router node, select Public IP Addresses.
+
+   The IP Addresses page is displayed.
+
+#. Click the IP address for which you want to create the rule, then
+   click the Configuration tab.
+
+#. In the Load Balancing node of the diagram, click View All.
+
+#. Select the tier to which you want to apply the rule.
+
+#. Specify the following:
+
+   -  **Name**: A name for the load balancer rule.
+
+   -  **Public Port**: The port that receives the incoming traffic to be
+      balanced.
+
+   -  **Private Port**: The port that the VMs will use to receive the
+      traffic.
+
+   -  **Algorithm**. Choose the load balancing algorithm you want
+      CloudStack to use. CloudStack supports the following well-known
+      algorithms:
+
+      -  Round-robin
+
+      -  Least connections
+
+      -  Source
+
+   -  **Stickiness**. (Optional) Click Configure and choose the
+      algorithm for the stickiness policy. See Sticky Session Policies
+      for Load Balancer Rules.
+
+   -  **Add VMs**: Click Add VMs, then select two or more VMs that will
+      divide the load of incoming traffic, and click Apply.
+
+The new load balancing rule appears in the list. You can repeat these
+steps to add more load balancing rules for this IP address.
+
+
+Load Balancing Across Tiers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+CloudStack supports sharing workload across different tiers within your
+VPC. Assume that multiple tiers are set up in your environment, such as
+Web tier and Application tier. Traffic to each tier is balanced on the
+VPC virtual router on the public side, as explained in
+`"Adding Load Balancing Rules on a VPC" <#adding-load-balancing-rules-on-a-vpc>`_. 
+If you want the traffic coming
+from the Web tier to the Application tier to be balanced, use the
+internal load balancing feature offered by CloudStack.
+
+
+How Does Internal LB Work in VPC?
+'''''''''''''''''''''''''''''''''
+
+In this figure, a public LB rule is created for the public IP
+72.52.125.10 with public port 80 and private port 81. The LB rule,
+created on the VPC virtual router, is applied on the traffic coming from
+the Internet to the VMs on the Web tier. On the Application tier two
+internal load balancing rules are created. An internal LB rule for the
+guest IP 10.10.10.4 with load balancer port 23 and instance port 25 is
+configured on the VM, InternalLBVM1. Another internal LB rule for the
+guest IP 10.10.10.4 with load balancer port 45 and instance port 46 is
+configured on the VM, InternalLBVM1. Another internal LB rule for the
+guest IP 10.10.10.6, with load balancer port 23 and instance port 25 is
+configured on the VM, InternalLBVM2.
+
+|vpc-lb.png|
+
+
+Guidelines
+''''''''''
+
+-  Internal LB and Public LB are mutually exclusive on a tier. If the
+   tier has LB on the public side, then it can't have the Internal LB.
+
+-  Internal LB is supported just on VPC networks in CloudStack 4.2
+   release.
+
+-  Only Internal LB VM can act as the Internal LB provider in CloudStack
+   4.2 release.
+
+-  Network upgrade is not supported from the network offering with
+   Internal LB to the network offering with Public LB.
+
+-  Multiple tiers can have internal LB support in a VPC.
+
+-  Only one tier can have Public LB support in a VPC.
+
+
+Enabling Internal LB on a VPC Tier
+''''''''''''''''''''''''''''''''''
+
+#. Create a network offering, as given in 
+   :ref:`creating-net-offering-internal-lb`.
+
+#. Create an internal load balancing rule and apply, as given in 
+   :ref:`create-int-lb-rule`.
+
+
+.. _creating-net-offering-internal-lb:
+
+Creating a Network Offering for Internal LB
+'''''''''''''''''''''''''''''''''''''''''''
+
+To have internal LB support on VPC, either use the default offering,
+DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB, or create a
+network offering as follows:
+
+#. Log in to the CloudStack UI as a user or admin.
+
+#. From the Select Offering drop-down, choose Network Offering.
+
+#. Click Add Network Offering.
+
+#. In the dialog, make the following choices:
+
+   -  **Name**: Any desired name for the network offering.
+
+   -  **Description**: A short description of the offering that can be
+      displayed to users.
+
+   -  **Network Rate**: Allowed data transfer rate in MB per second.
+
+   -  **Traffic Type**: The type of network traffic that will be carried
+      on the network.
+
+   -  **Guest Type**: Choose whether the guest network is isolated or
+      shared.
+
+   -  **Persistent**: Indicate whether the guest network is persistent
+      or not. The network that you can provision without having to
+      deploy a VM on it is termed persistent network.
+
+   -  **VPC**: This option indicate whether the guest network is Virtual
+      Private Cloud-enabled. A Virtual Private Cloud (VPC) is a private,
+      isolated part of CloudStack. A VPC can have its own virtual
+      network topology that resembles a traditional physical network.
+      For more information on VPCs, see `"About Virtual
+      Private Clouds" <#about-virtual-private-clouds>`_.
+
+   -  **Specify VLAN**: (Isolated guest networks only) Indicate whether
+      a VLAN should be specified when this offering is used.
+
+   -  **Supported Services**: Select Load Balancer. Select
+      ``InternalLbVM`` from the provider list.
+
+   -  **Load Balancer Type**: Select Internal LB from the drop-down.
+
+   -  **System Offering**: Choose the system service offering that you
+      want virtual routers to use in this network.
+
+   -  **Conserve mode**: Indicate whether to use conserve mode. In this
+      mode, network resources are allocated only when the first virtual
+      machine starts in the network.
+
+#. Click OK and the network offering is created.
+
+
+.. _create-int-lb-rule:
+
+Creating an Internal LB Rule
+''''''''''''''''''''''''''''
+
+When you create the Internal LB rule and applies to a VM, an Internal LB
+VM, which is responsible for load balancing, is created.
+
+You can view the created Internal LB VM in the Instances page if you
+navigate to **Infrastructure** > **Zones** > <zone\_ name> >
+<physical\_network\_name> > **Network Service Providers** > **Internal
+LB VM**. You can manage the Internal LB VMs as and when required from
+the location.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Locate the VPC for which you want to configure internal LB, then
+   click Configure.
+
+   The VPC page is displayed where all the tiers you created listed in a
+   diagram.
+
+#. Locate the Tier for which you want to configure an internal LB rule,
+   click Internal LB.
+
+   In the Internal LB page, click Add Internal LB.
+
+#. In the dialog, specify the following:
+
+   -  **Name**: A name for the load balancer rule.
+
+   -  **Description**: A short description of the rule that can be
+      displayed to users.
+
+   -  **Source IP Address**: (Optional) The source IP from which traffic
+      originates. The IP is acquired from the CIDR of that particular
+      tier on which you want to create the Internal LB rule. If not
+      specified, the IP address is automatically allocated from the
+      network CIDR.
+
+      For every Source IP, a new Internal LB VM is created for load
+      balancing.
+
+   -  **Source Port**: The port associated with the source IP. Traffic
+      on this port is load balanced.
+
+   -  **Instance Port**: The port of the internal LB VM.
+
+   -  **Algorithm**. Choose the load balancing algorithm you want
+      CloudStack to use. CloudStack supports the following well-known
+      algorithms:
+
+      -  Round-robin
+
+      -  Least connections
+
+      -  Source
+
+
+Adding a Port Forwarding Rule on a VPC
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC to which you want to deploy the
+   VMs.
+
+   The VPC page is displayed where all the tiers you created are listed
+   in a diagram.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  Private Gateways
+
+   -  Public IP Addresses
+
+   -  Site-to-Site VPNs
+
+   -  Network ACL Lists
+
+#. In the Router node, select Public IP Addresses.
+
+   The IP Addresses page is displayed.
+
+#. Click the IP address for which you want to create the rule, then
+   click the Configuration tab.
+
+#. In the Port Forwarding node of the diagram, click View All.
+
+#. Select the tier to which you want to apply the rule.
+
+#. Specify the following:
+
+   -  **Public Port**: The port to which public traffic will be
+      addressed on the IP address you acquired in the previous step.
+
+   -  **Private Port**: The port on which the instance is listening for
+      forwarded public traffic.
+
+   -  **Protocol**: The communication protocol in use between the two
+      ports.
+
+      -  TCP
+
+      -  UDP
+
+   -  **Add VM**: Click Add VM. Select the name of the instance to which
+      this rule applies, and click Apply.
+
+      You can test the rule by opening an SSH session to the instance.
+
+
+Removing Tiers
+~~~~~~~~~~~~~~
+
+You can remove a tier from a VPC. A removed tier cannot be revoked. When
+a tier is removed, only the resources of the tier are expunged. All the
+network rules (port forwarding, load balancing and staticNAT) and the IP
+addresses associated to the tier are removed. The IP address still be
+belonging to the same VPC.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPC that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC for which you want to set up
+   tiers.
+
+   The Configure VPC page is displayed. Locate the tier you want to work
+   with.
+
+#. Select the tier you want to remove.
+
+#. In the Network Details tab, click the Delete Network button.
+   |del-tier.png|
+
+   Click Yes to confirm. Wait for some time for the tier to be removed.
+
+
+Editing, Restarting, and Removing a Virtual Private Cloud
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: Ensure that all the tiers are removed before you remove a VPC.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Select the VPC you want to work with.
+
+#. In the Details tab, click the Remove VPC button |remove-vpc.png|
+
+   You can remove the VPC by also using the remove button in the Quick
+   View.
+
+   You can edit the name and description of a VPC. To do that, select
+   the VPC, then click the Edit button. |vpc-edit-icon.png|
+
+   To restart a VPC, select the VPC, then click the Restart button.
+   |restart-vpc.png|
+
+
+.. |add-vpc.png| image:: /_static/images/add-vpc.png
+   :alt: adding a vpc.
+.. |add-tier.png| image:: /_static/images/add-tier.png
+   :alt: adding a tier to a vpc.
+.. |replace-acl-icon.png| image:: /_static/images/replace-acl-icon.png
+   :alt: button to replace an ACL list
+.. |add-new-gateway-vpc.png| image:: /_static/images/add-new-gateway-vpc.png
+   :alt: adding a private gateway for the VPC.
+.. |add-vm-vpc.png| image:: /_static/images/add-vm-vpc.png
+   :alt: adding a VM to a vpc.
+.. |addvm-tier-sharednw.png| image:: /_static/images/addvm-tier-sharednw.png
+   :alt: adding a VM to a VPC tier and shared network.
+.. |release-ip-icon.png| image:: /_static/images/release-ip-icon.png
+   :alt: button to release an IP.
+.. |enable-disable.png| image:: /_static/images/enable-disable.png
+   :alt: button to enable Static NAT.
+.. |select-vmstatic-nat.png| image:: /_static/images/select-vm-staticnat-vpc.png
+   :alt: selecting a tier to apply staticNAT.
+.. |vpc-lb.png| image:: /_static/images/vpc-lb.png
+   :alt: Configuring internal LB for VPC
+.. |del-tier.png| image:: /_static/images/del-tier.png
+   :alt: button to remove a tier
+.. |vpc-edit-icon.png| image:: /_static/images/edit-icon.png
+   :alt: button to edit.
+.. |remove-vpc.png| image:: /_static/images/remove-vpc.png
+   :alt: button to remove a VPC
+.. |restart-vpc.png| image:: /_static/images/restart-vpc.png
+   :alt: button to restart a VPC


[32/40] git commit: add make.sh for lazy doc build

Posted by ra...@apache.org.
add make.sh for lazy doc build


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/1732dae7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/1732dae7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/1732dae7

Branch: refs/heads/4.4
Commit: 1732dae7bed038a4871003c927860e4926a00fa8
Parents: fce127e
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Tue Aug 19 20:04:30 2014 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Aug 19 20:20:41 2014 -0400

----------------------------------------------------------------------
 make.sh | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/1732dae7/make.sh
----------------------------------------------------------------------
diff --git a/make.sh b/make.sh
new file mode 100755
index 0000000..d4e96fd
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,3 @@
+rm -fr build
+mkdir build
+sphinx-build -b html source build


[18/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/systemvm.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/systemvm.po b/source/locale/zh_CN/LC_MESSAGES/systemvm.po
new file mode 100644
index 0000000..eb4b95e
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/systemvm.po
@@ -0,0 +1,958 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# morgan wang <mo...@gmail.com>, 2014
+# mushroom_rain <mu...@163.com>, 2014
+# 语法盐 <um...@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 06:32+0000\n"
+"Last-Translator: 语法盐 <um...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 8be3f4aab5e948cf9ebc392ede63eb61
+#: ../../systemvm.rst:18
+msgid "Working with System Virtual Machines"
+msgstr "使用系统虚拟机"
+
+# 9b5d8dc94fe14b1188a4787951b5b7c1
+#: ../../systemvm.rst:20
+msgid ""
+"CloudStack uses several types of system virtual machines to perform tasks in"
+" the cloud. In general CloudStack manages these system VMs and creates, "
+"starts, and stops them as needed based on scale and immediate needs. "
+"However, the administrator should be aware of them and their roles to assist"
+" in debugging issues."
+msgstr "CloudStack使用几类系统虚拟机来完成云中的任务。总的来说,CloudStack管理这些系统虚拟机,并根据某些范围内或快速需要创建、启动和停止它们。然而,管理员需要意识到他们在调试中的作用。"
+
+# e59d13f8791c445b80132078609fc486
+#: ../../systemvm.rst:27
+msgid "The System VM Template"
+msgstr "系统VM模板"
+
+# 6f29f33ed8a249eba1387f295bc684c4
+#: ../../systemvm.rst:29
+msgid ""
+"The System VMs come from a single template. The System VM has the following "
+"characteristics:"
+msgstr "系统VM来自于一个单独的模板,系统VM具有以下特性:"
+
+# 9ce666c19d774839b1f8cb4590445c4c
+#: ../../systemvm.rst:34
+msgid ""
+"Debian 6.0 (\"Squeeze\"), 2.6.32 kernel with the latest security patches "
+"from the Debian security APT repository"
+msgstr "Debian 6.0(“Squeeze”),2.6.32内核具有最新的来自Debian安全APT存储库的安全补丁"
+
+# 63fe9d9aeac34acdaa94ec25235705a7
+#: ../../systemvm.rst:39
+msgid ""
+"Has a minimal set of packages installed thereby reducing the attack surface"
+msgstr "具有一系列最小化安装的包,可以降低安全攻击风险。"
+
+# 8180871802ba4e12bb9ad0c90bfcc6b4
+#: ../../systemvm.rst:44
+msgid "32-bit for enhanced performance on Xen/VMWare"
+msgstr "基于 Xen/VMWare 的32位增强性能"
+
+# efa0ecb7d9b340aa94a5b3d97c5df6e2
+#: ../../systemvm.rst:48
+msgid ""
+"pvops kernel with Xen PV drivers, KVM virtio drivers, and VMware tools for "
+"optimum performance on all hypervisors"
+msgstr "包含Xen PV 驱动,KVM virtio 驱动和VMware tools的pvops 内核可以使所有hypervisor得到最佳性能。"
+
+# 94cc7872776443ce9c1e37cfda94a603
+#: ../../systemvm.rst:53
+msgid "Xen tools inclusion allows performance monitoring"
+msgstr "Xen tools 包含性能监控"
+
+# 285ca06aefd5405aa00784ffa1cada94
+#: ../../systemvm.rst:57
+msgid ""
+"Latest versions of HAProxy, iptables, IPsec, and Apache from debian "
+"repository ensures improved security and speed"
+msgstr "最新版本的HAProxy,ip表,IPsec和来自debian库的Apache保证了提高安全性和速度。"
+
+# b0c807016df746d99783c98f27b847fd
+#: ../../systemvm.rst:62
+msgid ""
+"Latest version of JRE from Sun/Oracle ensures improved security and speed"
+msgstr "从 Sun/Oracle 安装最新版本的JRE可以保证安全性与速度的提高"
+
+# 980ff8d24ffa4282b0253bd5dced0af0
+#: ../../systemvm.rst:66
+msgid "Changing the Default System VM Template"
+msgstr "改变默认系统VM模板"
+
+# bfb28a5b9b2e40cd8ffe8f6283a4e11b
+#: ../../systemvm.rst:68
+msgid ""
+"CloudStack allows you to change the default 32-bit System VM template to "
+"64-bit one. Using the 64-bit template, upgrade the virtual router to manage "
+"larger number of connection in your network."
+msgstr "CloudStack允许你将默认的32位系统模板变为64位,使用64位模板,可以升级虚拟路由器,使得网络支撑更大的连接数。"
+
+# a3da003f69c948a283852316ca9ffa82
+#: ../../systemvm.rst:74
+msgid ""
+"Based on the hypervisor you use, download the 64-bit template from the "
+"following location:"
+msgstr "基于你所使用的hypervisor,从以下地址下载64位模板:"
+
+# b74fdcb62bef470783f70197cf39862a
+#: ../../systemvm.rst:78
+msgid "Hypervisor"
+msgstr "Hypervisor"
+
+# 82de6e1547904950afe93194ab91799e
+#: ../../systemvm.rst:78
+msgid "Download Location"
+msgstr "下载地址"
+
+# df1edb0301da483f8b0ca187dd744a9a
+#: ../../systemvm.rst:80
+msgid "XenServer"
+msgstr "XenServer"
+
+# a9827113f80349149b9e852182c71c66
+#: ../../systemvm.rst:80
+msgid ""
+"http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15"
+"-master-xen.vhd.bz2"
+msgstr "http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-xen.vhd.bz2"
+
+# d7d1a2ca0edf4236a8b88cb136140a3a
+#: ../../systemvm.rst:81
+msgid "KVM"
+msgstr "KVM"
+
+# e1c0fc4ecafa47c099784ed401cc859f
+#: ../../systemvm.rst:81
+msgid ""
+"http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15"
+"-master-kvm.qcow2.bz2"
+msgstr "http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2"
+
+# 1991ed3c7f0a4f1b967f4df8e95a91a8
+#: ../../systemvm.rst:86
+msgid "As an administrator, log in to the CloudStack UI"
+msgstr "使用管理员登录到CloudStack管理界面。"
+
+# b1decf00ede048919d1c784794861c8c
+#: ../../systemvm.rst:90
+msgid "Register the 64 bit template."
+msgstr "注册64位的模板。"
+
+# 75b465541dca4b75b9478b03231dc561
+#: ../../systemvm.rst:92
+msgid "For example: KVM64bitTemplate"
+msgstr "例如:KVM64bit 模板"
+
+# fe9c54d3437f4392919edcc710f73459
+#: ../../systemvm.rst:96
+msgid "While registering the template, select Routing."
+msgstr "当注册模板时,选择路由(routing)。"
+
+# 30ba77a33a2e48628183d0526def5673
+#: ../../systemvm.rst:100
+msgid "Navigate to Infrastructure > Zone > Settings."
+msgstr "导航至 基础结构  > 地域  > 设置"
+
+# b372692c62ad4ab9b6b8bccc49531f94
+#: ../../systemvm.rst:104
+msgid ""
+"Set the name of the 64-bit template, KVM64bitTemplate, in the "
+"*``router.template.kvm``* global parameter."
+msgstr "在全局参数 *``router.template.kvm``*中设置64位模板的名称,KVM64bitTemplate。"
+
+# 2a574634e2e8493c8da4b269d66aeb8f
+#: ../../systemvm.rst:107
+msgid ""
+"If you are using a XenServer 64-bit template, set the name in the "
+"*``router.template.xen``* global parameter."
+msgstr "如果你正在使用XenServer64位模板,将名字设置在*``router.template.xen``*全局参数中。"
+
+# 666051846b1f4a1ea93a880753cd8d27
+#: ../../systemvm.rst:110
+msgid ""
+"Any new virtual router created in this Zone automatically picks up this "
+"template."
+msgstr "任何在此地域中创建的新虚拟路由器均使用这个模板。"
+
+# 6c10aa07673b4a3e93b8a6a67399c5c6
+#: ../../systemvm.rst:115
+msgid "Restart the Management Server."
+msgstr "重启管理服务器。"
+
+# 5822cebf2557488fb14924b61507a3d9
+#: ../../systemvm.rst:118
+msgid "Multiple System VM Support for VMware"
+msgstr "支持VMware的多种系统虚拟机"
+
+# f0ac39803b514fe783d81dc8e27501bf
+#: ../../systemvm.rst:120
+msgid ""
+"Every CloudStack zone has single System VM for template processing tasks "
+"such as downloading templates, uploading templates, and uploading ISOs. In a"
+" zone where VMware is being used, additional System VMs can be launched to "
+"process VMware-specific tasks such as taking snapshots and creating private "
+"templates. The CloudStack management server launches additional System VMs "
+"for VMware-specific tasks as the load increases. The management server "
+"monitors and weights all commands sent to these System VMs and performs "
+"dynamic load balancing and scaling-up of more System VMs."
+msgstr "每个CloudStack地域都有一个单独的系统VM用于模板处理任务,如下载模板,上传模板,上传ISO。在使用VMware的地域中,有另外的系统VM用来处理VMware专有的任务,如制作快照,创建私有模板。 当VMware专有任务的负载增加时,CloudStack管理端将推出额外的系统VM。管理端监控并平衡发送到这些系统VM的命令,实行动态负载均衡并增加更多的系统VM。"
+
+# 4bfb13dcef06450a869b263a475962c0
+#: ../../systemvm.rst:131
+msgid "Console Proxy"
+msgstr "控制台代理"
+
+# 1891a33953af4ab5bfa2f0021c9cbcb0
+#: ../../systemvm.rst:133
+msgid ""
+"The Console Proxy is a type of System Virtual Machine that has a role in "
+"presenting a console view via the web UI. It connects the user’s browser to "
+"the VNC port made available via the hypervisor for the console of the guest."
+" Both the administrator and end user web UIs offer a console connection."
+msgstr "控制台代理是一种系统VM,可以通过网页用户接口为用户呈现一个控制台视图。它通过hypervisor为来宾提供控制台将用户的浏览器与vnc端口相连。管理员和终端用户动能通过网页用户接口获得一个控制台连接。"
+
+# 89e2955ebed34f69ad899a6ccf98a150
+#: ../../systemvm.rst:139
+msgid ""
+"Clicking a console icon brings up a new window. The AJAX code downloaded "
+"into that window refers to the public IP address of a console proxy VM. "
+"There is exactly one public IP address allocated per console proxy VM. The "
+"AJAX application connects to this IP. The console proxy then proxies the "
+"connection to the VNC port for the requested VM on the Host hosting the "
+"guest."
+msgstr "点击控制台图标会弹出一个新窗口。根据控制台代理的公共IP ,AJAX代码会下载到这个新窗口。每个控制台代理都会分配一个公共IP。AJAX程序会连接到这个IP。控制台代理会将连接代理到正在运行所请求虚拟机的宿主机的vnc端口。"
+
+# 56d88ad46e2745acb147e3b0cc16c012
+#: ../../systemvm.rst:147
+msgid ""
+"The hypervisors will have many ports assigned to VNC usage so that multiple "
+"VNC sessions can occur simultaneously."
+msgstr "hypervisors可能会分配很多端口到VNC上,因此可能同时并发多个VNC会话。"
+
+# bfa2d281e05b47a2a090213554adea82
+#: ../../systemvm.rst:149
+msgid ""
+"There is never any traffic to the guest virtual IP, and there is no need to "
+"enable VNC within the guest."
+msgstr "不会有任何流量是来宾虚拟IP的,因此不需要打开来宾虚拟机的vnc。"
+
+# 956afe779c6a4490bf06ba6b3c8d9b7a
+#: ../../systemvm.rst:152
+msgid ""
+"The console proxy VM will periodically report its active session count to "
+"the Management Server. The default reporting interval is five seconds. This "
+"can be changed through standard Management Server configuration with the "
+"parameter consoleproxy.loadscan.interval."
+msgstr "控制台虚拟机会定时的向管理服务器汇报当前活动的会话数。默认报告间隔是五秒钟。可以通过管理服务器的配置参数 consoleproxy.loadscan.interval.更改。"
+
+# 6ba80d42bac146da89dd7c0ddfaed6b9
+#: ../../systemvm.rst:157
+msgid ""
+"Assignment of guest VM to console proxy is determined by first determining "
+"if the guest VM has a previous session associated with a console proxy. If "
+"it does, the Management Server will assign the guest VM to the target "
+"Console Proxy VM regardless of the load on the proxy VM. Failing that, the "
+"first available running Console Proxy VM that has the capacity to handle new"
+" sessions is used."
+msgstr "如果来宾虚拟机之前有已经分配的关联控制台代理的会话,控制台代理的分配会由第一次分配的控制台代理决定。如果该来宾虚拟级之前存在已分配的控制台代理,则不论该控制台代理目前负载如何管理服务器都会将该来宾虚拟机分配到目标控制台代理虚拟机。如果失败则会将来宾虚拟机分配到第一个拥有足够资源处理新会话的控制台代理上。"
+
+# d3194eb67f53470798abbefc2170f007
+#: ../../systemvm.rst:164
+msgid ""
+"Console proxies can be restarted by administrators but this will interrupt "
+"existing console sessions for users."
+msgstr "管理员能重启控制台代理,但此操作会中断用户与控制台会话。"
+
+# 5477616ef10c44a99bd0e5d91ee3c9d3
+#: ../../systemvm.rst:168
+msgid "Using a SSL Certificate for the Console Proxy"
+msgstr "对控制台代理使用SSL证书。"
+
+# 7c9861003bfe4abe99b1cfd073a0fe0e
+#: ../../systemvm.rst:171
+msgid ""
+"In the past CloudStack used the ``realhostip.com`` dynamic  DNS resolution "
+"service. As this service will be shut down as of  June 30th, 2014, "
+"CloudStack has stopped using the service as of version 4.3."
+msgstr "之前,CloudStack使用realhostip.com的动态域名解析服务。CloudStack已经在4.3版中停止使用此服务,并且这项服务会在2014年6月30号彻底关闭。"
+
+# 0e590e7788f44b4d9a3b9ad796811333
+#: ../../systemvm.rst:173
+msgid ""
+"By default, the console viewing functionality uses plaintext HTTP. In any "
+"production environment, the console proxy connection should be encrypted via"
+" SSL at the mininum."
+msgstr "默认情况下,代理视图功能使用HTTP协议,在任何生产环境下,代理服务连接至少要通过SSL进行加密。"
+
+# 0ff02ca358074c6ca30f83692bfe9919
+#: ../../systemvm.rst:177
+msgid ""
+"A CloudStack administrator has 2 ways to secure the console proxy "
+"communication with SSL:"
+msgstr "CloudStack管理员有2种方式来保证SSL加密控制代理连接的安全:"
+
+# 7e0bf8a823b04926a0b9e726bb3b5429
+#: ../../systemvm.rst:181
+msgid "Set up a SSL wild-card certificate and domain name resolution"
+msgstr "建立一个SSL通配证书以及域名解析。"
+
+# cb6ce63cfc6c44c495463deb0c8d9069
+#: ../../systemvm.rst:184
+msgid "Set up SSL certificate for specific FQDN and configure load-balancer"
+msgstr "为指定的FQDN建立一个SSL证书并配置负载均衡"
+
+# 3417b2470c9f4f539baac5d4cc994cae
+#: ../../systemvm.rst:188
+msgid "Changing the Console Proxy SSL Certificate and Domain"
+msgstr "更改控制代理SSL证书及域"
+
+# 7002d85817e54eac8bb42dfe7bd4f2e2
+#: ../../systemvm.rst:190
+msgid ""
+"The administrator can configure SSL encryption  by selecting a domain and "
+"uploading a new SSL certificate and private key. The domain must run a DNS "
+"service that is capable of resolving queries for addresses of the form aaa-"
+"bbb-ccc-ddd.your.domain to an IPv4 IP address in the form aaa.bbb.ccc.ddd, "
+"for example, 202.8.44.1. To change the console proxy domain, SSL "
+"certificate, and private key:"
+msgstr "管理员可以通过选择一个域并上传一个新的SSL证书和密钥配置SSL加密。这个域必须运行一个能DNS服务器,该服务器能解决地址格式是aaa-bbb-ccc-ddd.your.domain到IPv4 IP地址的结构aaa.bbb.ccc.ddd,例如 for example, 202.8.44.1。就是为了改变终端代理与,SSL证书和私有密钥。"
+
+# 528c9b8be4d14a0ab8403dff3eef4bf0
+#: ../../systemvm.rst:199
+msgid ""
+"Set up dynamic name resolution or populate all possible DNS names in your "
+"public IP range into your existing DNS server with the format aaa-bbb-ccc-"
+"ddd.consoleproxy.company.com -> aaa.bbb.ccc.ddd."
+msgstr "建立一个动态的方案或者适用于所有可能DNS名称在你的公共IP范围以format aaa-bbb-ccc-ddd.consoleproxy.company.com-> aaa.bbb.ccc.ddd.到你已经存在的DNS服务器上"
+
+# 0ec80daec466449db79404dbbf71124a
+#: ../../systemvm.rst:204
+msgid ""
+"In these steps you will notice *consoleproxy.company.com* -For security best"
+" practices, we recommend creating a wildcard SSL certificate on a separate "
+"subdomain so in the event that the certificate is compromised, a malicious "
+"user cannot impersonate a company.com domain."
+msgstr "在上述步骤中你会注意到*consoleproxy.company.com* -为安全最好的实践,我们推荐在独立的子域中创建一个新的有通配符的SSL证书,所以证书在事件中可能妥协,一个恶意的用户不能模仿一个company.com域。"
+
+# 1484d83d7dcf452fbf59cb14fb8a2ac9
+#: ../../systemvm.rst:208
+msgid ""
+"Generate the private key and certificate signing request (CSR). When you are"
+" using openssl to generate private/public key pairs and CSRs, for the "
+"private key that you are going to paste into the CloudStack UI, be sure to "
+"convert it into PKCS#8 format."
+msgstr "通常有私钥和证书签名请求(CSR)。当你使用openssl产生私钥/公钥对和CSR,你将私钥复制到CloudStack中,保证转换为PKCS#8格式。"
+
+# 8d2e65e2ba1541cab43c314bde8a0285
+#: ../../systemvm.rst:215
+msgid "Generate a new 2048-bit private key"
+msgstr "产生一个新的2048位的私钥"
+
+# 3067b8795544424aba9ba004412ba13e
+#: ../../systemvm.rst:223
+msgid ""
+"Generate a new certificate CSR. Ensure the creation of a wildcard "
+"certificate, eg *.consoleproxy.company.com"
+msgstr "生成一个新的CSR证书。保证一个证书通配符,例如*.consoleproxy.company.com"
+
+# c09f472413874e608a2ba56b2f252be7
+#: ../../systemvm.rst:232
+msgid ""
+"Head to the website of your favorite trusted Certificate Authority, purchase"
+" an SSL certificate, and submit the CSR. You should receive a valid "
+"certificate in return"
+msgstr "前往你喜爱的站点相信授权证书,购买一个SSL证书并获得CSR确认。你将会收到一个返回的有效地证书"
+
+# 6d8e7177a0674ed5ba0017acb2023cf0
+#: ../../systemvm.rst:238
+msgid "Convert your private key format into PKCS#8 encrypted format."
+msgstr "转化你的私钥格式成PKCS#8加密格式。"
+
+# e84ab195ef4745de94b29161c636eb66
+#: ../../systemvm.rst:246
+msgid ""
+"Convert your PKCS#8 encrypted private key into the PKCS#8 format that is "
+"compliant with CloudStack"
+msgstr "转化你的PKC#8加密的私钥到PKC#8格式是CloudStack遵循的方式。"
+
+# e2eb37bdbd9348a49345d7ab4af8407a
+#: ../../systemvm.rst:255
+msgid ""
+"In the Update SSL Certificate screen of the CloudStack UI, paste the "
+"following:"
+msgstr "在CloudStack用户界面的修改SSL证书,复制以下内容:"
+
+# 0e5339200c5d495d81a2fa3b605140fd
+#: ../../systemvm.rst:260
+msgid "The certificate you've just generated."
+msgstr "刚刚生成的证书。"
+
+# 2ff7b3e117b34b79984384ff67d02a33
+#: ../../systemvm.rst:264
+msgid "The private key you've just generated."
+msgstr "刚刚生成的私钥。"
+
+# 4ad81c4f609149a6ab2643fb3e4e52b7
+#: ../../systemvm.rst:268
+msgid ""
+"The desired domain name, prefixed with ``*.``; for example, "
+"*.consoleproxy.company.com"
+msgstr "希望的域名前缀是 ``*.``; 例如, *.consoleproxy.company.com"
+
+# c4b5f9b94d3a4ac5a9cb7cf8aab71229
+#: ../../systemvm.rst:270
+msgid "|update-ssl.png|"
+msgstr "|update-ssl.png|"
+
+# 3c0c071f698549f2b472be8f635c3843
+#: ../../systemvm.rst:274
+msgid ""
+"This stops all currently running console proxy VMs, then restarts them with "
+"the new certificate and key. Users might notice a brief interruption in "
+"console availability."
+msgstr "这停止了所有正运行的终端代理VM,然后已新的许可和密钥重启。用户可能会注意到对控制台有益的一个简短的打断。"
+
+# 1d1a2c29eb6e49b8ac44653667dd7acc
+#: ../../systemvm.rst:278
+msgid ""
+"The Management Server generates URLs of the form \"aaa-bbb-ccc-"
+"ddd.consoleproxy.company.com\" after this change is made. The new console "
+"requests will be served with the new DNS domain name, certificate, and key."
+msgstr "管理服务器在这个改变后生成格式如 \"aaa-bbb-ccc-ddd.consoleproxy.company.com\" 的URLs。这个新的终端请求将会依照新的DNS域名,证书和密钥提供服务。"
+
+# a4bf2c5975d3412ea4e3aaa92e552a0c
+#: ../../systemvm.rst:284
+msgid "Load-balancing Console Proxies"
+msgstr "负载均衡终端代理"
+
+# fe7709e48afe4cd7ab9f0a1fd1490af4
+#: ../../systemvm.rst:285
+msgid ""
+"An alternative to using dynamic DNS or creating a range of DNS entries as "
+"described in the last section would be to create a SSL certificate for a "
+"specific domain name, configure CloudStack to use that particular FQDN, and "
+"then configure a load balancer to load balance the console proxy's IP "
+"address behind the FQDN. As the functionality for this is still new, please "
+"see "
+"https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes "
+"for more details."
+msgstr "一个在最近的段落中使用动态DNS或者创建一定范围DNS记录作为可替换的描述将被用来创建一个特定域名的SSL证书,配置CloudStack使用特定的FQDN,然后配置一个负载均衡以均衡终端代理IP地址后的FQDN。作为这项新功能的更多详情,参见              http://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes。"
+
+# 9af4851426194c41a2501ab36c4a159f
+#: ../../systemvm.rst:295
+msgid "Virtual Router"
+msgstr "虚拟路由"
+
+# 9ce6e91707bc4a7e991bc3c105ad6469
+#: ../../systemvm.rst:297
+msgid ""
+"The virtual router is a type of System Virtual Machine. The virtual router "
+"is one of the most frequently used service providers in CloudStack. The end "
+"user has no direct access to the virtual router. Users can ping the virtual "
+"router and take actions that affect it (such as setting up port forwarding),"
+" but users do not have SSH access into the virtual router."
+msgstr "虚拟路由器是一个系统虚拟机。它经常在CloudStack服务方案中被使用;终端用户不能够直接访问虚拟路由器。用户可ping和影响它(比如设置端口转发)但是不能通过ssh访问"
+
+# 2522b8aa1b924af2a9e4949a1d5d9f69
+#: ../../systemvm.rst:304
+msgid ""
+"There is no mechanism for the administrator to log in to the virtual router."
+" Virtual routers can be restarted by administrators, but this will interrupt"
+" public network access and other services for end users. A basic test in "
+"debugging networking issues is to attempt to ping the virtual router from a "
+"guest VM. Some of the characteristics of the virtual router are determined "
+"by its associated system service offering."
+msgstr "这里没有一种机制使得管理员可以登录虚拟路由器。管理员可以重启虚拟路由器,但是会中断终端用户网络访问和服务。在一个基本的网络故障排错中,尝试在一个虚拟机上ping虚拟路由器。虚拟路由器的一些功能特性是通过系统服务方案配置的。"
+
+# e45ecc9391d642928809c57529dc7c1d
+#: ../../systemvm.rst:312
+msgid "Configuring the Virtual Router"
+msgstr "配置虚拟路由"
+
+# 7d13b8bb3b1a4a16b722a92b49334947
+#: ../../systemvm.rst:314
+msgid "You can set the following:"
+msgstr "你可以设置以下内容:"
+
+# 44b8835e26ea4246b96ebb3462ae7d47
+#: ../../systemvm.rst:318
+msgid "IP range"
+msgstr "IP地址范围"
+
+# ba1e4554a5cb4fadb85802fc8dfa10e4
+#: ../../systemvm.rst:322
+msgid "Supported network services"
+msgstr "支持的网络服务"
+
+# b24a9cab32c441a4a6c1f5c392b01534
+#: ../../systemvm.rst:326
+msgid "Default domain name for the network serviced by the virtual router"
+msgstr "由虚拟路由网络服务提供的默认域名"
+
+# bde8e898b23e47a49b93858446f8b2c3
+#: ../../systemvm.rst:330
+msgid "Gateway IP address"
+msgstr "网关IP地址"
+
+# 90d3eeaccd7a4d24931e20da1b3e3734
+#: ../../systemvm.rst:334
+msgid ""
+"How often CloudStack fetches network usage statistics from CloudStack "
+"virtual routers. If you want to collect traffic metering data from the "
+"virtual router, set the global configuration parameter "
+"router.stats.interval. If you are not using the virtual router to gather "
+"network usage statistics, set it to 0."
+msgstr "CloudStack多久从虚拟路由器获取一次网络使用数据。如果你向搜集虚拟路由器的流量计量数据,设置全局变量router.stats.interval。如果你不使用虚拟路怄气收集网络使用数据,设置该值为0"
+
+# 33174573568c462da9b9bb8f32ac5da9
+#: ../../systemvm.rst:341
+msgid "Upgrading a Virtual Router with System Service Offerings"
+msgstr "使用系统计算服务升级虚拟路由器"
+
+# 4128bcaf29264574bcb5520add843d5c
+#: ../../systemvm.rst:343
+msgid ""
+"When CloudStack creates a virtual router, it uses default settings which are"
+" defined in a default system service offering. See `“System Service "
+"Offerings” <#system-service-offerings>`_. All the virtual routers in a "
+"single guest network use the same system service offering. You can upgrade "
+"the capabilities of the virtual router by creating and applying a custom "
+"system service offering."
+msgstr "当 CloudStack创建一个虚拟路由器,它是按照默认的系统计算服务方案进行的设置。参见 <xref linkend=\"system-service-offerings\" />。所有在单独客户网络中的虚拟路由器都使用相同的系统计算服务方案。可以通过新建和使用自定义的系统计算服务方案来提高虚拟路由器的性能。"
+
+# 6ff917ce569a4851ac880b4dda7f12e4
+#: ../../systemvm.rst:352
+msgid ""
+"Define your custom system service offering. See `“Creating a New System "
+"Service Offering” <#creating-a-new-system-service-offering>`_. In System VM "
+"Type, choose Domain Router."
+msgstr "定义定制的系统计算服务方案,参见<xref linkend=\"creating-system-service-offerings\" />。在系统虚拟机类型中,选择域路由器。"
+
+# 7cddcde709a1400297d4e1f750058515
+#: ../../systemvm.rst:358
+msgid ""
+"Associate the system service offering with a network offering. See "
+"`“Creating a New Network Offering” <networking.html#creating-a-new-network-"
+"offering>`_."
+msgstr "使用网络服务方案配合系统计算服务方案,参见  `“创建一个新网络方案” <networking.html#creating-a-new-network-offering>`_."
+
+# de01c46a779f4d83af353a858610a991
+#: ../../systemvm.rst:363
+msgid ""
+"Apply the network offering to the network where you want the virtual routers"
+" to use the new system service offering. If this is a new network, follow "
+"the steps in Adding an Additional Guest Network on page 66. To change the "
+"service offering for existing virtual routers, follow the steps in "
+"`“Changing the Network Offering on a Guest Network” <networking2.html"
+"#changing-the-network-offering-on-a-guest-network>`_."
+msgstr "将网络服务方案应用到使用新系统计算服务方案的虚拟路由器的网络上。如果这是一个新的网络,请根据66页的添加额外客户网络的步骤操作。想要改变已生成的虚拟路由器的计算服务方案,请根据 `“在客户端网络改变网络方案” <networking2.html#changing-the-network-offering-on-a-guest-network>`_."
+
+# b524a14c48bc495cadc308d7b63ac2a4
+#: ../../systemvm.rst:371
+msgid "Best Practices for Virtual Routers"
+msgstr "虚拟路由器的最佳实践"
+
+# 0b2febff4097420d96a2ff9ef1aeaf46
+#: ../../systemvm.rst:375
+msgid ""
+"WARNING: Restarting a virtual router from a hypervisor console deletes all "
+"the iptables rules. To work around this issue, stop the virtual router and "
+"start it from the CloudStack UI."
+msgstr "警告:从一个虚拟机管理程序控制台重新启动一台虚拟路由器,将删除所有iptables规则。要解决这个问题,从CloudStack用户界面停止虚拟路由器和启动。"
+
+# 33e6af6c5b92437593f1714d86528d52
+#: ../../systemvm.rst:382
+msgid ""
+"Do not use the destroyRouter API when only one router is available in the "
+"network, because restartNetwork API with the cleanup=false parameter can't "
+"recreate it later. If you want to destroy and recreate the single router "
+"available in the network, use the restartNetwork API with the cleanup=true "
+"parameter."
+msgstr "在网络中只有一个路由器可用时,不要使用destroyRouter API,因为restartNetwork API 带cleanup=false参数不能随后重新创建它。如果你想销毁并重新创建网络中的单一路由器,使用restartNetwork API 带cleanup=true参数。"
+
+# e1f923bf381241aa8b2f6e0525dbd7c3
+#: ../../systemvm.rst:385
+msgid "Service Monitoring Tool for Virtual Router"
+msgstr "虚拟路由的服务监视工具"
+
+# 166c312922e14f80ba6eaa81286860a4
+#: ../../systemvm.rst:387
+msgid ""
+"Various services running on the CloudStack virtual routers can be monitored "
+"by using a Service Monitoring tool. The tool ensures that services are "
+"successfully running until CloudStack deliberately disables them. If a "
+"service goes down, the tool automatically restarts the service, and if that "
+"does not help bringing up the service, an alert as well as an event is "
+"generated indicating the failure. A new global parameter, "
+"``network.router.enableservicemonitoring``, has been introduced to control "
+"this feature. The default value is false, implies, monitoring is disabled. "
+"When you enable, ensure that the Management Server and the router are "
+"restarted."
+msgstr "运行在CloudStack虚拟路由上的不同的各种服务都可以使用服务监视工具监视。工具将确保服务成功运行除非CloudStack被故意损坏。如果一个服务停止,工具将自动重启该服务,如果不能帮助重启该服务,将产生一个导致失败的警报事件。一个全局参数,\"network.router.enableservicemonitoring\",已经被介绍了它能控制这种特性。默认值是false,也就是说监控不是默认。当你激活后,确保服务管理器和路由被重启。"
+
+# f2aa21d6fd1645609a2c098d6d09bccc
+#: ../../systemvm.rst:391
+msgid ""
+"Monitoring tool can help to start a VR service, which is crashed due to an "
+"unexpected reason. For example:"
+msgstr "监视工具可以帮助启动一个由不期望的原因导致的冲突的VR服务。例如:"
+
+# 90673418a28f414f9cf60f53a4a2b2c3
+#: ../../systemvm.rst:396
+msgid "The services crashed due to defects in the source code."
+msgstr "由原代码的缺点引起的服务冲突。"
+
+# 7de0e474327d491a96aacd4fb31eecec
+#: ../../systemvm.rst:400
+msgid ""
+"The services that are terminated by the OS when memory or CPU is not "
+"sufficiently available for the service."
+msgstr "当此服务的内存空间或者CPU运算出现不足时,OS将终止此服务。"
+
+# f92166fbe86541dea2b8ef0ac17616a7
+#: ../../systemvm.rst:404
+msgid ""
+"Only those services with daemons are monitored. The services that are failed"
+" due to errors in the service/daemon configuration file cannot be restarted "
+"by the Monitoring tool. VPC networks are not supported."
+msgstr "只有这些服务的守护进程仍被监视。这些服务因在服务器/守护进程配置文件中的错误而失败将导致不能被监视工具重启。VPC网络不予支持。"
+
+# e834c36c5253482cadb9ee5127097911
+#: ../../systemvm.rst:406
+msgid "The following services are monitored in a VR:"
+msgstr "在VR中监视下列服务:"
+
+# 5eb9ccfaf20f479f9a7b4cee96aedfa8
+# 5dab896f995444178c11b71d812ef1e4
+#: ../../systemvm.rst:410 ../../systemvm.rst:487
+msgid "DNS"
+msgstr "DNS"
+
+# 12d6fc507c824f6eb84aded5da24244a
+#: ../../systemvm.rst:414
+msgid "HA Proxy"
+msgstr "HA代理"
+
+# 51b1f6716b2745c4a097cc59d32242a6
+#: ../../systemvm.rst:418
+msgid "SSH"
+msgstr "SSH"
+
+# 3dfcf65152e54be5bdf65e04ef4ada39
+#: ../../systemvm.rst:422
+msgid "Apache Web Server"
+msgstr "Apache网络服务器"
+
+# 4c17b9d1a4414d47acd51913cd1be094
+#: ../../systemvm.rst:424
+msgid "The following networks are supported:"
+msgstr "支持以下网络:"
+
+# 28e056cf7a134d9cae449b40828ba914
+#: ../../systemvm.rst:428
+msgid "Isolated Networks"
+msgstr "独立的网络"
+
+# 8384bb1c2d7c4e2ab34d88425ad4a1cf
+#: ../../systemvm.rst:432
+msgid "Shared Networks in both Advanced and Basic zone"
+msgstr "在高级和基础域中分享网络"
+
+# e8b7509b71234cecbac0aa2646beba62
+#: ../../systemvm.rst:434
+msgid "VPC networks are not supported"
+msgstr "VPC网络不被支持"
+
+# 744b64cc707645a3a88ce7550f3a51f6
+#: ../../systemvm.rst:436
+msgid ""
+"This feature is supported on the following hypervisors: XenServer, VMware, "
+"and KVM."
+msgstr "在下列hypervisor上支持此特性:XenServer,VMware和KVM"
+
+# 9559bdb81188441197d3737020a4f5d3
+#: ../../systemvm.rst:440
+msgid "Enhanced Upgrade for Virtual Routers"
+msgstr "增强的网络路由升级"
+
+# 894d5248559d4c9fb2de284c4e9d8434
+#: ../../systemvm.rst:442
+msgid ""
+"Upgrading VR is made flexible. The CloudStack administrators will be able to"
+" control the sequence of the VR upgrades. The sequencing is based on "
+"Infrastructure hierarchy, such as by Cluster, Pod, or Zone, and "
+"Administrative (Account) hierarchy, such as by Tenant or Domain. As an "
+"administrator, you can also determine when a particular customer service, "
+"such as VR, is upgraded within a specified upgrade interval. Upgrade "
+"operation is enhanced to increase the upgrade speed by allowing as many "
+"upgrade operations in parallel as possible."
+msgstr "升级VR也是很灵活的。CloudStack管理员将能够控制VR升级序列。该序列基于Infrastructure层,例如Cluster,pod或者Zone,管理层 (账户),例如Tenan或者Domain.作为管理员,当一个特殊的用户服务,例如VR,在一个短暂的具体升级后的间隔后,你可以终止它。升级操作将允许多个升级操作并行操作促使升级速度增加。"
+
+# 390d4db6cf7b4418bfeb14d1a1c823de
+#: ../../systemvm.rst:451
+msgid ""
+"During the entire duration of the upgrade, users cannot launch new services "
+"or make changes to an existing service."
+msgstr "在一个完整的持续的升级过程中,用户不能启动新服务或者改变已经存在的服务。"
+
+# 8f52ba2d3aaa400fbadbc9370ab8bec3
+#: ../../systemvm.rst:454
+msgid ""
+"Additionally, using multiple versions of VRs in a single instance is "
+"supported. In the Details tab of a VR, you can view the version and whether "
+"it requires upgrade. During the Management Server upgrade, CloudStack checks"
+" whether VR is at the latest version before performing any operation on the "
+"VR. To support this, a new global parameter, *``router.version.check``*, has"
+" been added. This parameter is set to true by default, which implies minimum"
+" required version is checked before performing any operation. No operation "
+"is performed if the VR is not at the required version. Services of the older"
+" version VR continue to be available, but no further operations can be "
+"performed on the VR until it is upgraded to the latest version. This will be"
+" a transient state until the VR is upgraded. This will ensure that the "
+"availability of VR services and VR state is not impacted due to the "
+"Management Server upgrade."
+msgstr "另外,使用多版本的VR在一个单例上也是支持的。对于具体地VR,你可以预览版本和是否升级。在管理服务器升级时,CLoudStack检查VR是否是VR上操作的最新版本。为支持此特点,一个新的全局参数,*``router.version.check``*, 已经被加入.这个参数默认设置为true,它意味着当操作前,最少要求版本检查。如果不是VR要求的版本就没有任何操作。在旧的版本上的VR仍然是有效地,但必须升级后才能进行更多的操作。在升级之前,它将是临时状态。这将保证VR服务和状态不受管理服务器升级的影响。"
+
+# 2331fd6f14b74031838819c4c9b6ebb7
+#: ../../systemvm.rst:469
+msgid ""
+"The following service will be available even if the VR is not upgraded. "
+"However, no changes for any of the services can be sent to the VR, until it "
+"is upgraded:"
+msgstr "以下服务将是有效的,无论VR是否升级。或者,没有任何服务在VR升级后发送到VR."
+
+# 7516020ea8e044fb88f03f243dc262c8
+#: ../../systemvm.rst:475
+msgid "SecurityGroup"
+msgstr "安全组"
+
+# f5c9179d8b634903b4ed88d21547163f
+#: ../../systemvm.rst:479
+msgid "UserData"
+msgstr "用户数据"
+
+# a841e81bc7f840cd90bde9fac872c5c4
+#: ../../systemvm.rst:483
+msgid "DHCP"
+msgstr "DHCP"
+
+# 05e911e9b8264679b13442e754ba881c
+#: ../../systemvm.rst:491
+msgid "LB"
+msgstr "LB"
+
+# f42a3ac7fca94077ba20fe12c98f4d78
+#: ../../systemvm.rst:495
+msgid "Port Forwarding"
+msgstr "端口转发"
+
+# 00acf0cb58cf46d38ce34b163e25e276
+#: ../../systemvm.rst:499
+msgid "VPN"
+msgstr "VPN"
+
+# dd5fa0de47874783993d5994dc2fd2f5
+#: ../../systemvm.rst:503
+msgid "Static NAT"
+msgstr "静态 NAT"
+
+# 442821509b954101b664febb12148e0e
+#: ../../systemvm.rst:507
+msgid "Source NAT"
+msgstr "Source NAT"
+
+# 976cf6d3ec014a5fa46956c266814608
+#: ../../systemvm.rst:511
+msgid "Firewall"
+msgstr "防火墙"
+
+# a952c4dfb48c40128f21c886c8344dc6
+#: ../../systemvm.rst:515
+msgid "Gateway"
+msgstr "网关"
+
+# de23c8c7f9844a17aedffe2a73f69611
+#: ../../systemvm.rst:519
+msgid "NetworkACL"
+msgstr "网络ACL"
+
+# e4882b2d87d54dd3bc156802ff35c064
+#: ../../systemvm.rst:522
+msgid "Supported Virtual Routers"
+msgstr "支持虚拟路由"
+
+# 4d87bcbc7b9e43e5a9eca2df6be5d5ac
+#: ../../systemvm.rst:526
+msgid "VR"
+msgstr "VR"
+
+# 2366a655dfd34f968eb66f89ef1061e4
+#: ../../systemvm.rst:530
+msgid "VPC VR"
+msgstr "VPC VR"
+
+# cf2ef91163e843d68825b0a5a4b95b6e
+#: ../../systemvm.rst:534
+msgid "Redundant VR"
+msgstr "多余的VR"
+
+# 40a69f9a229a49388862563f000c4860
+#: ../../systemvm.rst:537
+msgid "Upgrading Virtual Routers"
+msgstr "升级中的虚拟路由"
+
+# 51999619ca9449acb43f2b7ff514e0f5
+#: ../../systemvm.rst:541
+msgid "Download the latest System VM template."
+msgstr "下载最新的系统VM模板。"
+
+# 2b9f628af9ae4dfa85e753fbe4df2b62
+#: ../../systemvm.rst:545
+msgid "Download the latest System VM to all the primary storage pools."
+msgstr "下载最新的系统VM到所有主存储池。"
+
+# d67082be8aa144a590daf97a8e1a3f19
+#: ../../systemvm.rst:549
+msgid "Upgrade the Management Server."
+msgstr "升级管理服务器"
+
+# 4a0db3a39c01439ab7d5ed74da052a23
+#: ../../systemvm.rst:553
+msgid ""
+"Upgrade CPVM and SSVM either from the UI or by using the following script:"
+msgstr "从用户界面和使用下列描述中升级CPVM和SSVM"
+
+# 75f1e4536fea4cc7b74f72f92c4ce4ed
+#: ../../systemvm.rst:560
+msgid ""
+"Even when the VRs are still on older versions, existing services will "
+"continue to be available to the VMs. The Management Server cannot perform "
+"any operations on the VRs until they are upgraded."
+msgstr "即使VR仍然是老版本,已经存在的服务会继续对VM有效。管理服务器除非升级,否则不会再VR上有任何动作。"
+
+# 52d169af58f5479d97ba0aa2d39427ba
+#: ../../systemvm.rst:566
+msgid "Selectively upgrade the VRs:"
+msgstr "选择性的升级VR:"
+
+# bf46425e15e94970b120dc56e0a09344
+#: ../../systemvm.rst:570
+msgid "Log in to the CloudStack UI as the root administrator."
+msgstr "用系统管理员登陆到CloudStack UI界面。"
+
+# bc21fde401934629b30ec8c8ca4cf278
+#: ../../systemvm.rst:574
+msgid "In the left navigation, choose Infrastructure."
+msgstr "在左边的导航,选择基础架构。"
+
+# 4e8fccd1f33c40ccb6ed22ee6e8d332c
+#: ../../systemvm.rst:578
+msgid "On Virtual Routers, click View More."
+msgstr "在虚拟路由上,单击更多视图。"
+
+# f592498dba844e608a98645a5e029d73
+#: ../../systemvm.rst:580
+msgid "All the VRs are listed in the Virtual Routers page."
+msgstr "所有的VR都在虚拟路由页中列出。"
+
+# 8e507a8910a34e0ebdfe3d328e34a57a
+#: ../../systemvm.rst:584
+msgid ""
+"In Select View drop-down, select desired grouping based on your requirement."
+msgstr "在选择视图的下拉列表中,选择所需的群组"
+
+# f855b4bee2804bcfa3ed201dec42a5f9
+#: ../../systemvm.rst:587
+msgid "You can use either of the following:"
+msgstr "你可以设置以下内容:"
+
+# 01bf9acb8a8b466ba5c27d2d9a86a200
+#: ../../systemvm.rst:591
+msgid "Group by zone"
+msgstr "按域分组"
+
+# d8c3db41d03b415c9be8e88d8a30cbdd
+#: ../../systemvm.rst:595
+msgid "Group by pod"
+msgstr "按提供点分组"
+
+# a0cadfeca2fc4c36a1b9ec6f62173efd
+#: ../../systemvm.rst:599
+msgid "Group by cluster"
+msgstr "按群集分组"
+
+# 172c882d2b264bf7adc756a2abf1f7bc
+#: ../../systemvm.rst:603
+msgid "Group by account"
+msgstr "按账户分组"
+
+# a0bb9324a5594bb3b533bac200ac7f3f
+#: ../../systemvm.rst:607
+msgid "Click the group which has the VRs to be upgraded."
+msgstr "单击已经被升级的VR组"
+
+# 11b6bdc33790432a9a05952ef21703ca
+#: ../../systemvm.rst:609
+msgid ""
+"For example, if you have selected Group by zone, select the name of the "
+"desired zone."
+msgstr "例如,你可以按域分组,选择希望的域名。"
+
+# 26032885ac044b0a9f38285436395a3e
+#: ../../systemvm.rst:614
+msgid "Click the Upgrade button to upgrade all the VRs. |vr-upgrade.png|"
+msgstr "单击升级按钮升级所有的VRs.|vr-upgrade.png|"
+
+# 41f6eec247474ec98c1088ddc2f8b1af
+#: ../../systemvm.rst:618
+msgid "Click OK to confirm."
+msgstr "点击确定。"
+
+# 9a9ab1374064436ab421237b3915f8ed
+#: ../../systemvm.rst:621
+msgid "Secondary Storage VM"
+msgstr "辅助存储VM"
+
+# a30a067a625b4308ada0c22ba29b3f0f
+#: ../../systemvm.rst:623
+msgid ""
+"In addition to the hosts, CloudStack’s Secondary Storage VM mounts and "
+"writes to secondary storage."
+msgstr "除了主机,CloudStack的二级存储虚拟机会挂载和往二级存储中写入内容。"
+
+# 4b35371f113244a284b9c6c317ed00e7
+#: ../../systemvm.rst:626
+msgid ""
+"Submissions to secondary storage go through the Secondary Storage VM. The "
+"Secondary Storage VM can retrieve templates and ISO images from URLs using a"
+" variety of protocols."
+msgstr "通过二级存储虚拟机来提交信息到二级存储。二级存储虚拟机会使用多种协议通过URL来获取模版和ISO镜像文件。"
+
+# 5d192f685cb44355936e873868c40732
+#: ../../systemvm.rst:630
+msgid ""
+"The secondary storage VM provides a background task that takes care of a "
+"variety of secondary storage activities: downloading a new template to a "
+"Zone, copying templates between Zones, and snapshot backups."
+msgstr "二级存储虚拟机会提供后台任务来负责各种二级存储的活动:将新模版的下载到资源域中,多个资源域之间的模版复制,和快照备份。"
+
+# 9d38d1ca3ce44e2e89de62903f01097f
+#: ../../systemvm.rst:634
+msgid "The administrator can log in to the secondary storage VM if needed."
+msgstr "如果有需要,管理员可以登录到辅助存储VM上。"


[36/40] git commit: fix ldap section typo

Posted by ra...@apache.org.
fix ldap section typo


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

Branch: refs/heads/4.4
Commit: d92feaf0fdd5467734b3db654b0fa712045030b7
Parents: 6c77f69
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Wed Aug 20 07:43:05 2014 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Wed Aug 20 07:44:51 2014 -0400

----------------------------------------------------------------------
 source/accounts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/d92feaf0/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index b555742..06a1660 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -219,7 +219,7 @@ default values are for openldap)
    Default value for AD and openldap is **givenname**.
 
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
-  Default value is **SAMAccountName** for AD and **uid** for openldap.
+   Default value is **SAMAccountName** for AD and **uid** for openldap.
 
 
 Restricting LDAP users to a group:


[35/40] git commit: remove whitespaces

Posted by ra...@apache.org.
remove whitespaces


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/6c77f697
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/6c77f697
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/6c77f697

Branch: refs/heads/4.4
Commit: 6c77f6970635aa39796ec17904f16137ec156271
Parents: 0c75dcc
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Tue Aug 19 20:19:38 2014 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Aug 19 20:21:04 2014 -0400

----------------------------------------------------------------------
 source/events.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/6c77f697/source/events.rst
----------------------------------------------------------------------
diff --git a/source/events.rst b/source/events.rst
index 273435e..f25f9e0 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -144,11 +144,11 @@ changes can control the behaviour.
       
       If you want to use encrypted values for the username and password, you have to include a bean to pass those
       as variables from a credentials file.
-      
+
       A sample is given below
-      
+
       .. code:: bash
-      
+
          <beans xmlns="http://www.springframework.org/schema/beans"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:context="http://www.springframework.org/schema/context"
@@ -188,12 +188,12 @@ changes can control the behaviour.
       Create a new file in the same folder called ``cred.properties`` and the specify the values for username and password as jascrypt encrypted strings
 
       Sample, with ``guest`` as values for both fields:
-         
+
       .. code:: bash
-         
+
          username=nh2XrM7jWHMG4VQK18iiBQ==
          password=nh2XrM7jWHMG4VQK18iiBQ==
-         
+
 
 #. Restart the Management Server.
 


[29/40] git commit: Add local RTD theme default

Posted by ra...@apache.org.
Add local RTD theme default


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/018c1ad5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/018c1ad5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/018c1ad5

Branch: refs/heads/4.4
Commit: 018c1ad50ccd31f25234ff1b1fec73dd3ee012e1
Parents: a55b0db
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Jun 30 12:49:17 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Jun 30 12:49:17 2014 +0200

----------------------------------------------------------------------
 source/conf.py | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/018c1ad5/source/conf.py
----------------------------------------------------------------------
diff --git a/source/conf.py b/source/conf.py
index 517956a..b181590 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -17,6 +17,8 @@
 import sys
 import os
 
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -105,6 +107,13 @@ pygments_style = 'sphinx'
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 html_theme = 'default'
+if not on_rtd:
+    try:
+        import sphinx_rtd_theme
+        html_theme = 'sphinx_rtd_theme'
+        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+    except ImportError:
+        pass
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the


[12/40] git commit: Fixed formatting by Will stevens

Posted by ra...@apache.org.
Fixed formatting by Will stevens


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/68c20df4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/68c20df4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/68c20df4

Branch: refs/heads/4.4
Commit: 68c20df481a0bc13e1794a4a897686977139a17c
Parents: 72a3a7c
Author: Will Stevens <ws...@cloudops.com>
Authored: Tue May 20 12:33:17 2014 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Wed May 21 08:25:06 2014 +0200

----------------------------------------------------------------------
 source/accounts.rst                             |  76 +-
 source/administration.rst                       |  18 +-
 source/api.rst                                  |  34 +-
 source/events.rst                               | 189 ++--
 source/hosts.rst                                | 245 ++---
 source/index.rst                                |  34 +
 source/management.rst                           | 381 ++++----
 source/networking.rst                           | 232 ++---
 .../networking/global_server_load_balancing.rst |  20 +-
 source/networking/portable_ips.rst              |   4 +-
 source/networking/security_groups.rst           |   3 +-
 source/projects.rst                             | 261 ++----
 source/reliability.rst                          |  65 +-
 source/service_offerings.rst                    | 311 ++-----
 source/storage.rst                              | 326 +++----
 source/systemvm.rst                             | 381 +++-----
 source/templates.rst                            | 908 +++++++------------
 source/troubleshooting.rst                      | 231 ++---
 source/tuning.rst                               |  39 +-
 source/ui.rst                                   |  76 +-
 source/usage.rst                                | 734 +++++----------
 source/virtual_machines.rst                     | 781 ++++++----------
 22 files changed, 1942 insertions(+), 3407 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index 5367743..e5d4b6d 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -27,6 +27,7 @@ An account typically represents a customer of the service provider or a
 department in a large organization. Multiple users can exist in an
 account.
 
+
 Domains
 ~~~~~~~
 
@@ -40,6 +41,7 @@ For each account created, the Cloud installation creates three different
 types of user accounts: root administrator, domain administrator, and
 user.
 
+
 Users
 ~~~~~
 
@@ -59,6 +61,7 @@ may be multiple administrators in the system. Administrators can create
 or delete other administrators, and change the password for any user in
 the system.
 
+
 Domain Administrators
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -66,6 +69,7 @@ Domain administrators can perform administrative operations for users
 who belong to that domain. Domain administrators do not have visibility
 into physical servers or other domains.
 
+
 Root Administrator
 ~~~~~~~~~~~~~~~~~~
 
@@ -73,6 +77,7 @@ Root administrators have complete access to the system, including
 managing templates, service offerings, customer care administrators, and
 domains
 
+
 Resource Ownership
 ~~~~~~~~~~~~~~~~~~
 
@@ -86,6 +91,7 @@ account by using the assignVirtualMachine API. A domain or sub-domain
 administrator can do the same for VMs within the domain from one account
 to any other account in the domain or any of its sub-domains.
 
+
 Dedicating Resources to Accounts and Domains
 --------------------------------------------
 
@@ -99,26 +105,21 @@ that domain.
 
 There are several types of dedication available:
 
--
-
-   Explicit dedication. A zone, pod, cluster, or host is dedicated to an
+-  Explicit dedication. A zone, pod, cluster, or host is dedicated to an
    account or domain by the root administrator during initial deployment
    and configuration.
 
--
-
-   Strict implicit dedication. A host will not be shared across multiple
+-  Strict implicit dedication. A host will not be shared across multiple
    accounts. For example, strict implicit dedication is useful for
    deployment of certain types of applications, such as desktops, where
    no host can be shared between different accounts without violating
    the desktop software's terms of license.
 
--
-
-   Preferred implicit dedication. The VM will be deployed in dedicated
+-  Preferred implicit dedication. The VM will be deployed in dedicated
    infrastructure if possible. Otherwise, the VM can be deployed in
    shared infrastructure.
 
+
 How to Dedicate a Zone, Cluster, Pod, or Host to an Account or Domain
 ----------------------------------------------------------------------
 
@@ -138,6 +139,7 @@ permissible to allow some use of shared resources when dedicated
 resources are not available. Whenever a user creates a VM based on this
 service offering, it is allocated on one of the dedicated hosts.
 
+
 How to Use Dedicated Hosts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -148,6 +150,7 @@ end user can choose to place it on dedicated infrastructure. This
 operation will succeed only if some infrastructure has already been
 assigned as dedicated to the user's account or domain.
 
+
 Behavior of Dedicated Hosts, Clusters, Pods, and Zones
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -178,6 +181,7 @@ VMs of a specific account (the default system account). However, a host
 with system VMs or virtual routers can be used for preferred implicit
 dedication.
 
+
 Using an LDAP Server for User Authentication
 --------------------------------------------
 
@@ -195,22 +199,15 @@ given password is used to authenticate the user..
 To set up LDAP authentication in CloudStack, call the CloudStack API
 command ldapConfig and provide the following:
 
--  
-
-   Hostname or IP address and listening port of the LDAP server
-
--  
-
-   Base directory and query filter
+-  Hostname or IP address and listening port of the LDAP server
 
--  
+-  Base directory and query filter
 
-   Search user DN credentials, which give CloudStack permission to
+-  Search user DN credentials, which give CloudStack permission to
    search on the LDAP server
 
--  
+-  SSL keystore and password, if SSL is used
 
-   SSL keystore and password, if SSL is used
 
 Example LDAP Configuration Commands
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -224,25 +221,25 @@ LDAP server
 
 .. code:: bash
 
-    http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
+   http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
 
 The command must be URL-encoded. Here is the same example without the
 URL encoding:
 
 .. code:: bash
-
-    http://127.0.0.1:8080/client/api?command=ldapConfig
-    &hostname=127.0.0.1
-    &searchbase=ou=testing,o=project
-    &queryfilter=(&(%uid=%u))
-    &binddn=cn=John+Singh,ou=testing,o=project
-    &bindpass=secret
-    &port=10389
-    &ssl=true
-    &truststore=C:/company/info/trusted.ks
-    &truststorepass=secret
-    &response=json
-    &apiKey=YourAPIKey&signature=YourSignatureHash
+   
+   http://127.0.0.1:8080/client/api?command=ldapConfig
+   &hostname=127.0.0.1
+   &searchbase=ou=testing,o=project
+   &queryfilter=(&(%uid=%u))
+   &binddn=cn=John+Singh,ou=testing,o=project
+   &bindpass=secret
+   &port=10389
+   &ssl=true
+   &truststore=C:/company/info/trusted.ks
+   &truststorepass=secret
+   &response=json
+   &apiKey=YourAPIKey&signature=YourSignatureHash
 
 The following shows a similar command for Active Directory. Here, the
 search base is the testing group within a company, and the users are
@@ -250,11 +247,12 @@ matched up based on email address.
 
 .. code:: bash
 
-    http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%28mail%3D%25e%29%29 &binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&bindpass=1111_aaaa&port=389&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
+   http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%28mail%3D%25e%29%29 &binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&bindpass=1111_aaaa&port=389&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
 
 The next few sections explain some of the concepts you will need to know
 when filling out the ldapConfig parameters.
 
+
 Search Base
 ~~~~~~~~~~~
 
@@ -275,6 +273,7 @@ ApacheDS          OU=testing, O=project
 Active Directory  OU=testing, DC=company
 ================  =======================
 
+
 Query Filter
 ~~~~~~~~~~~~
 
@@ -300,19 +299,20 @@ If the CloudStack user name is the same as the LDAP user ID:
 
 .. code:: bash
 
-    (uid=%u)
+   (uid=%u)
 
 If the CloudStack user name is the LDAP display name:
 
 .. code:: bash
 
-    (displayName=%u)
+   (displayName=%u)
 
 To find a user by email address:
 
 .. code:: bash
 
-    (mail=%e)
+   (mail=%e)
+
 
 Search User Bind DN
 ~~~~~~~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/administration.rst
----------------------------------------------------------------------
diff --git a/source/administration.rst b/source/administration.rst
index 7c81173..4baa17f 100644
--- a/source/administration.rst
+++ b/source/administration.rst
@@ -14,7 +14,6 @@
    under the License.
 
 
-
 User Services
 =============
 
@@ -30,6 +29,7 @@ people to use your cloud – say, if the users are strictly internal to
 your organization, or just friends who are sharing your cloud – you can
 still keep track of what services they use and how much of them.
 
+
 Service Offerings, Disk Offerings, Network Offerings, and Templates
 -------------------------------------------------------------------
 
@@ -37,28 +37,20 @@ A user creating a new instance can make a variety of choices about its
 characteristics and capabilities. CloudStack provides several ways to
 present users with choices when creating a new instance:
 
--  
-
-   Service Offerings, defined by the CloudStack administrator, provide a
+-  Service Offerings, defined by the CloudStack administrator, provide a
    choice of CPU speed, number of CPUs, RAM size, tags on the root disk,
    and other choices. See Creating a New Compute Offering.
 
--  
-
-   Disk Offerings, defined by the CloudStack administrator, provide a
+-  Disk Offerings, defined by the CloudStack administrator, provide a
    choice of disk size and IOPS (Quality of Service) for primary data
    storage. See Creating a New Disk Offering.
 
--  
-
-   Network Offerings, defined by the CloudStack administrator, describe
+-  Network Offerings, defined by the CloudStack administrator, describe
    the feature set that is available to end users from the virtual
    router or external networking devices on a given guest network. See
    Network Offerings.
 
--  
-
-   Templates, defined by the CloudStack administrator or by any
+-  Templates, defined by the CloudStack administrator or by any
    CloudStack user, are the base OS images that the user can choose from
    when creating a new instance. For example, CloudStack includes CentOS
    as a template. See Working with Templates.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/api.rst
----------------------------------------------------------------------
diff --git a/source/api.rst b/source/api.rst
index e8875fc..654c063 100644
--- a/source/api.rst
+++ b/source/api.rst
@@ -31,6 +31,7 @@ The API has a REST-like query basis and returns results in XML or JSON.
 See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_
 and `the API Reference <http://cloudstack.apache.org/docs/api/>`_.
 
+
 Provisioning and Authentication API
 -----------------------------------
 
@@ -44,6 +45,7 @@ authentication is done locally. However, external authentication is
 possible as well. For example, see Using an LDAP Server for User
 Authentication.
 
+
 User Data and Meta Data
 -----------------------
 
@@ -59,47 +61,33 @@ the user data:
 
    .. code:: bash
 
-       # cat /var/lib/dhclient/dhclient-eth0.leases | grep dhcp-server-identifier | tail -1
+      # cat /var/lib/dhclient/dhclient-eth0.leases | grep dhcp-server-identifier | tail -1
 
 #. Access user data by running the following command using the result of
    the above command
 
    .. code:: bash
 
-       # curl http://10.1.1.1/latest/user-data
+      # curl http://10.1.1.1/latest/user-data
 
 Meta Data can be accessed similarly, using a URL of the form
 http://10.1.1.1/latest/meta-data/{metadata type}. (For backwards
 compatibility, the previous URL http://10.1.1.1/latest/{metadata type}
 is also supported.) For metadata type, use one of the following:
 
--  
-
-   service-offering. A description of the VMs service offering
-
--  
-
-   availability-zone. The Zone name
+-  service-offering. A description of the VMs service offering
 
--  
+-  availability-zone. The Zone name
 
-   local-ipv4. The guest IP of the VM
+-  local-ipv4. The guest IP of the VM
 
--  
+-  local-hostname. The hostname of the VM
 
-   local-hostname. The hostname of the VM
-
--  
-
-   public-ipv4. The first public IP for the router. (E.g. the first IP
+-  public-ipv4. The first public IP for the router. (E.g. the first IP
    of eth2)
 
--  
-
-   public-hostname. This is the same as public-ipv4
-
--  
+-  public-hostname. This is the same as public-ipv4
 
-   instance-id. The instance name of the VM
+-  instance-id. The instance name of the VM
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/events.rst
----------------------------------------------------------------------
diff --git a/source/events.rst b/source/events.rst
index d18d66a..cbba93b 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -25,6 +25,7 @@ and make the right business decision. In CloudStack an event could be a
 state change of virtual or physical resources, an action performed by an
 user (action events), or policy based events (alerts).
 
+
 Event Logs
 ----------
 
@@ -39,6 +40,7 @@ information on the status of a pending job or can be used to identify a
 job that is hanging or has not started. The following sections provide
 more information on these events..
 
+
 Notification
 ------------
 
@@ -64,32 +66,28 @@ machine on the event bus. All the CloudStack events (alerts, action
 events, usage events) and the additional category of resource state
 change events, are published on to the events bus.
 
+
 Use Cases
 ~~~~~~~~~
 
 The following are some of the use cases:
 
--  
-
-   Usage or Billing Engines: A third-party cloud usage solution can
+-  Usage or Billing Engines: A third-party cloud usage solution can
    implement a plug-in that can connects to CloudStack to subscribe to
    CloudStack events and generate usage data. The usage data is consumed
    by their usage software.
 
--  
-
-   AMQP plug-in can place all the events on the a message queue, then a
+-  AMQP plug-in can place all the events on the a message queue, then a
    AMQP message broker can provide topic-based notification to the
    subscribers.
 
--  
-
-   Publish and Subscribe notification service can be implemented as a
+-  Publish and Subscribe notification service can be implemented as a
    pluggable service in CloudStack that can provide rich set of APIs for
    event notification, such as topics-based subscription and
    notification. Additionally, the pluggable service can deal with
    multi-tenancy, authentication, and authorization issues.
 
+
 Configuration
 ~~~~~~~~~~~~~
 
@@ -97,157 +95,107 @@ As a CloudStack administrator, perform the following one-time
 configuration to enable event notification framework. At run time no
 changes can control the behaviour.
 
-#. 
-
-   Open ``'componentContext.xml``.
-
-#. 
-
-   Define a bean named ``eventNotificationBus`` as follows:
-
-   -  
-
-      name : Specify a name for the bean.
+#. Open ``'componentContext.xml``.
 
-   -  
+#. Define a bean named ``eventNotificationBus`` as follows:
 
-      server : The name or the IP address of the RabbitMQ AMQP server.
+   -  name : Specify a name for the bean.
 
-   -  
+   -  server : The name or the IP address of the RabbitMQ AMQP server.
 
-      port : The port on which RabbitMQ server is running.
+   -  port : The port on which RabbitMQ server is running.
 
-   -  
-
-      username : The username associated with the account to access the
+   -  username : The username associated with the account to access the
       RabbitMQ server.
 
-   -  
-
-      password : The password associated with the username of the
+   -  password : The password associated with the username of the
       account to access the RabbitMQ server.
 
-   -  
-
-      exchange : The exchange name on the RabbitMQ server where
+   -  exchange : The exchange name on the RabbitMQ server where
       CloudStack events are published.
 
       A sample bean is given below:
 
       .. code:: bash
 
-          <bean id="eventNotificationBus" class="org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus">
-              <property name="name" value="eventNotificationBus"/>
-              <property name="server" value="127.0.0.1"/>
-              <property name="port" value="5672"/>
-              <property name="username" value="guest"/>
-              <property name="password" value="guest"/>
-             <property name="exchange" value="cloudstack-events"/>
-             </bean>
+         <bean id="eventNotificationBus" class="org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus">
+           <property name="name" value="eventNotificationBus"/>
+           <property name="server" value="127.0.0.1"/>
+           <property name="port" value="5672"/>
+           <property name="username" value="guest"/>
+           <property name="password" value="guest"/>
+           <property name="exchange" value="cloudstack-events"/>
+         </bean>
 
       The ``eventNotificationBus`` bean represents the
       ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.
 
-#. 
+#. Restart the Management Server.
 
-   Restart the Management Server.
 
 Standard Events
 ---------------
 
 The events log records three types of standard events.
 
--  
-
-   INFO. This event is generated when an operation has been successfully
+-  INFO. This event is generated when an operation has been successfully
    performed.
 
--  
-
-   WARN. This event is generated in the following circumstances.
-
-   -  
+-  WARN. This event is generated in the following circumstances.
 
-      When a network is disconnected while monitoring a template
+   -  When a network is disconnected while monitoring a template
       download.
 
-   -  
+   -  When a template download is abandoned.
 
-      When a template download is abandoned.
-
-   -  
-
-      When an issue on the storage server causes the volumes to fail
+   -  When an issue on the storage server causes the volumes to fail
       over to the mirror storage server.
 
--  
-
-   ERROR. This event is generated when an operation has not been
+-  ERROR. This event is generated when an operation has not been
    successfully performed
 
+
 Long Running Job Events
 -----------------------
 
 The events log records three types of standard events.
 
--  
-
-   INFO. This event is generated when an operation has been successfully
+-  INFO. This event is generated when an operation has been successfully
    performed.
 
--  
+-  WARN. This event is generated in the following circumstances.
 
-   WARN. This event is generated in the following circumstances.
-
-   -  
-
-      When a network is disconnected while monitoring a template
+   -  When a network is disconnected while monitoring a template
       download.
 
-   -  
-
-      When a template download is abandoned.
+   -  When a template download is abandoned.
 
-   -  
-
-      When an issue on the storage server causes the volumes to fail
+   -  When an issue on the storage server causes the volumes to fail
       over to the mirror storage server.
 
--  
-
-   ERROR. This event is generated when an operation has not been
+-  ERROR. This event is generated when an operation has not been
    successfully performed
 
+
 Event Log Queries
 -----------------
 
 Database logs can be queried from the user interface. The list of events
 captured by the system includes:
 
--  
-
-   Virtual machine creation, deletion, and on-going management
+-  Virtual machine creation, deletion, and on-going management
    operations
 
--  
-
-   Virtual router creation, deletion, and on-going management operations
-
--  
+-  Virtual router creation, deletion, and on-going management operations
 
-   Template creation and deletion
+-  Template creation and deletion
 
--  
+-  Network/load balancer rules creation and deletion
 
-   Network/load balancer rules creation and deletion
+-  Storage volume creation and deletion
 
--  
+-  User login and logout
 
-   Storage volume creation and deletion
-
--  
-
-   User login and logout
 
 Deleting and Archiving Events and Alerts
 ----------------------------------------
@@ -269,61 +217,44 @@ deleted.
 In order to support the delete or archive alerts, the following global
 parameters have been added:
 
--  
-
-   **alert.purge.delay**: The alerts older than specified number of days
+-  **alert.purge.delay**: The alerts older than specified number of days
    are purged. Set the value to 0 to never purge alerts automatically.
 
--  
-
-   **alert.purge.interval**: The interval in seconds to wait before
+-  **alert.purge.interval**: The interval in seconds to wait before
    running the alert purge thread. The default is 86400 seconds (one
    day).
 
-.. note:: Archived alerts or events cannot be viewed in the UI or by using the
-      API. They are maintained in the database for auditing or compliance
-      purposes.
+.. note:: 
+   Archived alerts or events cannot be viewed in the UI or by using the
+   API. They are maintained in the database for auditing or compliance
+   purposes.
+
 
 Permissions
 ~~~~~~~~~~~
 
 Consider the following:
 
--  
-
-   The root admin can delete or archive one or multiple alerts or
+-  The root admin can delete or archive one or multiple alerts or
    events.
 
--  
-
-   The domain admin or end user can delete or archive one or multiple
+-  The domain admin or end user can delete or archive one or multiple
    events.
 
+
 Procedure
 ~~~~~~~~~
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Events.
 
-   In the left navigation, click Events.
+#. Perform either of the following:
 
-#. 
-
-   Perform either of the following:
-
-   -  
-
-      To archive events, click Archive Events, and specify event type
+   -  To archive events, click Archive Events, and specify event type
       and date.
 
-   -  
-
-      To archive events, click Delete Events, and specify event type and
+   -  To archive events, click Delete Events, and specify event type and
       date.
 
-#. 
-
-   Click OK.
+#. Click OK.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/hosts.rst
----------------------------------------------------------------------
diff --git a/source/hosts.rst b/source/hosts.rst
index 9fcf260..755a891 100644
--- a/source/hosts.rst
+++ b/source/hosts.rst
@@ -24,6 +24,7 @@ Additional hosts can be added at any time to provide more capacity for
 guest VMs. For requirements and instructions, see 
 `“Adding a Host” <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/configuration.html#adding-a-host>`_.
 
+
 Scheduled Maintenance and Maintenance Mode for Hosts
 ----------------------------------------------------
 
@@ -33,6 +34,7 @@ the guest VMs already running on the host are seamlessly migrated to
 another host not in maintenance mode. This migration uses live migration
 technology and does not interrupt the execution of the guest.
 
+
 vCenter and Maintenance Mode
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -40,9 +42,7 @@ To enter maintenance mode on a vCenter host, both vCenter and CloudStack
 must be used in concert. CloudStack and vCenter have separate
 maintenance modes that work closely together.
 
-#. 
-
-   Place the host into CloudStack's "scheduled maintenance" mode. This
+#. Place the host into CloudStack's "scheduled maintenance" mode. This
    does not invoke the vCenter maintenance mode, but only causes VMs to
    be migrated off the host
 
@@ -54,35 +54,26 @@ maintenance modes that work closely together.
    disruption to the guests. After this migration is completed, the host
    will enter the Ready for Maintenance mode.
 
-#. 
-
-   Wait for the "Ready for Maintenance" indicator to appear in the UI.
-
-#. 
+#. Wait for the "Ready for Maintenance" indicator to appear in the UI.
 
-   Now use vCenter to perform whatever actions are necessary to maintain
+#. Now use vCenter to perform whatever actions are necessary to maintain
    the host. During this time, the host cannot be the target of new VM
    allocations.
 
-#. 
-
-   When the maintenance tasks are complete, take the host out of
+#. When the maintenance tasks are complete, take the host out of
    maintenance mode as follows:
 
-   #. 
-
-      First use vCenter to exit the vCenter maintenance mode.
+   #. First use vCenter to exit the vCenter maintenance mode.
 
       This makes the host ready for CloudStack to reactivate it.
 
-   #. 
-
-      Then use CloudStack's administrator UI to cancel the CloudStack
+   #. Then use CloudStack's administrator UI to cancel the CloudStack
       maintenance mode
 
       When the host comes back online, the VMs that were migrated off of
       it may be migrated back to it manually and new VMs can be added.
 
+
 XenServer and Maintenance Mode
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -95,46 +86,31 @@ Mode, you cannot create or start any VMs on it.
 
 **To place a server in Maintenance Mode:**
 
-#. 
-
-   In the Resources pane, select the server, then do one of the
+#. In the Resources pane, select the server, then do one of the
    following:
 
-   -  
-
-      Right-click, then click Enter Maintenance Mode on the shortcut
+   -  Right-click, then click Enter Maintenance Mode on the shortcut
       menu.
 
-   -  
-
-      On the Server menu, click Enter Maintenance Mode.
-
-#. 
+   -  On the Server menu, click Enter Maintenance Mode.
 
-   Click Enter Maintenance Mode.
+#. Click Enter Maintenance Mode.
 
 The server's status in the Resources pane shows when all running VMs
 have been successfully migrated off the server.
 
 **To take a server out of Maintenance Mode:**
 
-#. 
-
-   In the Resources pane, select the server, then do one of the
+#. In the Resources pane, select the server, then do one of the
    following:
 
-   -  
-
-      Right-click, then click Exit Maintenance Mode on the shortcut
+   -  Right-click, then click Exit Maintenance Mode on the shortcut
       menu.
 
-   -  
+   -  On the Server menu, click Exit Maintenance Mode.
 
-      On the Server menu, click Exit Maintenance Mode.
+#. Click Exit Maintenance Mode.
 
-#. 
-
-   Click Exit Maintenance Mode.
 
 Disabling and Enabling Zones, Pods, and Clusters
 ------------------------------------------------
@@ -148,43 +124,26 @@ first added to the cloud, it is Disabled by default.
 
 To disable and enable a zone, pod, or cluster:
 
-#. 
-
-   Log in to the CloudStack UI as administrator
-
-#. 
-
-   In the left navigation bar, click Infrastructure.
+#. Log in to the CloudStack UI as administrator
 
-#. 
+#. In the left navigation bar, click Infrastructure.
 
-   In Zones, click View More.
+#. In Zones, click View More.
 
-#. 
-
-   If you are disabling or enabling a zone, find the name of the zone in
+#. If you are disabling or enabling a zone, find the name of the zone in
    the list, and click the Enable/Disable button. |enable-disable.png|
 
-#. 
-
-   If you are disabling or enabling a pod or cluster, click the name of
+#. If you are disabling or enabling a pod or cluster, click the name of
    the zone that contains the pod or cluster.
 
-#. 
-
-   Click the Compute tab.
-
-#. 
-
-   In the Pods or Clusters node of the diagram, click View All.
+#. Click the Compute tab.
 
-#. 
+#. In the Pods or Clusters node of the diagram, click View All.
 
-   Click the pod or cluster name in the list.
+#. Click the pod or cluster name in the list.
 
-#. 
+#. Click the Enable/Disable button. |enable-disable.png|
 
-   Click the Enable/Disable button. |enable-disable.png|
 
 Removing Hosts
 --------------
@@ -192,6 +151,7 @@ Removing Hosts
 Hosts can be removed from the cloud as needed. The procedure to remove a
 host depends on the hypervisor type.
 
+
 Removing XenServer and KVM Hosts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -199,24 +159,19 @@ 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:
 
-#. 
-
-   Place the node in maintenance mode.
+#. Place the node in maintenance mode.
 
    See `“Scheduled Maintenance and Maintenance Mode for
    Hosts” <#scheduled-maintenance-and-maintenance-mode-for-hosts>`_.
 
-#. 
-
-   For KVM, stop the cloud-agent service.
-
-#. 
+#. For KVM, stop the cloud-agent service.
 
-   Use the UI option to remove the node.
+#. Use the UI option to remove the node.
 
    Then you may power down the Host, re-use its IP address, re-install
    it, etc
 
+
 Removing vSphere Hosts
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -227,6 +182,7 @@ CloudStack to remove the host. CloudStack will not direct commands to a
 host that has been removed using CloudStack. However, the host may still
 exist in the vCenter cluster.
 
+
 Re-Installing Hosts
 -------------------
 
@@ -234,6 +190,7 @@ You can re-install a host after placing it in maintenance mode and then
 removing it. If a host is down and cannot be placed in maintenance mode,
 it should still be removed before the re-install.
 
+
 Maintaining Hypervisors on Hosts
 --------------------------------
 
@@ -249,7 +206,10 @@ any system that is not up to date with patches.
 .. note:: 
    The lack of up-do-date hotfixes can lead to data corruption and lost VMs.
 
-(XenServer) For more information, see `Highly Recommended Hotfixes for XenServer in the CloudStack Knowledge Base <http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2>`_.
+(XenServer) For more information, see 
+`Highly Recommended Hotfixes for XenServer in the CloudStack Knowledge Base 
+<http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2>`_.
+
 
 Changing Host Password
 ----------------------
@@ -260,19 +220,13 @@ same password.
 
 To change a Node's password:
 
-#. 
-
-   Identify all hosts in the cluster.
+#. Identify all hosts in the cluster.
 
-#. 
-
-   Change the password on all hosts in the cluster. Now the password for
+#. Change the password on all hosts in the cluster. Now the password for
    the host and the password known to CloudStack will not match.
    Operations on the cluster will fail until the two passwords match.
 
-#. 
-
-   Get the list of host IDs for the host in the cluster where you are
+#. Get the list of host IDs for the host in the cluster where you are
    changing the password. You will need to access the database to
    determine these host IDs. For each hostname "h" (or vSphere cluster)
    that you are changing the password for, execute:
@@ -281,14 +235,10 @@ To change a Node's password:
 
        mysql> select id from cloud.host where name like '%h%';
 
-#. 
-
-   This should return a single ID. Record the set of such IDs for these
+#. This should return a single ID. Record the set of such IDs for these
    hosts.
 
-#. 
-
-   Update the passwords for the host in the database. In this example,
+#. Update the passwords for the host in the database. In this example,
    we change the passwords for hosts with IDs 5, 10, and 12 to
    "password".
 
@@ -296,6 +246,7 @@ To change a Node's password:
 
        mysql> update cloud.host set password='password' where id=5 or id=10 or id=12;
 
+
 Over-Provisioning and Service Offering Limits
 ---------------------------------------------
 
@@ -350,21 +301,19 @@ configured for that cluster. It is up to the administrator to be sure
 the host is actually suitable for the level of over-provisioning which
 has been set.
 
+
 Limitations on Over-Provisioning in XenServer and KVM
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
--  
-
-   In XenServer, due to a constraint of this hypervisor, you can not use
+-  In XenServer, due to a constraint of this hypervisor, you can not use
    an over-provisioning factor greater than 4.
 
--  
-
-   The KVM hypervisor can not manage memory allocation to VMs
+-  The KVM hypervisor can not manage memory allocation to VMs
    dynamically. CloudStack sets the minimum and maximum amount of memory
    that a VM can use. The hypervisor adjusts the memory within the set
    limits based on the memory contention.
 
+
 Requirements for Over-Provisioning
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -373,6 +322,7 @@ function properly. The feature is dependent on the OS type, hypervisor
 capabilities, and certain scripts. It is the administrator's
 responsibility to ensure that these requirements are met.
 
+
 Balloon Driver
 ^^^^^^^^^^^^^^
 
@@ -380,12 +330,14 @@ All VMs should have a balloon driver installed in them. The hypervisor
 communicates with the balloon driver to free up and make the memory
 available to a VM.
 
+
 XenServer
 '''''''''
 
 The balloon driver can be found as a part of xen pv or PVHVM drivers.
 The xen pvhvm drivers are included in upstream linux kernels 2.6.36+.
 
+
 VMware
 ''''''
 
@@ -393,6 +345,7 @@ The balloon driver can be found as a part of the VMware tools. All the
 VMs that are deployed in a over-provisioned cluster should have the
 VMware tools installed.
 
+
 KVM
 '''
 
@@ -401,22 +354,26 @@ installed in all Linux kernel versions 2.6.25 and greater. The
 administrator must set CONFIG\_VIRTIO\_BALLOON=y in the virtio
 configuration.
 
+
 Hypervisor capabilities
 ^^^^^^^^^^^^^^^^^^^^^^^
 
 The hypervisor must be capable of using the memory ballooning.
 
+
 XenServer
 '''''''''
 
 The DMC (Dynamic Memory Control) capability of the hypervisor should be
 enabled. Only XenServer Advanced and above versions have this feature.
 
+
 VMware, KVM
 '''''''''''
 
 Memory ballooning is supported by default.
 
+
 Setting Over-Provisioning Ratios
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -434,35 +391,31 @@ based on the new over-provisioning ratios, to ensure that CloudStack is
 correctly tracking the amount of free capacity.
 
 .. note:: 
-   It is safer not to deploy additional new VMs while the capacity recalculation is underway, in case the new values for available capacity are not high enough to accommodate the new VMs. Just wait for the new used/available values to become available, to be sure there is room for all the new VMs you want.
+   It is safer not to deploy additional new VMs while the capacity 
+   recalculation is underway, in case the new values for available 
+   capacity are not high enough to accommodate the new VMs. Just wait 
+   for the new used/available values to become available, to be sure 
+   there is room for all the new VMs you want.
 
 To change the over-provisioning ratios for an existing cluster:
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
-
-   In the left navigation bar, click Infrastructure.
-
-#. 
-
-   Under Clusters, click View All.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation bar, click Infrastructure.
 
-   Select the cluster you want to work with, and click the Edit button.
+#. Under Clusters, click View All.
 
-#. 
+#. Select the cluster you want to work with, and click the Edit button.
 
-   Fill in your desired over-provisioning multipliers in the fields CPU
+#. Fill in your desired over-provisioning multipliers in the fields CPU
    overcommit ratio and RAM overcommit ratio. The value which is
    intially shown in these fields is the default value inherited from
    the global configuration settings.
 
    .. note:: 
-      In XenServer, due to a constraint of this hypervisor, you can not use an over-provisioning factor greater than 4.
+      In XenServer, due to a constraint of this hypervisor, you can not 
+      use an over-provisioning factor greater than 4.
+
 
 Service Offering Limits and Over-Provisioning
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -484,6 +437,7 @@ offering. For example, a guest created from a 2 GHz service offering
 will receive twice the CPU allocation as a guest created from a 1 GHz
 service offering. CloudStack does not perform memory over-provisioning.
 
+
 VLAN Provisioning
 -----------------
 
@@ -513,6 +467,7 @@ if you run out of VLANs. Another advantage is that you can use the same
 set of IPs for different customers, each one with their own routers and
 the guest networks on different physical NICs.
 
+
 VLAN Allocation Example
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -530,6 +485,7 @@ less than 500       Management traffic.             Reserved for administrative
 greater than 1000   Reserved for future use
 =================   =============================   ====================================================================================================
 
+
 Adding Non Contiguous VLAN Ranges
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -539,47 +495,30 @@ VLAN range or add multiple non contiguous VLAN ranges while creating a
 zone. You can also use the UpdatephysicalNetwork API to extend the VLAN
 range.
 
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
+#. Log in to the CloudStack UI as an administrator or end user.
 
-#. 
+#. Ensure that the VLAN range does not already exist.
 
-   Ensure that the VLAN range does not already exist.
+#. In the left navigation, choose Infrastructure.
 
-#. 
-
-   In the left navigation, choose Infrastructure.
-
-#. 
-
-   On Zones, click View More, then click the zone to which you want to
+#. On Zones, click View More, then click the zone to which you want to
    work with.
 
-#. 
-
-   Click Physical Network.
+#. Click Physical Network.
 
-#. 
+#. In the Guest node of the diagram, click Configure.
 
-   In the Guest node of the diagram, click Configure.
-
-#. 
-
-   Click Edit |edit-icon.png|.
+#. Click Edit |edit-icon.png|.
 
    The VLAN Ranges field now is editable.
 
-#. 
-
-   Specify the start and end of the VLAN range in comma-separated list.
+#. Specify the start and end of the VLAN range in comma-separated list.
 
    Specify all the VLANs you want to use, VLANs not specified will be
    removed if you are adding new ranges to the existing list.
 
-#. 
+#. Click Apply.
 
-   Click Apply.
 
 Assigning VLANs to Isolated Networks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -602,36 +541,28 @@ view what VLAN is assigned to a network.
 
 To enable you to assign VLANs to Isolated networks,
 
-#. 
-
-   Create a network offering by specifying the following:
-
-   -  
+#. Create a network offering by specifying the following:
 
-      **Guest Type**: Select Isolated.
+   -  **Guest Type**: Select Isolated.
 
-   -  
-
-      **Specify VLAN**: Select the option.
+   -  **Specify VLAN**: Select the option.
 
    For more information, see the CloudStack Installation Guide.
 
-#. 
-
-   Using this network offering, create a network.
+#. Using this network offering, create a network.
 
    You can create a VPC tier or an Isolated network.
 
-#. 
-
-   Specify the VLAN when you create the network.
+#. Specify the VLAN when you create the network.
 
    When VLAN is specified, a CIDR and gateway are assigned to this
    network and the state is changed to Setup. In this state, the network
    will not be garbage collected.
 
 .. note:: 
-   You cannot change a VLAN once it's assigned to the network. The VLAN remains with the network for its entire life cycle.
+   You cannot change a VLAN once it's assigned to the network. The VLAN 
+   remains with the network for its entire life cycle.
+
 
 .. |enable-disable.png| image:: _static/images/enable-disable.png
    :alt: button to enable or disable zone, pod, or cluster.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/index.rst
----------------------------------------------------------------------
diff --git a/source/index.rst b/source/index.rst
index cc25dd4..5ab217f 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -18,9 +18,28 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+
 Welcome to CloudStack Administration Documentation
 ==================================================
 
+.. figure:: /_static/images/acslogo.png
+   :align: center
+
+.. warning::
+   We are in the process of changing documentation format as well as hosting mechanism.
+   Please be patient with us as we migrate our entire documentation to this new setup.
+
+This guide is aimed at Administrators of a CloudStack based Cloud, 
+for Release Notes, Installation and General introduction to CloudStack 
+see the following guides:
+
+- `Documentation Start <http://docs.cloudstack.apache.org>`_
+
+- `Installation Guide <http://docs.cloudstack.apache.org/projects/cloudstack-installation>`_
+
+- `Release Notes <http://docs.cloudstack.apache.org/projects/cloudstack-release-notes>`_
+
+
 User Interface
 --------------
 
@@ -29,6 +48,7 @@ User Interface
 
    ui
 
+
 Managing Accounts, Users and Domains
 ------------------------------------
 
@@ -37,6 +57,7 @@ Managing Accounts, Users and Domains
 
    accounts
 
+
 Using Projects to Organize User Resources
 ------------------------------------------
 .. toctree::
@@ -44,6 +65,7 @@ Using Projects to Organize User Resources
 
    projects
 
+
 Service Offerings
 -----------------
 
@@ -52,6 +74,7 @@ Service Offerings
 
    service_offerings
 
+
 Setting up Networking for Users
 -------------------------------
 
@@ -60,6 +83,7 @@ Setting up Networking for Users
 
    networking
 
+
 Working with Virtual Machines
 -----------------------------
 
@@ -68,6 +92,7 @@ Working with Virtual Machines
 
    virtual_machines
 
+
 Working with Templates
 ----------------------
 
@@ -76,6 +101,7 @@ Working with Templates
 
    templates
 
+
 Working with Hosts
 ------------------
 
@@ -84,6 +110,7 @@ Working with Hosts
 
    hosts
 
+
 Working with Storage
 --------------------
 
@@ -92,6 +119,7 @@ Working with Storage
 
    storage
 
+
 Working with System Virtual Machines
 ------------------------------------
 
@@ -100,6 +128,7 @@ Working with System Virtual Machines
 
    systemvm
 
+
 Working with Usage
 ------------------
 
@@ -108,6 +137,7 @@ Working with Usage
 
    usage
 
+
 Managing Networks and Traffic
 -----------------------------
 
@@ -116,6 +146,7 @@ Managing Networks and Traffic
 
    networking_and_traffic
 
+
 Managing the Cloud
 ------------------
 
@@ -124,6 +155,7 @@ Managing the Cloud
 
    management
 
+
 System Reliability and Availability
 -----------------------------------
 
@@ -132,6 +164,7 @@ System Reliability and Availability
 
    reliability
 
+
 Tuning
 ------
 
@@ -140,6 +173,7 @@ Tuning
 
    tuning
 
+
 Events and Troubleshooting
 --------------------------
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/management.rst
----------------------------------------------------------------------
diff --git a/source/management.rst b/source/management.rst
index a5f7266..a52b40f 100644
--- a/source/management.rst
+++ b/source/management.rst
@@ -45,74 +45,44 @@ find all the volumes having tag region=canada OR tag city=Toronto:
 
 .. code:: bash
 
-    command=listVolumes
-                    &listAll=true
-                    &tags[0].key=region
-                    &tags[0].value=canada
-                    &tags[1].key=city
-                    &tags[1].value=Toronto
+   command=listVolumes
+      &listAll=true
+      &tags[0].key=region
+      &tags[0].value=canada
+      &tags[1].key=city
+      &tags[1].value=Toronto
 
 The following API commands have the "tags" input parameter:
 
--  
+-  listVirtualMachines
 
-   listVirtualMachines
+-  listVolumes
 
--  
+-  listSnapshots
 
-   listVolumes
+-  listNetworks
 
--  
+-  listTemplates
 
-   listSnapshots
+-  listIsos
 
--  
+-  listFirewallRules
 
-   listNetworks
+-  listPortForwardingRules
 
--  
+-  listPublicIpAddresses
 
-   listTemplates
+-  listSecurityGroups
 
--  
+-  listLoadBalancerRules
 
-   listIsos
+-  listProjects
 
--  
+-  listVPCs
 
-   listFirewallRules
+-  listNetworkACLs
 
--  
-
-   listPortForwardingRules
-
--  
-
-   listPublicIpAddresses
-
--  
-
-   listSecurityGroups
-
--  
-
-   listLoadBalancerRules
-
--  
-
-   listProjects
-
--  
-
-   listVPCs
-
--  
-
-   listNetworkACLs
-
--  
-
-   listStaticRoutes
+-  listStaticRoutes
 
 
 Reporting CPU Sockets
@@ -153,9 +123,7 @@ CloudStack. If so, you'll need to change the password in MySQL, and then
 add the encrypted password to
 ``/etc/cloudstack/management/db.properties``.
 
-#. 
-
-   Before changing the password, you'll need to stop CloudStack's
+#. Before changing the password, you'll need to stop CloudStack's
    management server and the usage engine if you've deployed that
    component.
 
@@ -164,9 +132,7 @@ add the encrypted password to
        # service cloudstack-management stop
        # service cloudstack-usage stop
 
-#. 
-
-   Next, you'll update the password for the CloudStack user on the MySQL
+#. Next, you'll update the password for the CloudStack user on the MySQL
    server.
 
    .. code:: bash
@@ -181,9 +147,7 @@ add the encrypted password to
        flush privileges;
        quit;
 
-#. 
-
-   The next step is to encrypt the password and copy the encrypted
+#. The next step is to encrypt the password and copy the encrypted
    password to CloudStack's database configuration
    (``/etc/cloudstack/management/db.properties``).
 
@@ -191,6 +155,7 @@ add the encrypted password to
 
            # java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar \ org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ input="newpassword123" password="`cat /etc/cloudstack/management/key`" \ verbose=false 
 
+
 File encryption type
 --------------------
 
@@ -198,9 +163,7 @@ File encryption type
    web encryption type then you'll use
    password="management\_server\_secret\_key"
 
-#. 
-
-   Now, you'll update ``/etc/cloudstack/management/db.properties`` with
+#. Now, you'll update ``/etc/cloudstack/management/db.properties`` with
    the new ciphertext. Open ``/etc/cloudstack/management/db.properties``
    in a text editor, and update these parameters:
 
@@ -209,9 +172,7 @@ File encryption type
        db.cloud.password=ENC(encrypted_password_from_above) 
        db.usage.password=ENC(encrypted_password_from_above)
 
-#. 
-
-   After copying the new password over, you can now start CloudStack
+#. After copying the new password over, you can now start CloudStack
    (and the usage engine, if necessary).
 
    .. code:: bash
@@ -219,6 +180,7 @@ File encryption type
                # service cloudstack-management start
                # service cloud-usage start
 
+
 Administrator Alerts
 --------------------
 
@@ -233,19 +195,14 @@ stored in the Management Server’s database.
 
 Emails will be sent to administrators under the following circumstances:
 
--  
-
-   The Management Server cluster runs low on CPU, memory, or storage
+-  The Management Server cluster runs low on CPU, memory, or storage
    resources
 
--  
-
-   The Management Server loses heartbeat from a Host for more than 3
+-  The Management Server loses heartbeat from a Host for more than 3
    minutes
 
--  
+-  The Host cluster runs low on CPU, memory, or storage resources
 
-   The Host cluster runs low on CPU, memory, or storage resources
 
 Sending Alerts to External SNMP and Syslog Managers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -261,117 +218,118 @@ The alerts which can be sent are:
 The following is the list of alert type numbers. The current alerts can
 be found by calling listAlerts.
 
-::
-
-    MEMORY = 0 // Available Memory below configured threshold
-
-::
-
-    CPU = 1 // Unallocated CPU below configured threshold
-
-::
-
-    STORAGE =2 // Available Storage below configured threshold
-
-::
-
-    STORAGE_ALLOCATED = 3 // Remaining unallocated Storage is below configured threshold
-
-::
-
-    PUBLIC_IP = 4 // Number of unallocated virtual network public IPs is below configured threshold
-
-::
-
-    PRIVATE_IP = 5 // Number of unallocated private IPs is below configured threshold
-
-::
-
-    SECONDARY_STORAGE = 6 //  Available Secondary Storage in availability zone is below configured threshold
-
-::
-
-    HOST = 7 // Host related alerts like host disconnected
-
-::
-
-    USERVM = 8 // User VM stopped unexpectedly
-
-::
-
-    DOMAIN_ROUTER = 9 // Domain Router VM stopped unexpectedly
-
-::
-
-    CONSOLE_PROXY = 10 // Console Proxy VM stopped unexpectedly
-
-::
-
-    ROUTING = 11 // Lost connection to default route (to the gateway)
-
-::
-
-    STORAGE_MISC = 12 // Storage issue in system VMs
-
-::
-
-    USAGE_SERVER = 13 // No usage server process running
+:: 
+   
+   MEMORY = 0 // Available Memory below configured threshold
 
-::
+:: 
+   
+   CPU = 1 // Unallocated CPU below configured threshold
 
-    MANAGMENT_NODE = 14 // Management network CIDR is not configured originally
+:: 
+   
+   STORAGE =2 // Available Storage below configured threshold
 
-::
+:: 
+   
+   STORAGE_ALLOCATED = 3 // Remaining unallocated Storage is below configured threshold
 
-    DOMAIN_ROUTER_MIGRATE = 15 // Domain Router VM Migration was unsuccessful
+:: 
+   
+   PUBLIC_IP = 4 // Number of unallocated virtual network public IPs is below configured threshold
 
-::
+:: 
+   
+   PRIVATE_IP = 5 // Number of unallocated private IPs is below configured threshold
 
-    CONSOLE_PROXY_MIGRATE = 16 // Console Proxy VM Migration was unsuccessful
+:: 
+   
+   SECONDARY_STORAGE = 6 //  Available Secondary Storage in availability zone is below configured threshold
 
-::
+:: 
+   
+   HOST = 7 // Host related alerts like host disconnected
 
-    USERVM_MIGRATE = 17 // User VM Migration was unsuccessful
+:: 
+   
+   USERVM = 8 // User VM stopped unexpectedly
 
-::
+:: 
+   
+   DOMAIN_ROUTER = 9 // Domain Router VM stopped unexpectedly
 
-    VLAN = 18 // Number of unallocated VLANs is below configured threshold in availability zone
+:: 
+   
+   CONSOLE_PROXY = 10 // Console Proxy VM stopped unexpectedly
 
-::
+:: 
+   
+   ROUTING = 11 // Lost connection to default route (to the gateway)
 
-    SSVM = 19 // SSVM stopped unexpectedly
+:: 
+   
+   STORAGE_MISC = 12 // Storage issue in system VMs
 
-::
+:: 
+   
+   USAGE_SERVER = 13 // No usage server process running
 
-    USAGE_SERVER_RESULT = 20 // Usage job failed
+:: 
+   
+   MANAGMENT_NODE = 14 // Management network CIDR is not configured originally
 
-::
+:: 
+   
+   DOMAIN_ROUTER_MIGRATE = 15 // Domain Router VM Migration was unsuccessful
 
-    STORAGE_DELETE = 21 // Failed to delete storage pool
+:: 
+   
+   CONSOLE_PROXY_MIGRATE = 16 // Console Proxy VM Migration was unsuccessful
 
-::
+:: 
+   
+   USERVM_MIGRATE = 17 // User VM Migration was unsuccessful
 
-    UPDATE_RESOURCE_COUNT = 22 // Failed to update the resource count
+:: 
+   
+   VLAN = 18 // Number of unallocated VLANs is below configured threshold in availability zone
 
-::
+:: 
+   
+   SSVM = 19 // SSVM stopped unexpectedly
 
-    USAGE_SANITY_RESULT = 23 // Usage Sanity Check failed
+:: 
+   
+   USAGE_SERVER_RESULT = 20 // Usage job failed
 
-::
+:: 
+   
+   STORAGE_DELETE = 21 // Failed to delete storage pool
 
-    DIRECT_ATTACHED_PUBLIC_IP = 24 // Number of unallocated shared network IPs is low in availability zone
+:: 
+   
+   UPDATE_RESOURCE_COUNT = 22 // Failed to update the resource count
 
-::
+:: 
+   
+   USAGE_SANITY_RESULT = 23 // Usage Sanity Check failed
 
-    LOCAL_STORAGE = 25 // Remaining unallocated Local Storage is below configured threshold
+:: 
+   
+   DIRECT_ATTACHED_PUBLIC_IP = 24 // Number of unallocated shared network IPs is low in availability zone
 
-::
+:: 
+   
+   LOCAL_STORAGE = 25 // Remaining unallocated Local Storage is below configured threshold
 
-    RESOURCE_LIMIT_EXCEEDED = 26 //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only
+:: 
+   
+   RESOURCE_LIMIT_EXCEEDED = 26 //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only
 
 
 You can also display the most up to date list by calling the API command ``listAlerts``.
 
+
 SNMP Alert Details
 ^^^^^^^^^^^^^^^^^^
 
@@ -380,6 +338,7 @@ The supported protocol is SNMP version 2.
 Each SNMP trap contains the following information: message, podId,
 dataCenterId, clusterId, and generationTime.
 
+
 Syslog Alert Details
 ^^^^^^^^^^^^^^^^^^^^
 
@@ -390,13 +349,13 @@ value, it will not be included.
 
 .. code:: bash
 
-    Date severity_level Management_Server_IP_Address/Name  alertType:: value dataCenterId:: value  podId:: value  clusterId:: value  message:: value
+   Date severity_level Management_Server_IP_Address/Name  alertType:: value dataCenterId:: value  podId:: value  clusterId:: value  message:: value
 
 For example:
 
 .. code:: bash
 
-    Mar  4 10:13:47    WARN    localhost    alertType:: managementNode message:: Management server node 127.0.0.1 is up
+   Mar  4 10:13:47    WARN    localhost    alertType:: managementNode message:: Management server node 127.0.0.1 is up
 
 Configuring SNMP and Syslog Managers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -404,30 +363,26 @@ Configuring SNMP and Syslog Managers
 To configure one or more SNMP managers or Syslog managers to receive
 alerts from CloudStack:
 
-#. 
-
-   For an SNMP manager, install the CloudStack MIB file on your SNMP
+#. For an SNMP manager, install the CloudStack MIB file on your SNMP
    manager system. This maps the SNMP OIDs to trap types that can be
    more easily read by users. The file must be publicly available. For
    more information on how to install this file, consult the
    documentation provided with the SNMP manager.
 
-#. 
-
-   Edit the file /etc/cloudstack/management/log4j-cloud.xml.
+#. Edit the file /etc/cloudstack/management/log4j-cloud.xml.
 
    .. code:: bash
 
-       # vi /etc/cloudstack/management/log4j-cloud.xml
+      # vi /etc/cloudstack/management/log4j-cloud.xml
 
-#. 
-
-   Add an entry using the syntax shown below. Follow the appropriate
+#. Add an entry using the syntax shown below. Follow the appropriate
    example depending on whether you are adding an SNMP manager or a
    Syslog manager. To specify multiple external managers, separate the
    IP addresses and other configuration values with commas (,).
 
-   .. note:: The recommended maximum number of SNMP or Syslog managers is 20 for each.
+   .. note:: 
+      The recommended maximum number of SNMP or Syslog managers is 20 
+      for each.
 
    The following example shows how to configure two SNMP managers at IP
    addresses 10.1.1.1 and 10.1.1.2. Substitute your own IP addresses,
@@ -436,16 +391,16 @@ alerts from CloudStack:
 
    .. code:: bash
 
-       <appender name="SNMP" class="org.apache.cloudstack.alert.snmp.SnmpTrapAppender">
-         <param name="Threshold" value="WARN"/>  <!-- Do not edit. The alert feature assumes WARN. -->
-         <param name="SnmpManagerIpAddresses" value="10.1.1.1,10.1.1.2"/>
-         <param name="SnmpManagerPorts" value="162,162"/>
-         <param name="SnmpManagerCommunities" value="public,public"/>
-         <layout class="org.apache.cloudstack.alert.snmp.SnmpEnhancedPatternLayout"> <!-- Do not edit -->
-           <param name="PairDelimeter" value="//"/>
-           <param name="KeyValueDelimeter" value="::"/>
-         </layout>
-       </appender>
+      <appender name="SNMP" class="org.apache.cloudstack.alert.snmp.SnmpTrapAppender">
+        <param name="Threshold" value="WARN"/>  <!-- Do not edit. The alert feature assumes WARN. -->
+        <param name="SnmpManagerIpAddresses" value="10.1.1.1,10.1.1.2"/>
+        <param name="SnmpManagerPorts" value="162,162"/>
+        <param name="SnmpManagerCommunities" value="public,public"/>
+        <layout class="org.apache.cloudstack.alert.snmp.SnmpEnhancedPatternLayout"> <!-- Do not edit -->
+          <param name="PairDelimeter" value="//"/>
+          <param name="KeyValueDelimeter" value="::"/>
+        </layout>
+      </appender>
 
    The following example shows how to configure two Syslog managers at
    IP addresses 10.1.1.1 and 10.1.1.2. Substitute your own IP addresses.
@@ -454,23 +409,19 @@ alerts from CloudStack:
 
    .. code:: bash
 
-       <appender name="ALERTSYSLOG">
-         <param name="Threshold" value="WARN"/>
-         <param name="SyslogHosts" value="10.1.1.1,10.1.1.2"/>
-         <param name="Facility" value="LOCAL6"/>   
-         <layout>
-           <param name="ConversionPattern" value=""/>
-         </layout>
-       </appender>
-
-#. 
+      <appender name="ALERTSYSLOG">
+        <param name="Threshold" value="WARN"/>
+        <param name="SyslogHosts" value="10.1.1.1,10.1.1.2"/>
+        <param name="Facility" value="LOCAL6"/>   
+        <layout>
+          <param name="ConversionPattern" value=""/>
+        </layout>
+      </appender>
 
-   If your cloud has multiple Management Server nodes, repeat these
+#. If your cloud has multiple Management Server nodes, repeat these
    steps to edit log4j-cloud.xml on every instance.
 
-#. 
-
-   If you have made these changes while the Management Server is
+#. If you have made these changes while the Management Server is
    running, wait a few minutes for the change to take effect.
 
 **Troubleshooting:** If no alerts appear at the configured SNMP or
@@ -479,6 +430,7 @@ there is an error in the syntax of the <appender> entry in
 log4j-cloud.xml. Check to be sure that the format and settings are
 correct.
 
+
 Deleting an SNMP or Syslog Manager
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -486,6 +438,7 @@ To remove an external SNMP manager or Syslog manager so that it no
 longer receives alerts from CloudStack, remove the corresponding entry
 from the file ``/etc/cloudstack/management/log4j-cloud.xml``.
 
+
 Customizing the Network Domain Name
 -----------------------------------
 
@@ -495,63 +448,47 @@ installation, and a domain administrator can do so within their own
 domain. To specify a custom domain name and put it into effect, follow
 these steps.
 
-#. 
-
-   Set the DNS suffix at the desired scope
+#. Set the DNS suffix at the desired scope
 
-   -  
-
-      At the network level, the DNS suffix can be assigned through the
+   -  At the network level, the DNS suffix can be assigned through the
       UI when creating a new network, as described in 
-      `“Adding an Additional Guest Network” <networking2#adding-an-additional-guest-network>`_ or with the
+      `“Adding an Additional Guest Network” 
+      <networking2#adding-an-additional-guest-network>`_ or with the
       updateNetwork command in the CloudStack API.
 
-   -  
-
-      At the account, domain, or zone level, the DNS suffix can be
+   -  At the account, domain, or zone level, the DNS suffix can be
       assigned with the appropriate CloudStack API commands:
       createAccount, editAccount, createDomain, editDomain, createZone,
       or editZone.
 
-   -  
-
-      At the global level, use the configuration parameter
+   -  At the global level, use the configuration parameter
       guest.domain.suffix. You can also use the CloudStack API command
       updateConfiguration. After modifying this global configuration,
       restart the Management Server to put the new setting into effect.
 
-#. 
-
-   To make the new DNS suffix take effect for an existing network, call
+#. To make the new DNS suffix take effect for an existing network, call
    the CloudStack API command updateNetwork. This step is not necessary
    when the DNS suffix was specified while creating a new network.
 
 The source of the network domain that is used depends on the following
 rules.
 
--  
-
-   For all networks, if a network domain is specified as part of a
+-  For all networks, if a network domain is specified as part of a
    network's own configuration, that value is used.
 
--  
-
-   For an account-specific network, the network domain specified for the
+-  For an account-specific network, the network domain specified for the
    account is used. If none is specified, the system looks for a value
    in the domain, zone, and global configuration, in that order.
 
--  
-
-   For a domain-specific network, the network domain specified for the
+-  For a domain-specific network, the network domain specified for the
    domain is used. If none is specified, the system looks for a value in
    the zone and global configuration, in that order.
 
--  
-
-   For a zone-specific network, the network domain specified for the
+-  For a zone-specific network, the network domain specified for the
    zone is used. If none is specified, the system looks for a value in
    the global configuration.
 
+
 Stopping and Restarting the Management Server
 ---------------------------------------------------
 
@@ -568,11 +505,11 @@ operating system prompt on the Management Server node:
 
 .. code:: bash
 
-    # service cloudstack-management stop
+   # service cloudstack-management stop
 
 To start the Management Server:
 
 .. code:: bash
 
-    # service cloudstack-management start
+   # service cloudstack-management start
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/networking.rst
----------------------------------------------------------------------
diff --git a/source/networking.rst b/source/networking.rst
index df65cd2..6568703 100644
--- a/source/networking.rst
+++ b/source/networking.rst
@@ -25,31 +25,22 @@ preferences when it comes to the networking services provided by the
 cloud. As a CloudStack administrator, you can do the following things to
 set up networking for your users:
 
--  
+-  Set up physical networks in zones
 
-   Set up physical networks in zones
-
--  
-
-   Set up several different providers for the same service on a single
+-  Set up several different providers for the same service on a single
    physical network (for example, both Cisco and Juniper firewalls)
 
--  
-
-   Bundle different types of network services into network offerings, so
+-  Bundle different types of network services into network offerings, so
    users can choose the desired network services for any given virtual
    machine
 
--  
-
-   Add new network offerings as time goes on so end users can upgrade to
+-  Add new network offerings as time goes on so end users can upgrade to
    a better class of service on their network
 
--  
-
-   Provide more ways for a network to be accessed by a user, such as
+-  Provide more ways for a network to be accessed by a user, such as
    through a project of which the user is a member
 
+
 About Virtual Networks
 ---------------------------
 
@@ -57,27 +48,24 @@ A virtual network is a logical construct that enables multi-tenancy on a
 single physical network. In CloudStack a virtual network can be shared
 or isolated.
 
+
 Isolated Networks
 ~~~~~~~~~~~~~~~~~
 
 An isolated network can be accessed only by virtual machines of a single
 account. Isolated networks have the following properties.
 
--  
-
-   Resources such as VLAN are allocated and garbage collected
+-  Resources such as VLAN are allocated and garbage collected
    dynamically
 
--  
-
-   There is one network offering for the entire network
+-  There is one network offering for the entire network
 
--  
-
-   The network offering can be upgraded or downgraded but it is for the
+-  The network offering can be upgraded or downgraded but it is for the
    entire network
 
-For more information, see `“Configure Guest Traffic in an Advanced Zone” <networking2.html#configure-guest-traffic-in-an-advanced-zone>`_.
+For more information, see `“Configure Guest Traffic in an Advanced Zone” 
+<networking2.html#configure-guest-traffic-in-an-advanced-zone>`_.
+
 
 Shared Networks
 ~~~~~~~~~~~~~~~
@@ -87,32 +75,21 @@ different accounts. Network Isolation on shared networks is accomplished
 by using techniques such as security groups, which is supported only in
 Basic zones in CloudStack 3.0.3 and later versions.
 
--  
-
-   Shared Networks are created by the administrator
-
--  
-
-   Shared Networks can be designated to a certain domain
+-  Shared Networks are created by the administrator
 
--  
+-  Shared Networks can be designated to a certain domain
 
-   Shared Network resources such as VLAN and physical network that it
+-  Shared Network resources such as VLAN and physical network that it
    maps to are designated by the administrator
 
--  
+-  Shared Networks can be isolated by security groups
 
-   Shared Networks can be isolated by security groups
+-  Public Network is a shared network that is not shown to the end users
 
--  
-
-   Public Network is a shared network that is not shown to the end users
-
--  
-
-   Source NAT per zone is not supported in Shared Network when the
+-  Source NAT per zone is not supported in Shared Network when the
    service provider is virtual router. However, Source NAT per account
-   is supported. For information, see `“Configuring a Shared Guest Network” <networking2.html#configuring-a-shared-guest-network>`_.
+   is supported. For information, see `“Configuring a Shared Guest 
+   Network” <networking2.html#configuring-a-shared-guest-network>`_.
 
 
 Runtime Allocation of Virtual Network Resources
@@ -125,11 +102,13 @@ When all virtual machines have left the virtual network, the network
 resources are garbage collected so they can be allocated again. This
 helps to conserve network resources.
 
+
 Network Service Providers
 -------------------------
 
 .. note:: 
-   For the most up-to-date list of supported network service providers, see the CloudStack UI or call `listNetworkServiceProviders`.
+   For the most up-to-date list of supported network service providers, 
+   see the CloudStack UI or call `listNetworkServiceProviders`.
 
 A service provider (also called a network element) is hardware or
 virtual appliance that makes a network service possible; for example, a
@@ -176,54 +155,36 @@ offering.
 | Port Forwarding      | Yes       | No         | Yes      | No          | No          |
 +----------------------+-----------+------------+----------+-------------+-------------+
 
+
 Network Offerings
 -----------------
 
 .. note:: 
-   For the most up-to-date list of supported network services, see the CloudStack UI or call listNetworkServices.
+   For the most up-to-date list of supported network services, see the 
+   CloudStack UI or call listNetworkServices.
 
 A network offering is a named set of network services, such as:
 
--  
-
-   DHCP
-
--  
-
-   DNS
-
--  
-
-   Source NAT
-
--  
-
-   Static NAT
-
--  
-
-   Port Forwarding
+-  DHCP
 
--  
+-  DNS
 
-   Load Balancing
+-  Source NAT
 
--  
+-  Static NAT
 
-   Firewall
+-  Port Forwarding
 
--  
+-  Load Balancing
 
-   VPN
+-  Firewall
 
--  
+-  VPN
 
-   (Optional) Name one of several available providers to use for a given
+-  (Optional) Name one of several available providers to use for a given
    service, such as Juniper for the firewall
 
--  
-
-   (Optional) Network tag to specify which physical network to use
+-  (Optional) Network tag to specify which physical network to use
 
 When creating a new VM, the user chooses one of the available network
 offerings, and that determines which network services the VM can use.
@@ -240,7 +201,12 @@ balancing solution, and alternate networks for accessing the database
 backend.
 
 .. note:: 
-   If you create load balancing rules while using a network service offering that includes an external load balancer device such as NetScaler, and later change the network service offering to one that uses the CloudStack virtual router, you must create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function.
+   If you create load balancing rules while using a network service 
+   offering that includes an external load balancer device such as 
+   NetScaler, and later change the network service offering to one that 
+   uses the CloudStack virtual router, you must create a firewall rule 
+   on the virtual router for each of your existing load balancing rules 
+   so that they continue to function.
 
 When creating a new virtual network, the CloudStack administrator
 chooses which network offering to enable for that network. Each virtual
@@ -252,80 +218,55 @@ CloudStack also has internal network offerings for use by CloudStack
 system VMs. These network offerings are not visible to users but can be
 modified by administrators.
 
+
 Creating a New Network Offering
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To create a network offering:
 
-#. 
-
-   Log in with admin privileges to the CloudStack UI.
-
-#. 
-
-   In the left navigation bar, click Service Offerings.
-
-#. 
-
-   In Select Offering, choose Network Offering.
+#. Log in with admin privileges to the CloudStack UI.
 
-#. 
+#. In the left navigation bar, click Service Offerings.
 
-   Click Add Network Offering.
+#. In Select Offering, choose Network Offering.
 
-#. 
+#. Click Add Network Offering.
 
-   In the dialog, make the following choices:
+#. In the dialog, make the following choices:
 
-   -  
+   -  **Name**. Any desired name for the network offering.
 
-      **Name**. Any desired name for the network offering.
-
-   -  
-
-      **Description**. A short description of the offering that can be
+   -  **Description**. A short description of the offering that can be
       displayed to users.
 
-   -  
-
-      **Network Rate**. Allowed data transfer rate in MB per second.
-
-   -  
+   -  **Network Rate**. Allowed data transfer rate in MB per second.
 
-      **Guest Type**. Choose whether the guest network is isolated or
+   -  **Guest Type**. Choose whether the guest network is isolated or
       shared.
 
       For a description of this term, see `“About Virtual
       Networks” <#about-virtual-networks>`_.
 
-   -  
-
-      **Persistent**. Indicate whether the guest network is persistent
+   -  **Persistent**. Indicate whether the guest network is persistent
       or not. The network that you can provision without having to
       deploy a VM on it is termed persistent network. For more
       information, see `“Persistent
       Networks” <networking2.html#persistent-networks>`_.
 
-   -  
-
-      **Specify VLAN**. (Isolated guest networks only) Indicate whether
+   -  **Specify VLAN**. (Isolated guest networks only) Indicate whether
       a VLAN could be specified when this offering is used. If you
       select this option and later use this network offering while
       creating a VPC tier or an isolated network, you will be able to
       specify a VLAN ID for the network you create.
 
-   -  
-
-      **VPC**. This option indicate whether the guest network is Virtual
+   -  **VPC**. This option indicate whether the guest network is Virtual
       Private Cloud-enabled. A Virtual Private Cloud (VPC) is a private,
       isolated part of CloudStack. A VPC can have its own virtual
       network topology that resembles a traditional physical network.
       For more information on VPCs, see `“About Virtual
       Private Clouds” <networking2.html#about-virtual-private-clouds>`_.
 
-   -  
-
-      **Supported Services**. Select one or more of the possible network
+   -  **Supported Services**. Select one or more of the possible network
       services. For some services, you must also choose the service
       provider; for example, if you select Load Balancer, you can choose
       the CloudStack virtual router or any other load balancers that
@@ -365,9 +306,7 @@ To create a network offering:
       =================== ============================================================================ ============= =============
 
 
-   -  
-
-      **System Offering**. If the service provider for any of the
+   -  **System Offering**. If the service provider for any of the
       services selected in Supported Services is a virtual router, the
       System Offering field appears. Choose the system service offering
       that you want virtual routers to use in this network. For example,
@@ -377,11 +316,10 @@ To create a network offering:
       system service offering and any custom system service offerings
       that have been defined by the CloudStack root administrator.
 
-      For more information, see `“System Service Offerings” <service_offerings.html#system-service-offerings>`_.
+      For more information, see `“System Service Offerings” 
+      <service_offerings.html#system-service-offerings>`_.
 
-   -  
-
-      **LB Isolation**: Specify what type of load balancer isolation you
+   -  **LB Isolation**: Specify what type of load balancer isolation you
       want for the network: Shared or Dedicated.
 
       **Dedicated**: If you select dedicated LB isolation, a dedicated
@@ -400,9 +338,7 @@ To create a network offering:
       its maximum capacity, the device will not be allocated to a new
       account.
 
-   -  
-
-      **Mode**: You can select either Inline mode or Side by Side mode:
+   -  **Mode**: You can select either Inline mode or Side by Side mode:
 
       **Inline mode**: Supported only for Juniper SRX firewall and BigF5
       load balancer devices. In inline mode, a firewall device is placed
@@ -417,29 +353,20 @@ To create a network offering:
       to the load balancer public IP is not routed through the firewall,
       and therefore, is exposed to the public network.
 
-   -  
-
-      **Associate Public IP**: Select this option if you want to assign
+   -  **Associate Public IP**: Select this option if you want to assign
       a public IP address to the VMs deployed in the guest network. This
       option is available only if
 
-      -  
-
-         Guest network is shared.
-
-      -  
+      -  Guest network is shared.
 
-         StaticNAT is enabled.
+      -  StaticNAT is enabled.
 
-      -  
+      -  Elastic IP is enabled.
 
-         Elastic IP is enabled.
+      For information on Elastic IP, see `“About Elastic IP” 
+      <networking2.html#about-elastic-ip>`_.
 
-      For information on Elastic IP, see `“About Elastic IP” <networking2.html#about-elastic-ip>`_.
-
-   -  
-
-      **Redundant router capability**: Available only when Virtual
+   -  **Redundant router capability**: Available only when Virtual
       Router is selected as the Source NAT provider. Select this option
       if you want to use two virtual routers in the network for
       uninterrupted connection: one operating as the master virtual
@@ -450,9 +377,7 @@ To create a network offering:
       CloudStack deploys the routers on different hosts to ensure
       reliability if one host is down.
 
-   -  
-
-      **Conserve mode**: Indicate whether to use conserve mode. In this
+   -  **Conserve mode**: Indicate whether to use conserve 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
@@ -462,15 +387,14 @@ To create a network offering:
       the same public IP.
 
       .. note:: 
-        If StaticNAT is enabled, irrespective of the status of the conserve mode, no port forwarding or load balancing rule can be created for the IP. However, you can add the firewall rules by using the createFirewallRule command.
+        If StaticNAT is enabled, irrespective of the status of the 
+        conserve mode, no port forwarding or load balancing rule can be 
+        created for the IP. However, you can add the firewall rules by 
+        using the createFirewallRule command.
 
-   -  
+   -  **Tags**: Network tag to specify which physical network to use.
 
-      **Tags**: Network tag to specify which physical network to use.
-
-   -  
-
-      **Default egress policy**: Configure the default policy for
+   -  **Default egress policy**: Configure the default policy for
       firewall egress rules. Options are Allow and Deny. Default is
       Allow if no egress policy is specified, which indicates that all
       the egress traffic is accepted when a guest network is created
@@ -480,7 +404,5 @@ To create a network offering:
       this case, when you configure an egress rules for an isolated
       guest network, rules are added to allow the specified traffic.
 
-#. 
-
-   Click Add.
+#. Click Add.
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/networking/global_server_load_balancing.rst
----------------------------------------------------------------------
diff --git a/source/networking/global_server_load_balancing.rst b/source/networking/global_server_load_balancing.rst
index 3d88f4d..e25ea45 100644
--- a/source/networking/global_server_load_balancing.rst
+++ b/source/networking/global_server_load_balancing.rst
@@ -193,14 +193,14 @@ above, the administrator of xyztelco is the one who sets up GSLB:
    tenant's cloud that make use of the GSLB service.
 
 #. On the NetScaler side, configure GSLB as given in `Configuring Global
-   Server Load Balancing
-   (GSLB) <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-con.html>`_:
+   Server Load Balancing (GSLB) 
+   <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-con.html>`_:
 
    #. Configuring a standard load balancing setup.
 
    #. Configure Authoritative DNS, as explained in `Configuring an
-      Authoritative DNS
-      Service <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-adns-svc-tsk.html>`_.
+      Authoritative DNS Service 
+      <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-adns-svc-tsk.html>`_.
 
    #. Configure a GSLB site with site name formed from the domain name
       details.
@@ -211,18 +211,18 @@ above, the administrator of xyztelco is the one who sets up GSLB:
       As per the example given above, the site names are A.xyztelco.com
       and B.xyztelco.com.
 
-      For more information, see `Configuring a Basic GSLB
-      Site <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-basic-site-tsk.html>`_.
+      For more information, see `Configuring a Basic GSLB Site 
+      <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-basic-site-tsk.html>`_.
 
    #. Configure a GSLB virtual server.
 
-      For more information, see `Configuring a GSLB Virtual
-      Server <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-vsvr-tsk.html>`_.
+      For more information, see `Configuring a GSLB Virtual Server 
+      <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-vsvr-tsk.html>`_.
 
    #. Configure a GSLB service for each virtual server.
 
-      For more information, see `Configuring a GSLB
-      Service <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-svc-tsk.html>`_.
+      For more information, see `Configuring a GSLB Service 
+      <http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-svc-tsk.html>`_.
 
    #. Bind the GSLB services to the GSLB virtual server.
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/networking/portable_ips.rst
----------------------------------------------------------------------
diff --git a/source/networking/portable_ips.rst b/source/networking/portable_ips.rst
index 7daed13..55b3cd2 100644
--- a/source/networking/portable_ips.rst
+++ b/source/networking/portable_ips.rst
@@ -120,7 +120,7 @@ API:
 
 .. code:: bash
 
-    http://localhost:8096/client/api?command=enableStaticNat&response=json&ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&virtualmachineid=a242c476-ef37-441e-9c7b-b303e2a9cb4f&networkid=6e7cd8d1-d1ba-4c35-bdaf-333354cbd49810
+   http://localhost:8096/client/api?command=enableStaticNat&response=json&ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&virtualmachineid=a242c476-ef37-441e-9c7b-b303e2a9cb4f&networkid=6e7cd8d1-d1ba-4c35-bdaf-333354cbd49810
 
 Replace the UUID with appropriate UUID. For example, if you want to
 transfer a portable IP to network X and VM Y in a network, execute the
@@ -128,4 +128,4 @@ following:
 
 .. code:: bash
 
-    http://localhost:8096/client/api?command=enableStaticNat&response=json&ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&virtualmachineid=Y&networkid=X
+   http://localhost:8096/client/api?command=enableStaticNat&response=json&ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&virtualmachineid=Y&networkid=X

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/networking/security_groups.rst
----------------------------------------------------------------------
diff --git a/source/networking/security_groups.rst b/source/networking/security_groups.rst
index 9ff2841..8ef58b8 100644
--- a/source/networking/security_groups.rst
+++ b/source/networking/security_groups.rst
@@ -30,7 +30,8 @@ guest network for all guest VMs. In advanced zones, security groups are
 supported only on the KVM hypervisor.
 
 .. note:: 
-   In a zone that uses advanced networking, you can instead define multiple guest networks to isolate traffic to VMs.
+   In a zone that uses advanced networking, you can instead define 
+   multiple guest networks to isolate traffic to VMs.
 
 Each CloudStack account comes with a default security group that denies
 all inbound traffic and allows all outbound traffic. The default


[38/40] git commit: CLOUDSTACK-6634: added more details for ldap ssl

Posted by ra...@apache.org.
CLOUDSTACK-6634: added more details for ldap ssl

This closes #20


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

Branch: refs/heads/4.4
Commit: fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618
Parents: 3356677
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Wed Sep 10 11:08:56 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Wed Sep 10 11:24:26 2014 +0530

----------------------------------------------------------------------
 source/accounts.rst | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fe5b65de/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index 83d7329..be8f457 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -235,9 +235,13 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~~~~~~~~~
 
--  ``ldap.truststore``, ``ldap.truststore.password``:	truststore, password
-   to use for LDAP SSL.
- 
+| If the LDAP server requires SSL, you need to enable the below configurations.
+Before enabling SSL for LDAP, you need to get the certificate which the LDAP server is using and add it to a trusted keystore.
+You will need to know the path to the keystore and the password.
+
+-  ``ldap.truststore`` : truststore path
+-  ``ldap.truststore.password`` : truststore password
+
 
 LDAP groups:
 ~~~~~~~~~~~~


[17/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/templates.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/templates.po b/source/locale/zh_CN/LC_MESSAGES/templates.po
new file mode 100644
index 0000000..958ffe8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/templates.po
@@ -0,0 +1,1557 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# morgan wang <mo...@gmail.com>, 2014
+# renoshen <sh...@sinosig.com>, 2014
+# 语法盐 <um...@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-23 11:44+0000\n"
+"Last-Translator: renoshen <sh...@sinosig.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# b97982f6c7534586be38178d1c1fdcd8
+#: ../../templates.rst:17
+msgid "Working with Templates"
+msgstr "使用模板"
+
+# e9dce9aaa8b14b9b8163fc28465cbca2
+#: ../../templates.rst:19
+msgid ""
+"A template is a reusable configuration for virtual machines. When users "
+"launch VMs, they can choose from a list of templates in CloudStack."
+msgstr "模板相当于虚拟机的重用配置。当用户创建虚拟机时能从CloudStack的模板列表中选择一个。"
+
+# d0a82a53c7814d2bad8709d6ea8d8243
+#: ../../templates.rst:22
+msgid ""
+"Specifically, a template is a virtual disk image that includes one of a "
+"variety of operating systems, optional additional software such as office "
+"applications, and settings such as access control to determine who can use "
+"the template. Each template is associated with a particular type of "
+"hypervisor, which is specified when the template is added to CloudStack."
+msgstr "特殊情况下,模板可以是一个包含一个或多个操作系统的虚拟磁盘镜像,你可以选择性的安装另外的软件,比如office应用并设置访问控制来决定谁能使用这个模板。每个模板对应一个特殊类型的虚拟机,此类虚拟机在将模板添加入CloudStack时指定。"
+
+# 3cea19812ae7412c873921f3b112df2d
+#: ../../templates.rst:29
+msgid ""
+"CloudStack ships with a default template. In order to present more choices "
+"to users, CloudStack administrators and users can create templates and add "
+"them to CloudStack."
+msgstr "CloudStack附带一个默认模板。为了向用户呈现出更多选择,CloudStack的管理员和用户能创建模板并添加到CloudStack中。"
+
+# cdd1318db7514de09ddba24875b24795
+#: ../../templates.rst:34
+msgid "Creating Templates: Overview"
+msgstr "创建模板概览"
+
+# 6604bbcbda1146a8947cec849b8aacfc
+#: ../../templates.rst:36
+msgid ""
+"CloudStack ships with a default template for the CentOS operating system. "
+"There are a variety of ways to add more templates. Administrators and end "
+"users can add templates. The typical sequence of events is:"
+msgstr "CloudStack默认已经有了一个带CentOS系统的默认模板。有许多添加更多模板的方法,管理员和普通用户均能添加。一般是这样的顺序:"
+
+# f34378876e0d44ff800666b2d65fc180
+#: ../../templates.rst:43
+msgid ""
+"Launch a VM instance that has the operating system you want. Make any other "
+"desired configuration changes to the VM."
+msgstr "运行一个带有你需要的操作系统的虚拟机实例,并进行一些你期望的设置。"
+
+# 24b37b205a73458c8aa1fb8a40a568e0
+#: ../../templates.rst:48
+msgid "Stop the VM."
+msgstr "停止VM。"
+
+# c64df33a7a6842908b88d0747e1af601
+#: ../../templates.rst:52
+msgid "Convert the volume into a template."
+msgstr "将卷转换为模板。"
+
+# 59a9ab57227c474ab160737b378627a2
+#: ../../templates.rst:54
+msgid ""
+"There are other ways to add templates to CloudStack. For example, you can "
+"take a snapshot of the VM's volume and create a template from the snapshot, "
+"or import a VHD from another system into CloudStack."
+msgstr "还有其他方法向CloudStack中添加模板。比如你可以对虚机磁盘卷做个快照然后通过这个快照创建模板,或者从另一个系统导入一个VHD到CloudStack。"
+
+# ed480ef0b4464b7f8970f7eab786dc96
+#: ../../templates.rst:58
+msgid ""
+"The various techniques for creating templates are described in the next few "
+"sections."
+msgstr "接下来的几节中将继续讲述各种创建模板的技术。"
+
+# af2d0bd506da45ac8de738d250325f24
+#: ../../templates.rst:62
+msgid "Requirements for Templates"
+msgstr "模板的需求"
+
+# fc604d7ce79041b2897e66c4616fd723
+#: ../../templates.rst:66
+msgid ""
+"For XenServer, install PV drivers / Xen tools on each template that you "
+"create. This will enable live migration and clean guest shutdown."
+msgstr "对于 XenServer, 在每一个你创建的模板上安装 PV 驱动 / Xen tools。 这将使动态迁移和干净的宾客关机成为可能。"
+
+# 2b50282ce07c41bab1cee4868ba4f5d6
+#: ../../templates.rst:71
+msgid ""
+"For vSphere, install VMware Tools on each template that you create. This "
+"will enable console view to work properly."
+msgstr "对于 vSphere, 在每一个你创建的模板上安装VMware 工具。这将使控制台视图能够正常工作。"
+
+# 5377504bbc294b95a18bed88ae03f1d9
+#: ../../templates.rst:75
+msgid "Best Practices for Templates"
+msgstr "模板最佳实践"
+
+# 8b50a16e441f4fd184b61b8ee029f3f5
+#: ../../templates.rst:77
+msgid ""
+"If you plan to use large templates (100 GB or larger), be sure you have a "
+"10-gigabit network to support the large templates. A slower network can lead"
+" to timeouts and other errors when large templates are used."
+msgstr "如果你计划使用大的模板(100 GB 或更大),确保你有10g 的网络以支持大的模板。 当大的模板被使用时,较慢的网络可能导致超时及其它错误。"
+
+# c65bd804ed504406aef7628943a9c8d2
+#: ../../templates.rst:82
+msgid "The Default Template"
+msgstr "默认模版"
+
+# 3b90996336f84b0aa52436eb288e8fba
+#: ../../templates.rst:84
+msgid ""
+"CloudStack includes a CentOS template. This template is downloaded by the "
+"Secondary Storage VM after the primary and secondary storage are configured."
+" You can use this template in your production deployment or you can delete "
+"it and use custom templates."
+msgstr "CloudStack包含一个CentOS 模版。当主存储和二级存储配置完成后,这个模版会由二级存储虚拟机下载。可以在生产部署中使用这个模版,也可以删除掉它,使用自定义的模版。"
+
+# bf35079fef2c4e0da02bb26f3df5fe85
+#: ../../templates.rst:89
+msgid "The root password for the default template is \"password\"."
+msgstr "默认模版的root用户密码是“password”。"
+
+# d186fb39f0b14670b9a5253112624276
+#: ../../templates.rst:91
+msgid ""
+"A default template is provided for each of XenServer, KVM, and vSphere. The "
+"templates that are downloaded depend on the hypervisor type that is "
+"available in your cloud. Each template is approximately 2.5 GB physical "
+"size."
+msgstr "为XenServer,KVM和vSphere各提供了一个默认模板。下载的模板取决于你的云中使用的hypervisor类型。每个模板大概占用2.5GB的存储空间。"
+
+# ae8fa27cab21480a8c78818ad26a73cb
+#: ../../templates.rst:96
+msgid ""
+"The default template includes the standard iptables rules, which will block "
+"most access to the template excluding ssh."
+msgstr "默认模版包括标准的iptables 规则,会阻止除了ssh以外的其他访问。"
+
+# 585bfd6d56c141f389acaac29c2bc2b6
+#: ../../templates.rst:127
+msgid "Private and Public Templates"
+msgstr "私有模板和公共模板"
+
+# 094bc80655894801afd84e326eb84942
+#: ../../templates.rst:129
+msgid ""
+"When a user creates a template, it can be designated private or public."
+msgstr "用户创建模板时可选择模板为公有还是私有。"
+
+# 38f8f0da399c4f41a347cc19f748ae1b
+#: ../../templates.rst:131
+msgid ""
+"Private templates are only available to the user who created them. By "
+"default, an uploaded template is private."
+msgstr "私有模板只对创建者可用。默认上传的模板都是私有的。"
+
+# 2a9baa4520e347fe908ae26fd50998f9
+#: ../../templates.rst:134
+msgid ""
+"When a user marks a template as “public,” the template becomes available to "
+"all users in all accounts in the user's domain, as well as users in any "
+"other domains that have access to the Zone where the template is stored. "
+"This depends on whether the Zone, in turn, was defined as private or public."
+" A private Zone is assigned to a single domain, and a public Zone is "
+"accessible to any domain. If a public template is created in a private Zone,"
+" it is available only to users in the domain assigned to that Zone. If a "
+"public template is created in a public Zone, it is available to all users in"
+" all domains."
+msgstr "当用户将模板标识为“公有”,该模板不但能让该用户域中所有账户中的所有用户使用,还可以让能访问存储该模板的区域的其他域中用户使用。这取决于zone是设置成公用还是私有。私有区域被分配到一个单一的域,而公共区域能被任何域访问。"
+
+# 3d8553febf0c4c4fbc1aed2d798b78c2
+#: ../../templates.rst:145
+msgid "Creating a Template from an Existing Virtual Machine"
+msgstr "通过已存在的虚拟机创建模板"
+
+# b34a4411b3bf42179857b79aaec48563
+#: ../../templates.rst:147
+msgid ""
+"Once you have at least one VM set up in the way you want, you can use it as "
+"the prototype for other VMs."
+msgstr "当你已经有了一台按你的想法已经配置好的虚拟机,你就能以他为原型创建别的虚拟机。"
+
+# 78c1160dd7654cdfbe52f57d079f5abd
+#: ../../templates.rst:152
+msgid ""
+"Create and start a virtual machine using any of the techniques given in "
+"`“Creating VMs” <virtual_machines.html#creating-vms>`_."
+msgstr "使用 `“创建VMs” <virtual_machines.html#creating-vms>`_给出的方法创建并且开启一个虚拟机。"
+
+# 2929319d149c4fcdb37c841bdbcc196a
+#: ../../templates.rst:157
+msgid ""
+"Make any desired configuration changes on the running VM, then click Stop."
+msgstr "在虚拟机中做好需要的配置,然后点击按钮关闭该虚拟机。"
+
+# 2d69a12ca4de48a78512bbbbebb2eefa
+#: ../../templates.rst:162
+msgid ""
+"Wait for the VM to stop. When the status shows Stopped, go to the next step."
+msgstr "等待虚拟机关闭。当虚拟机状态显示为“已停止”,执行下一步。"
+
+# f6f6ce0522624d9996ceb76388d1b770
+#: ../../templates.rst:167
+msgid "Click Create Template and provide the following:"
+msgstr "点击创建模板并填写如下内容:"
+
+# df5bf3067ef5417d92794b9738fd372f
+#: ../../templates.rst:171
+msgid ""
+"**Name and Display Text**. These will be shown in the UI, so choose "
+"something descriptive."
+msgstr "**名称和显示文本**。这些会在UI中显示,所以建议写一些描述信息。"
+
+# 903462ebc26045d2af6e191c552a45ab
+#: ../../templates.rst:176
+msgid ""
+"**OS Type**. This helps CloudStack and the hypervisor perform certain "
+"operations and make assumptions that improve the performance of the guest. "
+"Select one of the following."
+msgstr "**操作系统类型*:。这有助于CloudStack和Hypervisor执行某些操作并可能提高来宾虚拟机的性能。选择下列之一。"
+
+# eef0499093fc423da1fb5e509f3cb7be
+# eaaf0c252a824fccb1af2998fee8d49f
+#: ../../templates.rst:182 ../../templates.rst:279
+msgid "If the operating system of the stopped VM is listed, choose it."
+msgstr "如果已停止虚拟机的系统在列表中,选择它。"
+
+# 4f0b55b1cccf465198f844ca55404e39
+# dc5c72f566c5451a87f2d2f76991185a
+#: ../../templates.rst:186 ../../templates.rst:283
+msgid "If the OS type of the stopped VM is not listed, choose Other."
+msgstr "如果已停止虚拟机系统类型不在列表中就选择其他。"
+
+# 85bc582d7b3342eabcac40adc7d072c8
+#: ../../templates.rst:190
+msgid ""
+"If you want to boot from this template in PV mode, choose Other PV (32-bit) "
+"or Other PV (64-bit). This choice is available only for XenServere:"
+msgstr "如果你打算以PV模式启动该模板,请选择其他PV(32位)或其他PV(64位)。这个选项只对XenServer有效:"
+
+# a41f73ed716e4aa3a7f43e06bada92ed
+#: ../../templates.rst:195
+msgid ""
+"Generally you should not choose an older version of the OS than the version "
+"in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image"
+" will in general not work. In those cases you should choose Other."
+msgstr "通常你不能选择比镜像版本老的OS版本。比如,选择CentOS 5.4来支持CentOS 6.2镜像通常来说是不工作的。在这种情况下,你应该选择其他。"
+
+# 44c4a4919ef041128bb76ba89fffa6d6
+# e06181c135fe4c93bd3a807628405544
+#: ../../templates.rst:199 ../../templates.rst:311
+msgid ""
+"**Public**. Choose Yes to make this template accessible to all users of this"
+" CloudStack installation. The template will appear in the Community "
+"Templates list. See `“Private and Public Templates” <#private-and-public-"
+"templates>`_."
+msgstr "**公共**。选择是来让CloudStack里面的所有用户都能访问这个模板。模板将会出现在社区模板列表中。请参阅 `“私有和公共模板” <#private-and-public-templates>`_。"
+
+# 05097ba3eec34760b41263458363d672
+# 7e830042c5e14c27bb0dc51842194b14
+#: ../../templates.rst:206 ../../templates.rst:300
+msgid ""
+"**Password Enabled**. Choose Yes if your template has the CloudStack "
+"password change script installed. See :ref:`adding-password-management-to-"
+"templates`."
+msgstr "**启用密码**。如果你的模板中安装了CLoudStack密码修改脚本,选择是。请参阅 :ref:`adding-password-management-to-templates`。"
+
+# b8c02b54e1284747953940f7ccf942a8
+#: ../../templates.rst:212
+msgid "Click Add."
+msgstr "点击 添加"
+
+# cb7e9326affc4313ac75fea0bff14a3c
+#: ../../templates.rst:214
+msgid ""
+"The new template will be visible in the Templates section when the template "
+"creation process has been completed. The template is then available when "
+"creating a new VM."
+msgstr "当模版创建过程完成后,新模版会出现在模版页面。在创建虚机时就可以使用新模版了。"
+
+# d1fecfebba6645d9a4f9568d91c0fb06
+#: ../../templates.rst:219
+msgid "Creating a Template from a Snapshot"
+msgstr "从一个快照创建一个模板"
+
+# a7cea31e283c40dd96c119053c993503
+#: ../../templates.rst:221
+msgid ""
+"If you do not want to stop the VM in order to use the Create Template menu "
+"item (as described in `“Creating a Template from an Existing Virtual "
+"Machine” <#creating-a-template-from-an-existing-virtual-machine>`_), you can"
+" create a template directly from any snapshot through the CloudStack UI."
+msgstr "如果你不想为了使用创建模板菜单项而停止虚拟机(如在`“从已有的虚机创建模板” <#creating-a-template-from-an-existing-virtual-machine>`_中描述的), 你可以通过CloudStack UI从任何快照直接创建模板。"
+
+# 984009ddf50d40dfb2110f5b23387f61
+#: ../../templates.rst:228
+msgid "Uploading Templates"
+msgstr "上传模板"
+
+# 196471dc9b5849d2aa744d1e7b8d0ec0
+#: ../../templates.rst:231
+msgid "vSphere Templates and ISOs"
+msgstr "vSphere模板和ISOs"
+
+# 30866cf195c8486db3b993897617b502
+#: ../../templates.rst:233
+msgid ""
+"If you are uploading a template that was created using vSphere Client, be "
+"sure the OVA file does not contain an ISO. If it does, the deployment of VMs"
+" from the template will fail."
+msgstr "如果你通过vSphere Client上传模板,请确认OVA文件不包含ISO。如果是的话,从模板部署虚拟机将失败。"
+
+# f8a902f51889404f9159fc314d776820
+#: ../../templates.rst:237
+msgid ""
+"Templates are uploaded based on a URL. HTTP is the supported access "
+"protocol. Templates are frequently large files. You can optionally gzip them"
+" to decrease upload times."
+msgstr "模板是使用HTTP协议通过URL来上传的。模板通常都很大。你可以使用gzip压缩它们以缩短上传时间。"
+
+# cbcb2f29584346b6abf842dfd76253c5
+#: ../../templates.rst:241
+msgid "To upload a template:"
+msgstr "要上传模板:"
+
+# b46958da45914799b6d8ff82c369141a
+#: ../../templates.rst:245
+msgid "In the left navigation bar, click Templates."
+msgstr "在左边的导航栏,点击模板。"
+
+# 19421f0f499d41a987b6029ab13e22d2
+#: ../../templates.rst:249
+msgid "Click Register Template."
+msgstr "点击注册模板。"
+
+# 7350ec439ecf4b9fa396697dfa3435e5
+#: ../../templates.rst:253
+msgid "Provide the following:"
+msgstr "填写以下内容:"
+
+# 1ce39115484049f199d0e70ec9561044
+#: ../../templates.rst:257
+msgid ""
+"**Name and Description**. These will be shown in the UI, so choose something"
+" descriptive."
+msgstr "**名称和显示文本**。这些会在UI中显示,所以建议写一些描述信息。"
+
+# 127eb097c195441b944d50f4a71deca7
+#: ../../templates.rst:262
+msgid ""
+"**URL**. The Management Server will download the file from the specified "
+"URL, such as ``http://my.web.server/filename.vhd.gz``."
+msgstr "**URL**。管理服务器会从指定的URL下载模板,就像 ``http://my.web.server/filename.vhd.gz``。"
+
+# 6f01a7bde653483995bb5ea42190e593
+#: ../../templates.rst:267
+msgid ""
+"**Zone**. Choose the zone where you want the template to be available, or "
+"All Zones to make it available throughout CloudStack."
+msgstr "**区域**::选择你希望该模板在到哪个区域可用,或者选择所有区域使该模板在CloudStack中全部区域中可用。"
+
+# ef2f1a58ba5c4460bdbfda5ae10bcc24
+#: ../../templates.rst:273
+msgid ""
+"**OS Type**: This helps CloudStack and the hypervisor perform certain "
+"operations and make assumptions that improve the performance of the guest. "
+"Select one of the following:"
+msgstr "**操作系统类型*::这有助于CloudStack和Hypervisor执行某些操作并假设可提高来宾虚拟机的性能。选择下列之一。"
+
+# c7645974b5a64764ac62444e1d454568
+#: ../../templates.rst:286
+msgid ""
+"You should not choose an older version of the OS than the version in the "
+"image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will "
+"in general not work. In those cases you should choose Other."
+msgstr "你不能选择比镜像版本老的OS版本。比如,选择CentOS 5.4来支持CentOS 6.2镜像通常来说是不工作的。在这种情况下,你应该选择其他。"
+
+# bd3382cf7fe747aab8acebd0878992e0
+#: ../../templates.rst:290
+msgid ""
+"**Hypervisor**: The supported hypervisors are listed. Select the desired "
+"one."
+msgstr "**Hypervisor**:列表中显示支持的hypervisors。选择想要的一个。"
+
+# c413d15acab8476abae76e3ec4158efe
+#: ../../templates.rst:295
+msgid ""
+"**Format**. The format of the template upload file, such as VHD or OVA."
+msgstr "**格式**。上传的模板文件的格式,如VHD或OVA。"
+
+# eb40e62c6b99406f95b7505520fc671c
+#: ../../templates.rst:305
+msgid ""
+"**Extractable**. Choose Yes if the template is available for extraction. If "
+"this option is selected, end users can download a full image of a template."
+msgstr "**可提取**。如果模板可以被提取请选择是。如果选择了此选项,终端用户可以下载此模板的完全镜。"
+
+# d0c590b7a8ff4fde8139138840e3a796
+#: ../../templates.rst:318
+msgid ""
+"**Featured**. Choose Yes if you would like this template to be more "
+"prominent for users to select. The template will appear in the Featured "
+"Templates list. Only an administrator can make a template Featured."
+msgstr "**精选**: 。如果你想这个用户在选择这个模板时更明显则选择Yes。该模板将出现在精选模板列表中。只有管理员可以设置模板为精选。"
+
+# b953221466f84cdaaf807ddf3dd14331
+#: ../../templates.rst:324
+msgid "Exporting Templates"
+msgstr "导出模板"
+
+# 210af661681d4b74ab96649040a98801
+#: ../../templates.rst:326
+msgid ""
+"End users and Administrators may export templates from the CloudStack. "
+"Navigate to the template in the UI and choose the Download function from the"
+" Actions menu."
+msgstr "最终用户和管理员可以从CloudStack导出模板。导航到用户界面中的模板并选择动作菜单中的下载功能。"
+
+# c9e622e4441c486e9792dad0071c79a4
+#: ../../templates.rst:331
+msgid "Creating a Linux Template"
+msgstr "创建Linux模板"
+
+# f3d40c1bd83a40e482eecb6fc443d8d8
+#: ../../templates.rst:333
+msgid ""
+"Linux templates should be prepared using this documentation in order to "
+"prepare your linux VMs for template deployment. For ease of documentation, "
+"the VM which you are configuring the template on will be referred to as "
+"\"Template Master\". This guide currently covers legacy setups which do not "
+"take advantage of UserData and cloud-init and assumes openssh-server is "
+"installed during installation."
+msgstr "为了准备使用模板部署你的Linux VMs,可以使用此文档来准备Linux模板。对于文档中的情况,你要通过配置模板,这会涉及\"主模板\"。这个指导目前覆盖了传统的安装,但不会涉及用户数据和cloud-init还有假设在装过程中安装了openshh服务。"
+
+# cbdcfc92ef3c42daaad80eab662526ec
+#: ../../templates.rst:340
+msgid "An overview of the procedure is as follow:"
+msgstr "过程概述如下:"
+
+# 09ce1d3c4240411da2de19daa0e75a14
+#: ../../templates.rst:344
+msgid "Upload your Linux ISO."
+msgstr "上传你的Linux ISO。"
+
+# b709b7a1294e4b3a89aba8985610f2bf
+# ac566543d5174806b5b43b5c4b2d8e51
+#: ../../templates.rst:346 ../../templates.rst:621
+msgid ""
+"For more information, see `“Adding an ISO” <virtual_machines.html#adding-an-"
+"iso>`_."
+msgstr "更多信息,请参阅 `“添加ISO” <virtual_machines.html#adding-an-iso>`_。"
+
+# 9f5f963ccb544cd799db5e8d28c3f13a
+# 55a6ab4f297b490494f31fcd9bef1cc4
+#: ../../templates.rst:351 ../../templates.rst:626
+msgid "Create a VM Instance with this ISO."
+msgstr "使用这个ISO创建VM实例。"
+
+# 7b26a17b00654d78b1d48449d47bb693
+# 018114db744c49f7a4ebca7ebe93a5f2
+#: ../../templates.rst:353 ../../templates.rst:628
+msgid ""
+"For more information, see `“Creating VMs” <virtual_machines.html#creating-"
+"vms>`_."
+msgstr "更多信息,请参阅 `“创建VMs” <virtual_machines.html#creating-vms>`_。"
+
+# 0eaeb0fc68664d88bafb0c88f87caeee
+#: ../../templates.rst:358
+msgid "Prepare the Linux VM"
+msgstr "准备Linux VM"
+
+# 1bcbb90a25ea4b2b9644a3aa3ee13c96
+#: ../../templates.rst:362
+msgid "Create a template from the VM."
+msgstr "从VM创建模板。"
+
+# 6d747156af6d4e22b6f7f4183a481d23
+#: ../../templates.rst:364
+msgid ""
+"For more information, see `“Creating a Template from an Existing Virtual "
+"Machine” <#creating-a-template-from-an-existing-virtual-machine>`_."
+msgstr "更多信息,请参阅 `“从已有的虚拟机创建模板” <#creating-a-template-from-an-existing-virtual-machine>`_。"
+
+# d0502af4e09d4f53a49dc979cc2115ff
+#: ../../templates.rst:368
+msgid "System preparation for Linux"
+msgstr "Linux的系统准备工作"
+
+# f2357087bc5f42eaa080740d2f383720
+#: ../../templates.rst:370
+msgid ""
+"The following steps will prepare a basic Linux installation for templating."
+msgstr "下列步骤将会为模板准备一个基本的Linux安装。"
+
+# 2f768f536c1c467eb43f846f7d4b20e7
+#: ../../templates.rst:375
+msgid "**Installation**"
+msgstr "**安装**"
+
+# c0e24128e57f4829b65dc62d46c7ba22
+#: ../../templates.rst:377
+msgid ""
+"It is good practice to name your VM something generic during installation, "
+"this will ensure components such as LVM do not appear unique to a machine. "
+"It is recommended that the name of \"localhost\" is used for installation."
+msgstr "通常在安装过程中给VM命名是一个好的做法,这么做能确保某些组件如LVM不会只在一台机器中出现。推荐在在安装过程中使用\"localhost\"命名。"
+
+# c7b181c8424c4ac2a5db84ab32932c6b
+#: ../../templates.rst:383
+msgid ""
+"For CentOS, it is necessary to take unique identification out of the "
+"interface configuration file, for this edit /etc/sysconfig/network-scripts"
+"/ifcfg-eth0 and change the content to the following."
+msgstr "对于CentOS,必须要修改网络接口的配置文件,在这里我们编辑/etc/sysconfig/network-scripts/ifcfg-eth0文件,更改下面的内容。"
+
+# c809b5e9069d4d308ce145cebfe06181
+#: ../../templates.rst:395
+msgid "The next steps updates the packages on the Template Master."
+msgstr "下一步更新主模板中的包。"
+
+# 579e290288bf4dbd83390d508b5ef3d1
+# 4495571dfe17446e936d6c2e985e2ab1
+# e55ce9881af345a1b47fc4f7b61bc53b
+#: ../../templates.rst:399 ../../templates.rst:452 ../../templates.rst:507
+msgid "Ubuntu"
+msgstr "Ubuntu"
+
+# e80c530710fb4cee96e8d71723f4d96e
+# c67c8bb4b1744c8ba004a8c61a6fad89
+#: ../../templates.rst:411 ../../templates.rst:516
+msgid "CentOS"
+msgstr "CentOS"
+
+# 547d3c2473034af098b576f4f992a237
+#: ../../templates.rst:421
+msgid "**Password management**"
+msgstr "**密码管理**"
+
+# d51304bc25b14d99b74a9110a390ccca
+#: ../../templates.rst:424
+msgid ""
+"If preferred, custom users (such as ones created during the Ubuntu "
+"installation) should be removed. First ensure the root user account is "
+"enabled by giving it a password and then login as root to continue."
+msgstr "如果需要,客户(如在Ubuntu的安装过程中创建的用户)应该被移除。首先确认root用户账户是启用的并且使用了密码,然后使用root登录。"
+
+# 658b170366354ccf83ce75fe1639bc4d
+#: ../../templates.rst:431
+msgid ""
+"As root, remove any custom user accounts created during the installation "
+"process."
+msgstr "使用root,移除任何在安装过程中创建的自定义用户账户。"
+
+# f637065854134e638919541fb32eb84b
+#: ../../templates.rst:438
+msgid ""
+"See :ref:`adding-password-management-to-templates` for instructions to setup"
+" the password management script, this will allow CloudStack to change your "
+"root password from the web interface."
+msgstr "关于设置密码管理脚本的相关说明,请参阅 :ref:`adding-password-management-to-templates` ,这样能允许CloudStack通过web界面更改root密码。"
+
+# d13b9fe31d374f469fac4aa8ce8dc9f4
+#: ../../templates.rst:444
+msgid "**Hostname Management**"
+msgstr "**主机名管理**"
+
+# 982c2c40802c440eb281ce70ee1039de
+#: ../../templates.rst:446
+msgid ""
+"CentOS configures the hostname by default on boot. Unfortunately Ubuntu does"
+" not have this functionality, for Ubuntu installations use the following "
+"steps."
+msgstr "默认情况下CentOS在启动的时候配置主机名。但是,Ubuntu却没有此功能,对于Ubuntu,安装时使用下面步骤。"
+
+# 0178c9ebbec047ac97ddc98ca473d916
+#: ../../templates.rst:454
+msgid ""
+"The hostname of a Templated VM is set by a custom script in `/etc/dhcp"
+"/dhclient-exit-hooks.d`, this script first checks if the current hostname is"
+" localhost, if true, it will get the host-name, domain-name and fixed-ip "
+"from the DHCP lease file and use those values to set the hostname and append"
+" the `/etc/hosts` file for local hostname resolution. Once this script, or a"
+" user has changed the hostname from localhost, it will no longer adjust "
+"system files regardless of it's new hostname. The script also recreates "
+"openssh-server keys, which should have been deleted before templating (shown"
+" below). Save the following script to `/etc/dhcp/dhclient-exit-"
+"hooks.d/sethostname`, and adjust the permissions."
+msgstr "一个模板化的VM使用`/etc/dhcp/dhclient-exit-hooks.d`中的一个自定义脚本来设置主机名,这个脚本首先检查当前的主机名是是否是hostname,如果是,它将从DHCP租约文件获取host-name,domain-name和fix-ip,并且使用这些值来设置主机名并将其追加到 `/etc/hosts` 文件以用来本地主机名解析。一旦这个脚本或者一个用户从本地改变了主机名,那么它将不再根据新的主机名调整系统文件。此脚本同样也会重建openssh-server keys,这个keys在做模板(如下所示)之前被删除了。保存下面的脚本到`/etc/dhcp/dhclient-exit-hooks.d/sethostname`,并且调整权限。"
+
+# fe871e346c034a448c839f15e941772f
+#: ../../templates.rst:495
+msgid ""
+"The following steps should be run when you are ready to template your "
+"Template Master. If the Template Master is rebooted during these steps you "
+"will have to run all the steps again. At the end of this process the "
+"Template Master should be shutdown and the template created in order to "
+"create and deploy the final template."
+msgstr "当你准备好做你的主模板的时候请运行下列步骤。如果主模板在这些步骤期间重启了,那么你要重新运行所有的步骤。在这个过程的最后,主模板应该关机并且将其创建为模板,然后再部署。"
+
+# 149ee407a0784b0e8d7ead7d9d8a7569
+#: ../../templates.rst:499
+msgid "**Remove the udev persistent device rules**"
+msgstr "**移除udev持久设备规则**"
+
+# 09d2f6969ea4495f8d3200289619bc87
+#: ../../templates.rst:501
+msgid ""
+"This step removes information unique to your Template Master such as network"
+" MAC addresses, lease files and CD block devices, the files are "
+"automatically generated on next boot."
+msgstr "这一步会移除你的主模板的特殊信息,如网络MAC地址,租约信息和CD块设备,这个文件会在下次启动时自动生成。"
+
+# dccc779f465d434584a69fd29714e940
+#: ../../templates.rst:525
+msgid "**Remove SSH Keys**"
+msgstr "**移除SSH Keys**"
+
+# d6760ea97ea8402d93af0b6120f93697
+#: ../../templates.rst:527
+msgid ""
+"This step is to ensure all your Templated VMs do not have the same SSH keys,"
+" which would decrease the security of the machines dramatically."
+msgstr "这步是为了确认所有要作为模板的VMs的SSH Keys都不相同,否则这样会降低虚拟机的安全性。"
+
+# e4e46d9373974bb9a3ae5ccf1f52f702
+#: ../../templates.rst:537
+msgid "**Cleaning log files**"
+msgstr "**清除日志文件**"
+
+# 980fbba40e0f47e7b22db48d406cc44b
+#: ../../templates.rst:539
+msgid "It is good practice to remove old logs from the Template Master."
+msgstr "从主模板移除旧的日志文件是一个好习惯。"
+
+# 7f8be6e73c1d47068b14e4ad28ef5e15
+#: ../../templates.rst:550
+msgid "**Setting hostname**"
+msgstr "**设置主机名**"
+
+# de0f2fa5263e473abcbeb7c76a6d40c3
+#: ../../templates.rst:552
+msgid ""
+"In order for the Ubuntu DHCP script to function and the CentOS dhclient to "
+"set the VM hostname they both require the Template Master's hostname to be "
+"\"localhost\", run the following commands to change the hostname."
+msgstr "为了Ubuntu DHCP的脚本功能和CentOS dhclient能设置VM主机名,他们都去要设置主模板的主机名设置为“localhost”,运行下面的命令来更改主机名。"
+
+# f2483a338de1437d970961b780b42986
+#: ../../templates.rst:564
+msgid "**Set user password to expire**"
+msgstr "**设置用户密码期限**"
+
+# f4f9060b59e04300a00134b382b7e942
+#: ../../templates.rst:566
+msgid ""
+"This step forces the user to change the password of the VM after the "
+"template has been deployed."
+msgstr "这步是要在模板部署之后强制用户更改VM的密码。"
+
+# 1d5004344434482e955600fae7641ddd
+#: ../../templates.rst:575
+msgid "**Clearing User History**"
+msgstr "**清除用户历史**"
+
+# 558586e151b34ea9bee4fca84ebe87e0
+#: ../../templates.rst:577
+msgid "The next step clears the bash commands you have just run."
+msgstr "下一步来清除你曾经运行过的bash命令。"
+
+# d067fa08a996436f8012882688681b5f
+#: ../../templates.rst:586
+msgid "**Shutdown the VM**"
+msgstr "**关闭VM**"
+
+# 3385f8a2912f4b7aa403ac9336129197
+#: ../../templates.rst:588
+msgid "Your now ready to shutdown your Template Master and create a template!"
+msgstr "现在你可以关闭你的主模板并且创建模板了!"
+
+# 833287af973b459dade1e7d9b9e12fd0
+#: ../../templates.rst:597
+msgid "**Create the template!**"
+msgstr "**创建模板!**"
+
+# cc845b025bf7436c8a2fe1a5370697dd
+#: ../../templates.rst:599
+msgid ""
+"You are now ready to create the template, for more information see "
+"`“Creating a Template from an Existing Virtual Machine” <#creating-a"
+"-template-from-an-existing-virtual-machine>`_."
+msgstr "现在你可以创建模板了,更多信息请参阅 `“从已存在的虚拟机创建模板” <#creating-a-template-from-an-existing-virtual-machine>`_。"
+
+# 49f52c8fd11641b28939444cfcce76ae
+#: ../../templates.rst:603
+msgid ""
+"Templated VMs for both Ubuntu and CentOS may require a reboot after "
+"provisioning in order to pickup the hostname."
+msgstr "通过Ubuntu和CentOS的模板分发的虚机可能需要重启才让主机名生效。"
+
+# 1010fc47e18749c68019824bc996c021
+#: ../../templates.rst:606
+msgid "Creating a Windows Template"
+msgstr "创建Windows模板"
+
+# 62aa5a53936342a5be49acafed8787e2
+#: ../../templates.rst:608
+msgid ""
+"Windows templates must be prepared with Sysprep before they can be "
+"provisioned on multiple machines. Sysprep allows you to create a generic "
+"Windows template and avoid any possible SID conflicts."
+msgstr "Windows模板在分发多个虚拟机的之前必须使用Sysprep初始化。Sysprep允许你创建一个通用的Windows模板和避免任何可能的SID冲突。"
+
+# 93f8c56a97ed45f9b7eef40d188fa6f6
+#: ../../templates.rst:613
+msgid ""
+"(XenServer) Windows VMs running on XenServer require PV drivers, which may "
+"be provided in the template or added after the VM is created. The PV drivers"
+" are necessary for essential management functions such as mounting "
+"additional volumes and ISO images, live migration, and graceful shutdown."
+msgstr "(XenServer)XXenServer上运行的Windows VMs需要安装PV驱动,它可能在模板中或在创建完VM后添加。PV驱动对于基本的管理功能是必要的,比如挂载额外的卷和ISO镜像、在线迁移和正常关机。"
+
+# 10e9f2ae09f346b191803a1268827c34
+#: ../../templates.rst:615
+msgid "An overview of the procedure is as follows:"
+msgstr "过程概述如下:"
+
+# 7c74d731ea0c49059fbcf67d5ff664a2
+#: ../../templates.rst:619
+msgid "Upload your Windows ISO."
+msgstr "上传你的Windows ISO。"
+
+# 2b9ecebbe01b4c29a2d7ffbc9ed8b065
+#: ../../templates.rst:633
+msgid ""
+"Follow the steps in Sysprep for Windows Server 2008 R2 (below) or Sysprep "
+"for Windows Server 2003 R2, depending on your version of Windows Server"
+msgstr "按照你所使用的WIndows Server版本进行Windows Server 2008 R2(下面的)或者Windows Server 2003 R2中Sysprep的操作步骤。"
+
+# 169ee710e92b4161841d3210c6b91486
+#: ../../templates.rst:639
+msgid ""
+"The preparation steps are complete. Now you can actually create the template"
+" as described in Creating the Windows Template."
+msgstr "准本工作完成了。现在你可以按照创建Windows模板中描述的来创建模板。"
+
+# c0ab9ccaa2854a52a850fa038d0151e0
+#: ../../templates.rst:643
+msgid "System Preparation for Windows Server 2008 R2"
+msgstr "为Windows Server 2008 R2进行系统准备"
+
+# 2e7993ee27744e2b89db43f38f717532
+#: ../../templates.rst:645
+msgid ""
+"For Windows 2008 R2, you run Windows System Image Manager to create a custom"
+" sysprep response XML file. Windows System Image Manager is installed as "
+"part of the Windows Automated Installation Kit (AIK). Windows AIK can be "
+"downloaded from `Microsoft Download Center <http://www.microsoft.com/en-"
+"us/download/details.aspx?id=9085>`_."
+msgstr "对于Windows 2008 R2,你运行Windows系统镜像管理来创建一个自定义的sysprep应答XML文件。Windows系统镜像管理作为Windows Automated Installation Kit (AIK)的一部分安装在系统中。Windows AIK可以从 `微软下载中心 <http://www.microsoft.com/en-us/download/details.aspx?id=9085>`_下载到。"
+
+# 9735f11f65f043fc812bfee77f30b42f
+#: ../../templates.rst:651
+msgid "Use the following steps to run sysprep for Windows 2008 R2:"
+msgstr "按照以下步骤运行Windows 2008 R2的sysprep:"
+
+# fdb356b8473046cca0039cd58ece0ffc
+#: ../../templates.rst:654
+msgid ""
+"The steps outlined here are derived from the excellent guide by Charity "
+"Shelbourne, originally published at `Windows Server 2008 Sysprep Mini-Setup."
+" <http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-"
+"process-during-windows-server-2008-sysprep-mini-setup.aspx>`_"
+msgstr "这些步骤的概述来源于Charity Shelbourne一个非常棒的指导,发布在 `Windows Server 2008 Sysprep Mini-Setup. <http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx>`_。"
+
+# a800a2000a8a43e19b88a1d6530c372f
+#: ../../templates.rst:658
+msgid "Download and install the Windows AIK"
+msgstr "下载和安装Windows AIK"
+
+# f66f1235066d41e8b512a595faad7818
+#: ../../templates.rst:660
+msgid ""
+"Windows AIK should not be installed on the Windows 2008 R2 VM you just "
+"created. Windows AIK should not be part of the template you create. It is "
+"only used to create the sysprep answer file."
+msgstr "刚刚创建的Windows 2008 R2上面并没有安装Windows AIK。Windows AIK不是你创建的模板中的一部分。它仅仅用于创建sysprep应答文件。"
+
+# f5c23584f8704d3e8eafef5f0c3ca904
+#: ../../templates.rst:664
+msgid ""
+"Copy the install.wim file in the \\\\sources directory of the Windows 2008 "
+"R2 installation DVD to the hard disk. This is a very large file and may take"
+" a long time to copy. Windows AIK requires the WIM file to be writable."
+msgstr "在\\\\Windows 2008 R2安装DVD中的源目录复制install.wim文件到本地硬盘。这是一个非常大的文件可能会复制较长时间。Windows AIK要求WIM文件是可写的。"
+
+# aab8b3e2b3974f70baa1625fac2c14fd
+#: ../../templates.rst:671
+msgid ""
+"Start the Windows System Image Manager, which is part of the Windows AIK."
+msgstr "打开Windows系统镜像管理器。"
+
+# 1c160daa1e4d45298e989df5d4cfd37f
+#: ../../templates.rst:676
+msgid ""
+"In the Windows Image pane, right click the Select a Windows image or catalog"
+" file option to load the install.wim file you just copied."
+msgstr "在Windows镜像面板,右击选择一个Windows镜像或编录文件选项来读取你刚刚复制的install.wim文件。"
+
+# 2f06fcf046b24cecb301f75499dad24c
+#: ../../templates.rst:681
+msgid "Select the Windows 2008 R2 Edition."
+msgstr "选择Windows 2008 R2版本。"
+
+# 8469a2417aad4122900ecb188ce0fcbe
+#: ../../templates.rst:683
+msgid ""
+"You may be prompted with a warning that the catalog file cannot be opened. "
+"Click Yes to create a new catalog file."
+msgstr "你可能会收到一个警告提示说不能打开编录文件。点击是来创建一个新的编录文件。"
+
+# 8635e88aab6e46139f303271f469e2bc
+#: ../../templates.rst:688
+msgid "In the Answer File pane, right click to create a new answer file."
+msgstr "在应答文件面板,右击来创建一个新的应答文件。"
+
+# 24d7e05616d6424cb5eaee30ee84e85c
+#: ../../templates.rst:692
+msgid ""
+"Generate the answer file from the Windows System Image Manager using the "
+"following steps:"
+msgstr "使用以下步骤从Windows系统镜像管理器生成应答文件:"
+
+# 7d146d237bdf4c8b9bc322249916735e
+#: ../../templates.rst:697
+msgid ""
+"The first page you need to automate is the Language and Country or Region "
+"Selection page. To automate this, expand Components in your Windows Image "
+"pane, right-click and add the Microsoft-Windows-International-Core setting "
+"to Pass 7 oobeSystem. In your Answer File pane, configure the InputLocale, "
+"SystemLocale, UILanguage, and UserLocale with the appropriate settings for "
+"your language and country or region. Should you have a question about any of"
+" these settings, you can right-click on the specific setting and select "
+"Help. This will open the appropriate CHM help file with more information, "
+"including examples on the setting you are attempting to configure."
+msgstr "第一个页面你必须让语言和国家或位置选择页面是自动的。要使这个自动化,请在你的Windows 镜像面板扩展组件,右击Microsoft-Windows-International-Core添加设置以传送 7 oobeSystem。在你的应答文件面板中,为语言和国家或位置用适当的设置配置InputLocale、SystemLocale、UILanguage、和UserLocale。你可能对这些设置有疑问,你可以指定一个设置右击选择帮助。这将打开对应的CHM帮助文件,这里面包括了与你尝试配置的设置相关的一些示例。"
+
+# 39a6eeb7c8944403884a739c0cf32e3b
+#: ../../templates.rst:709
+msgid "|sysmanager.png|"
+msgstr "|sysmanager.png|"
+
+# 1395a502c6dd45f58cfcd4f820af8fe7
+#: ../../templates.rst:713
+msgid ""
+"You need to automate the Software License Terms Selection page, otherwise "
+"known as the End-User License Agreement (EULA). To do this, expand the "
+"Microsoft-Windows-Shell-Setup component. High-light the OOBE setting, and "
+"add the setting to the Pass 7 oobeSystem. In Settings, set HideEULAPage "
+"true."
+msgstr "你需要将软件授权选择页配置为自动进行,这不是众所周知的EULA。为此,展开Microsoft-Windows-Shell-Setup组件,选中OOBE 设置,将此设置加入到Pass 7 oobeSystem中去。在设置中,将HideEULAPage 设置为true。"
+
+# db723163193447488c0439d1a6632aed
+#: ../../templates.rst:719
+msgid "|software-license.png|"
+msgstr "|software-license.png|"
+
+# d98cb51114994e44a8bdd0d588ba834f
+#: ../../templates.rst:723
+msgid ""
+"Make sure the license key is properly set. If you use MAK key, you can just "
+"enter the MAK key on the Windows 2008 R2 VM. You need not input the MAK into"
+" the Windows System Image Manager. If you use KMS host for activation you "
+"need not enter the Product Key. Details of Windows Volume Activation can be "
+"found at `http://technet.microsoft.com/en-us/library/bb892849.aspx "
+"<http://technet.microsoft.com/en-us/library/bb892849.aspx>`_"
+msgstr "确保恰当的设置了序列号。如果使用MAK的话,可以在Windows2008R2的虚拟机上输入MAK。并不需要将MAK输入到Windows映像管理器中。如果你使用KMS主机进行激活,则不需要输入产品序列号。Windows卷激活的详细信息可以在http://technet.microsoft.com/en-us/library/bb892849.aspx 上查看。"
+
+# acb1ca72a0a5474295b25d5e1c567eed
+#: ../../templates.rst:732
+msgid ""
+"You need to automate is the Change Administrator Password page. Expand the "
+"Microsoft-Windows-Shell-Setup component (if it is not still expanded), "
+"expand UserAccounts, right-click on AdministratorPassword, and add the "
+"setting to the Pass 7 oobeSystem configuration pass of your answer file. "
+"Under Settings, specify a password next to Value."
+msgstr "类似机械化的操作还有更改管理员密码页。展开Microsoft-Windows-Shell-Setup组件(如果没有展开的话),展开用户账户,右键点击管理员密码,添加设置到Pass 7 oobeSystem配置,在设置中,指定一个密码。"
+
+# e682e956688f47d68955125dac840c14
+#: ../../templates.rst:739
+msgid "|change-admin-password.png|"
+msgstr "|change-admin-password.png|"
+
+# daf0fbba34134968a9719502d2441755
+#: ../../templates.rst:741
+msgid ""
+"You may read the AIK documentation and set many more options that suit your "
+"deployment. The steps above are the minimum needed to make Windows "
+"unattended setup work."
+msgstr "可能会需要阅读AIK文档并设置多个选项来适合你的部署。以上的步骤至少需要使windows脱离建立网络的过程。"
+
+# 2177f3f79d7745109ee2ed854da656fa
+#: ../../templates.rst:747
+msgid ""
+"Save the answer file as unattend.xml. You can ignore the warning messages "
+"that appear in the validation window."
+msgstr "将答案文件保存为unattend.xml,可以忽略验证窗口中的警告信息。"
+
+# 75e9203b76fe4bbbae1be6975b972993
+#: ../../templates.rst:752
+msgid ""
+"Copy the unattend.xml file into the c:\\\\windows\\\\system32\\\\sysprep "
+"directory of the Windows 2008 R2 Virtual Machine"
+msgstr "将unattend.xml文件拷贝到Windows 2008 R2 虚拟机的c:\\\\windows\\\\system32\\\\sysprep 文件夹下,"
+
+# e84ae652bc724676b0076c85b3cf53f8
+#: ../../templates.rst:757
+msgid ""
+"Once you place the unattend.xml file in c:\\\\windows\\\\system32\\\\sysprep"
+" directory, you run the sysprep tool as follows:"
+msgstr "一旦将unattend.xml文件放到 c:\\\\windows\\\\system32\\\\sysprep文件夹下,则按以下步骤运行sysprep工具:"
+
+# 0d8f98d28cb44bee935c1a3fa186b971
+#: ../../templates.rst:766
+msgid ""
+"The Windows 2008 R2 VM will automatically shut down after sysprep is "
+"complete."
+msgstr "Windows 2008 R2虚拟机在sysprep完成后,会自动关闭。"
+
+# 131fba78f4fe42138a6d62dff1e93de1
+#: ../../templates.rst:770
+msgid "System Preparation for Windows Server 2003 R2"
+msgstr "针对Windows Server 2003R2的系统准备"
+
+# 5a4f1cef39ff41a08b9ac2528ffb6f92
+#: ../../templates.rst:772
+msgid ""
+"Earlier versions of Windows have a different sysprep tool. Follow these "
+"steps for Windows Server 2003 R2."
+msgstr "早期的windows版本有个不同的sysprep的工具,按照这些步骤准备Windows Server 2003 R2。"
+
+# c249bea7dcdf459ab7238be1d409e256
+#: ../../templates.rst:777
+msgid ""
+"Extract the content of \\\\support\\\\tools\\\\deploy.cab on the Windows "
+"installation CD into a directory called c:\\\\sysprep on the Windows 2003 R2"
+" VM."
+msgstr "从Windows 安装CD中提取\\\\support\\\\tools\\\\deploy.cab到WIndows 2003 R2 虚拟机中的此目录 c:\\\\sysprep。"
+
+# 7e7e0bd9f3b44465a5160687008f203e
+#: ../../templates.rst:783
+msgid "Run c:\\\\sysprep\\\\setupmgr.exe to create the sysprep.inf file."
+msgstr "运行 c:\\\\sysprep\\\\setupmgr.exe 来创建syprep.inf文件。"
+
+# ee8815b2ec4b4be893fb36a3348d01f8
+#: ../../templates.rst:787
+msgid "Select Create New to create a new Answer File."
+msgstr "选择创建新的来创建一个新的应答文件。"
+
+# 045a9cf32e0548aaa69c44f772b4d46f
+#: ../../templates.rst:791
+msgid "Enter “Sysprep setup” for the Type of Setup."
+msgstr "安装的类型选择 “Sysprep 安装”"
+
+# d6bf6bd23bb94cf6b60f6b6907bbf7a6
+#: ../../templates.rst:795
+msgid "Select the appropriate OS version and edition."
+msgstr "选择合适的OS版本"
+
+# 7e54b77b3e2e4d80a63a6be54ae18c5c
+#: ../../templates.rst:799
+msgid ""
+"On the License Agreement screen, select “Yes fully automate the "
+"installation”."
+msgstr "在许可协议界面,选择\"是,完全自动安装\""
+
+# 82b865e18fbb473082090aa49f85ae93
+#: ../../templates.rst:804
+msgid "Provide your name and organization."
+msgstr "提供你的名称和组织。"
+
+# 7a5769e94b4a428db294a3fb3a0207f4
+#: ../../templates.rst:808
+msgid "Leave display settings at default."
+msgstr "保留显示设置为默认。"
+
+# 010c51f88169452b957f232e3157804a
+#: ../../templates.rst:812
+msgid "Set the appropriate time zone."
+msgstr "设置合适的时区。"
+
+# bfb59b5726d6458fa9279b6d55943a6d
+#: ../../templates.rst:816
+msgid "Provide your product key."
+msgstr "提供你的产品key。"
+
+# 4deb0945241246ea8ce43407adf7d91d
+#: ../../templates.rst:820
+msgid "Select an appropriate license mode for your deployment"
+msgstr "给你的部署选择一个合适的许可模式。"
+
+# 5ab1bdc24ada4093b615dee9c5f9272c
+#: ../../templates.rst:824
+msgid "Select “Automatically generate computer name”."
+msgstr "选择\"自动生成计算机名\"。"
+
+# 42d2434653d540858a5cba81e3d19ef3
+#: ../../templates.rst:828
+msgid ""
+"Type a default administrator password. If you enable the password reset "
+"feature, the users will not actually use this password. This password will "
+"be reset by the instance manager after the guest boots up."
+msgstr "输入一个默认的管理员密码。如果你启用了密码重置功能,用户实际上将不会使用这个密码。在来宾虚机启动之后实例管理器会重置密码。"
+
+# a4ff18a071b740839db9b822fbc1294a
+#: ../../templates.rst:835
+msgid "Leave Network Components at “Typical Settings”."
+msgstr "网络组件使用\"典型设置\"。"
+
+# 685f000b0e2c437889a925b63be7891b
+#: ../../templates.rst:839
+msgid "Select the “WORKGROUP” option."
+msgstr "选择“WORKGROUP”选项。"
+
+# d5daab57605f4acda1d1527df570facc
+#: ../../templates.rst:843
+msgid "Leave Telephony options at default."
+msgstr "电话服务使用默认。"
+
+# 307c10038df64e339b109d2ef3c1edb8
+#: ../../templates.rst:847
+msgid "Select appropriate Regional Settings."
+msgstr "选择合适的区域设置。"
+
+# 327e06e3a211403cbf0495a02e7ddb7d
+#: ../../templates.rst:851
+msgid "Select appropriate language settings."
+msgstr "选择合适的语言选项。"
+
+# 294dd6e2af71471691c00afa513dafc3
+#: ../../templates.rst:855
+msgid "Do not install printers."
+msgstr "不要安装打印机。"
+
+# 43b1e07d7cc44c428ba0bc1102ca572e
+#: ../../templates.rst:859
+msgid "Do not specify “Run Once commands”."
+msgstr "不要指定\"运行一次\"。"
+
+# ab30e54717e5455988d343bfe649d8f8
+#: ../../templates.rst:863
+msgid "You need not specify an identification string."
+msgstr "你不必指定标示字符串。"
+
+# 107e4b3c6eba43cbbf9a800861554df3
+#: ../../templates.rst:867
+msgid "Save the Answer File as c:\\\\sysprep\\\\sysprep.inf."
+msgstr "将应答文件保存到c:\\\\sysprep\\\\sysprep.inf。"
+
+# 5545498adcc84a05ad9f5e12352d008f
+#: ../../templates.rst:871
+msgid "Run the following command to sysprep the image:"
+msgstr "运行以下命令行来sysprep镜像:"
+
+# 3b883691a9b0417b9a68bce12f0f527c
+#: ../../templates.rst:877
+msgid "After this step the machine will automatically shut down"
+msgstr "在这个步骤之后,虚拟机会自动关机。"
+
+# 4775b7c9a84248d1805900870fc3d92b
+#: ../../templates.rst:880
+msgid "Importing Amazon Machine Images"
+msgstr "导入Amazon Machine Images"
+
+# 2eefa378d4324b908272db125ba9c907
+#: ../../templates.rst:882
+msgid ""
+"The following procedures describe how to import an Amazon Machine Image "
+"(AMI) into CloudStack when using the XenServer hypervisor."
+msgstr "以下过程描述了当使用XenServer hypervisor时,如何导入一个AMI到Cloudstack中。"
+
+# cdd42569882b4c7bbd9ed8019c883085
+#: ../../templates.rst:885
+msgid ""
+"Assume you have an AMI file and this file is called CentOS\\_6.2\\_x64. "
+"Assume further that you are working on a CentOS host. If the AMI is a Fedora"
+" image, you need to be working on a Fedora host initially."
+msgstr "假定你有一个叫做CentOS\\_6.2|_x64的AMI文件。假定未来你将工作在CentOS主机上。如果AMI是一个Fedora镜像,你需要将它立即安装到Fedora主机上。"
+
+# 086bce4bc9064c9ea174a48be1aa2c74
+#: ../../templates.rst:889
+msgid ""
+"You need to have a XenServer host with a file-based storage repository "
+"(either a local ext3 SR or an NFS SR) to convert to a VHD once the image "
+"file has been customized on the Centos/Fedora host."
+msgstr "一旦镜像文件在CentOS/Fedora主机上自定义完毕,你必须有一台使用文件存储库(本地ext3 SR或者NFS SP)的XenServer主机将其转换VHD。"
+
+# f965846d43ff4abfb3740625b21cae0a
+#: ../../templates.rst:894
+msgid ""
+"When copying and pasting a command, be sure the command has pasted as a "
+"single line before executing. Some document viewers may introduce unwanted "
+"line breaks in copied text."
+msgstr "当你在拷贝和粘贴这个命令时,请确保所有的命令都在同一行里。有的文档拷贝工具会将这个命令分割为多行。"
+
+# f6ed8764a50b4608af894c68403d242d
+#: ../../templates.rst:896
+msgid "To import an AMI:"
+msgstr "导入一个AMI:"
+
+# 88712070dbe94517bb3d3d0647f5441e
+#: ../../templates.rst:900
+msgid "Set up loopback on image file:"
+msgstr "建立在镜像文件上的回滚"
+
+# 731b13cca9b34c8fb6d76b76714b91a7
+#: ../../templates.rst:909
+msgid ""
+"Install the kernel-xen package into the image. This downloads the PV kernel "
+"and ramdisk to the image."
+msgstr "安装kernel-xen包到镜像文件中。下载PV内核和ramdisk到镜像中。"
+
+# d80578e92f4f4dbeb7b4cb4520ef13fd
+#: ../../templates.rst:918
+msgid "Create a grub entry in /boot/grub/grub.conf."
+msgstr "在 /boot/grub/grub.conf中创建一个引导。"
+
+# 40de498250654d60970ab0fde749f33d
+#: ../../templates.rst:928
+msgid ""
+"Determine the name of the PV kernel that has been installed into the image."
+msgstr "终止已经安装到镜像文件中的PV内核名称"
+
+# 12376387693e4b6c8d20181fcfefddf8
+#: ../../templates.rst:941
+msgid ""
+"Xen kernels/ramdisk always end with \"xen\". For the kernel version you "
+"choose, there has to be an entry for that version under lib/modules, there "
+"has to be an initrd and vmlinuz corresponding to that. Above, the only "
+"kernel that satisfies this condition is 2.6.18-164.15.1.el5xen."
+msgstr "Xen的kernels/ramdisk通常以“xen\"结尾。在lib/modules中选择相应的内核版本,intrd和vmlinuz将作出相应的反应.综上,唯一要求的条件是版本为2.6.18-164.15.1.el5xen。"
+
+# 3a62a427fb3c49b7b2b502d29b65a104
+#: ../../templates.rst:949
+msgid ""
+"Based on your findings, create an entry in the grub.conf file. Below is an "
+"example entry."
+msgstr "根据你要找的内容,在grub.conf文件中创建一个入口。以下为入口例子。"
+
+# 1f77fea0644a4939a5aa5518e600b8f0
+#: ../../templates.rst:964
+msgid ""
+"Edit etc/fstab, changing “sda1” to “xvda” and changing “sdb” to “xvdb”."
+msgstr "编辑 etc/fstab,将”sda1“改为”xvda\"并将“sdb\"改为”xbdb\"."
+
+# 6dbb820000b64e9fb6810b145ca28d42
+#: ../../templates.rst:978
+msgid ""
+"Enable login via the console. The default console device in a XenServer "
+"system is xvc0. Ensure that etc/inittab and etc/securetty have the following"
+" lines respectively:"
+msgstr "通过终端开启登陆。在默认终端设备XenServer系统上的是xvc0.确定在etc/inittab和etc/securetty中有以下各自的行:"
+
+# d845e8d11c9d4fe38746eb6b52797f86
+#: ../../templates.rst:991
+msgid ""
+"Ensure the ramdisk supports PV disk and PV network. Customize this for the "
+"kernel version you have determined above."
+msgstr "确保虚拟盘支持PV磁盘和PV网络。为你之前选择好的kernel版本自定义这些。"
+
+# 4893ef89071946749654fbb656b0e336
+#: ../../templates.rst:1003
+msgid "Change the password."
+msgstr "修改密码"
+
+# 5909d8aaa9b341d1b5d2f6b578e69426
+#: ../../templates.rst:1015
+msgid "Exit out of chroot."
+msgstr "退出chroot"
+
+# e19dfedb8f7a41dd8565196723f12adc
+#: ../../templates.rst:1023
+msgid ""
+"Check `etc/ssh/sshd_config` for lines allowing ssh login using a password."
+msgstr "检查 `etc/ssh/sshd_config`中关于允许在ssh登录时使用密码的相关行。"
+
+# 2c14e5b85e714ea5b0d15324faaf9dc8
+#: ../../templates.rst:1034
+msgid ""
+"If you need the template to be enabled to reset passwords from the "
+"CloudStack UI or API, install the password change script into the image at "
+"this point. See :ref:`adding-password-management-to-templates`."
+msgstr "如果你需要通过CloudStack· UI或API启用重置模板的密码功能,在镜像中安装密码更改脚本。相关内容请参考:ref:`adding-password-management-to-templates`。"
+
+# e3ae811674584093b712c1621429a742
+#: ../../templates.rst:1040
+msgid "Unmount and delete loopback mount."
+msgstr "卸载或删除loopback挂载。"
+
+# ef597f13741c4cacb5592cc16ddea1c6
+#: ../../templates.rst:1049
+msgid ""
+"Copy the image file to your XenServer host's file-based storage repository. "
+"In the example below, the Xenserver is \"xenhost\". This XenServer has an "
+"NFS repository whose uuid is a9c5b8c8-536b-a193-a6dc-51af3e5ff799."
+msgstr "复制镜像文件到XenServer主机的文件存储库。在下面的例子中,XenServer是\"xenhost\"。这个XenServer有一个UUID为a9c5b8c8-536b-a193-a6dc-51af3e5ff799的NFS库。"
+
+# bb52019afeee4122a6ea0771f8b19f31
+#: ../../templates.rst:1060
+msgid "Log in to the Xenserver and create a VDI the same size as the image."
+msgstr "登录到XenServer然后创建一个与镜像同样大小的VDI。"
+
+# 86293b52fbc14f619d01d676808e0013
+#: ../../templates.rst:1072
+msgid "Import the image file into the VDI. This may take 10–20 minutes."
+msgstr "将镜像导入到VDI中。这可能会花费10-20分钟。"
+
+# f04c66a89a2c438996c653df62753586
+#: ../../templates.rst:1080
+msgid ""
+"Locate a the VHD file. This is the file with the VDI’s UUID as its name. "
+"Compress it and upload it to your web server."
+msgstr "找到这个VHD文件。它的名字是以VDI的UUID命名的。压缩并上床至你的web服务器。"
+
+# 2c6186dad1e149ffb6b4c6088919cf7b
+#: ../../templates.rst:1089
+msgid "Converting a Hyper-V VM to a Template"
+msgstr "将Hyper-V的VM转换为模板"
+
+# 93e316bb224044d49835989bb24f4307
+#: ../../templates.rst:1091
+msgid ""
+"To convert a Hyper-V VM to a XenServer-compatible CloudStack template, you "
+"will need a standalone XenServer host with an attached NFS VHD SR. Use "
+"whatever XenServer version you are using with CloudStack, but use XenCenter "
+"5.6 FP1 or SP2 (it is backwards compatible to 5.6). Additionally, it may "
+"help to have an attached NFS ISO SR."
+msgstr "要转换Hyper-V的VM到兼容XenServer的CloudStack模板,你需要一个独立的添加了NFS VHD SR的XenServer主机。无论使用CloudStack管理哪个版本XenServer,但必须是XenCenter 5.6 FP1或SP2(它向下兼容5.6)。另外,添加了NFS ISO SR是有帮助的。"
+
+# 5f6b98e6e49d496aa214066dc19570f8
+#: ../../templates.rst:1097
+msgid ""
+"For Linux VMs, you may need to do some preparation in Hyper-V before trying "
+"to get the VM to work in XenServer. Clone the VM and work on the clone if "
+"you still want to use the VM in Hyper-V. Uninstall Hyper-V Integration "
+"Components and check for any references to device names in /etc/fstab:"
+msgstr "对于Linux VMs,在尝试让VM在XenServer中工作之前你可能必须在Hyper-V做一些准备工作。如果你仍然想要在Hyper-V中使用这个VM的话,克隆这个VM然后在克隆的虚机上操作。卸载Hyper-V集成组件然后检查任何/etc/fstab中涉及的相关设备名称:"
+
+# 6ac2232482394839a03c271bbca3c8f9
+#: ../../templates.rst:1105
+msgid ""
+"From the linux\\_ic/drivers/dist directory, run make uninstall (where "
+"\"linux\\_ic\" is the path to the copied Hyper-V Integration Components "
+"files)."
+msgstr "从 linux\\_ic/drivers/dist 目录中,运行make uninstall(\"linux\\_ic\" 是复制的Hyper-V集成组件的路径)。"
+
+# 46e3b7b8475e4952bb6daf4722722e41
+#: ../../templates.rst:1111
+msgid ""
+"Restore the original initrd from backup in /boot/ (the backup is named "
+"\\*.backup0)."
+msgstr "从备份/boot/ 恢复原始的文件系统(备份名称为 \\*.backup0)。"
+
+# 111dd445f55a471a98190fb0c78e40b6
+#: ../../templates.rst:1116
+msgid "Remove the \"hdX=noprobe\" entries from /boot/grub/menu.lst."
+msgstr "从 /boot/grub/menu.lst移除 \"hdX=noprobe\" 。"
+
+# be3986f7247d4a5faed5369107bfe3e9
+#: ../../templates.rst:1120
+msgid ""
+"Check /etc/fstab for any partitions mounted by device name. Change those "
+"entries (if any) to mount by LABEL or UUID. You can get that information "
+"with the blkid command."
+msgstr "通过名称从 /etc/fstab中检查任何挂载的分区。将这些条目(如果有)改成使用LABEL或者UUID挂载。你能通过 blkid命令获得这些信息。"
+
+# f9e63db044dc4f719af8694d4b426090
+#: ../../templates.rst:1124
+msgid ""
+"The next step is make sure the VM is not running in Hyper-V, then get the "
+"VHD into XenServer. There are two options for doing this."
+msgstr "下一步请确保Hyper-V中的这个VM没有运行,然后把VHD送至XenServer。有两个选择。"
+
+# a3bfb3c562494523b1f9e34e1f784513
+#: ../../templates.rst:1127
+msgid "Option one:"
+msgstr "选项一:"
+
+# c7c46c25ea2c446296f3c469a1ca7fbc
+#: ../../templates.rst:1131
+msgid ""
+"Import the VHD using XenCenter. In XenCenter, go to Tools>Virtual Appliance "
+"Tools>Disk Image Import."
+msgstr "使用XenCenter导入VHD。在XenCenter中,找到Tools>Virtual Appliance Tools>Disk Image Import。"
+
+# 02a3b8607a71477686060abece70fd5c
+# ac971f1553804894ab99e8034171a895
+#: ../../templates.rst:1136 ../../templates.rst:1156
+msgid "Choose the VHD, then click Next."
+msgstr "选择VHD,然后点击下一步。"
+
+# a9bab1d1a45a4cafb6e8c6249a5876a9
+#: ../../templates.rst:1140
+msgid ""
+"Name the VM, choose the NFS VHD SR under Storage, enable \"Run Operating "
+"System Fixups\" and choose the NFS ISO SR."
+msgstr "给VM起个名字,在Storage下选择 NFS VHD SR,启用\"Run Operating System Fixups\" 然后选择NFS ISO SR。"
+
+# 6cbb139632604de5ab457b8a26f09644
+#: ../../templates.rst:1145
+msgid "Click Next, then Finish. A VM should be created."
+msgstr "点击下一步 完成。完成虚拟机创建。"
+
+# b64f3cb8f2b94ad4b2420392608be3b9
+#: ../../templates.rst:1147
+msgid "Option two:"
+msgstr "选项二:"
+
+# 8fa8282a43bf473ca4d7c4c12a507faf
+#: ../../templates.rst:1151
+msgid ""
+"Run XenConvert, under From choose VHD, under To choose XenServer. Click "
+"Next."
+msgstr "运行 XenConvert ,选择 VHD,选择 XenServer,点击下一步。"
+
+# 637e824a79ea42cfad3ee75f6b72178c
+#: ../../templates.rst:1160
+msgid "Input the XenServer host info, then click Next."
+msgstr "输入XenServer主机信息,点击下一步。"
+
+# 31ec8cb452ee4cd3a4e1fbd1a5591cce
+#: ../../templates.rst:1164
+msgid "Name the VM, then click Next, then Convert. A VM should be created."
+msgstr "输入VM名称,点击“下一步”,点击“转换”。VM应该就创建了。"
+
+# 496176bfda5f4ca090835a247ab83525
+#: ../../templates.rst:1166
+msgid ""
+"Once you have a VM created from the Hyper-V VHD, prepare it using the "
+"following steps:"
+msgstr "一旦你完成从hyper-v VHD到虚拟机的创建,准备使用以下步骤:"
+
+# 4e71cb70625645019467653e605e2c10
+#: ../../templates.rst:1171
+msgid "Boot the VM, uninstall Hyper-V Integration Services, and reboot."
+msgstr "启动虚拟机,卸载Hyper-V集成服务,并重新启动。"
+
+# 73af4ce888ac410fb724f43a4f97b6e1
+#: ../../templates.rst:1175
+msgid "Install XenServer Tools, then reboot."
+msgstr "安装XenServer Tools,然后重新启动。"
+
+# c3d2431ce6f140379ffc743673a49262
+#: ../../templates.rst:1179
+msgid ""
+"Prepare the VM as desired. For example, run sysprep on Windows VMs. See "
+"`“Creating a Windows Template” <#creating-a-windows-template>`_."
+msgstr "按需要准备VM。例如在Windows VM上执行sysprep。请参阅 `“创建Windows模板” <#creating-a-windows-template>`_。"
+
+# 45c26189e85d4114914986ecd8612d99
+#: ../../templates.rst:1183
+msgid ""
+"Either option above will create a VM in HVM mode. This is fine for Windows "
+"VMs, but Linux VMs may not perform optimally. Converting a Linux VM to PV "
+"mode will require additional steps and will vary by distribution."
+msgstr "以上任一选项将在HVM模式下创建一个VM。对于Windows虚拟机来说这是很好的,但Linux的虚拟机可能无法达到最佳性能。要转换Linux虚拟机到PV模式,对于不同的发行版本将需要额外的步骤。"
+
+# e991522b48624c3880f9b55c06c5a0e0
+#: ../../templates.rst:1190
+msgid ""
+"Shut down the VM and copy the VHD from the NFS storage to a web server; for "
+"example, mount the NFS share on the web server and copy it, or from the "
+"XenServer host use sftp or scp to upload it to the web server."
+msgstr "关闭虚拟机,从NFS存储拷贝VHD到一个web服务器;比如,在web服务器上挂载NFS共享然后拷贝它,或者是在XenServer主机上用sftp或scp将VHD上传到web服务器。"
+
+# cb7bc05407234c42ae3603ec5da5f4e4
+#: ../../templates.rst:1197
+msgid "In CloudStack, create a new template using the following values:"
+msgstr "在 CloudStack中,使用以下值创建一个新的模板:"
+
+# 9604d23f8f734af59c09a539f13ca526
+#: ../../templates.rst:1201
+msgid "URL. Give the URL for the VHD"
+msgstr "URL。给VHD指定URL。"
+
+# d1f70e73d3234873b57cb7171f26765b
+#: ../../templates.rst:1205
+msgid ""
+"OS Type. Use the appropriate OS. For PV mode on CentOS, choose Other PV "
+"(32-bit) or Other PV (64-bit). This choice is available only for XenServer."
+msgstr "OS类型。使用适当的OS。对于CentOS的PV模式来说,选择其他PV (32位)或其他PV(64位)。这个选项仅适用于XenServer。"
+
+# 0ac91486a990460eb7221cf9d1fafe83
+#: ../../templates.rst:1211
+msgid "Hypervisor. XenServer"
+msgstr "Hypervisor。XenServer"
+
+# 9d054209286d4d7c9c0610236b45cfa7
+#: ../../templates.rst:1215
+msgid "Format. VHD"
+msgstr "格式。VHD"
+
+# 5bcee6035ba44c2d8d9cb1dd8cf29469
+#: ../../templates.rst:1217
+msgid "The template will be created, and you can create instances from it."
+msgstr "模板就创建好了,然后你可以通过它创建实例。"
+
+# dd759eeb19364467981383f61c60927b
+#: ../../templates.rst:1222
+msgid "Adding Password Management to Your Templates"
+msgstr "给你的模板添加密码管理"
+
+# fb423b84f13b4398afd1b6531cbaf84e
+#: ../../templates.rst:1224
+msgid ""
+"CloudStack provides an optional password reset feature that allows users to "
+"set a temporary admin or root password as well as reset the existing admin "
+"or root password from the CloudStack UI."
+msgstr "CloudStack提供了可选的密码重置功能,该功能允许用户在CloudStack UI上设置临时的admin或root密码,也可以重置现有的admin或root密码。"
+
+# df4d415dd2564e7ab3b4de2a880058fa
+#: ../../templates.rst:1228
+msgid ""
+"To enable the Reset Password feature, you will need to download an "
+"additional script to patch your template. When you later upload the template"
+" into CloudStack, you can specify whether reset admin/root password feature "
+"should be enabled for this template."
+msgstr "为启用密码重置功能,您需要下载额外的脚本到模版上。当您之后在CloudStack中添加模版时,您可以指定该模版是否启用重置admin或root密码的功能。"
+
+# 78843c1122fa4c54a3929a71cdc9802a
+#: ../../templates.rst:1233
+msgid ""
+"The password management feature works always resets the account password on "
+"instance boot. The script does an HTTP call to the virtual router to "
+"retrieve the account password that should be set. As long as the virtual "
+"router is accessible the guest will have access to the account password that"
+" should be used. When the user requests a password reset the management "
+"server generates and sends a new password to the virtual router for the "
+"account. Thus an instance reboot is necessary to effect any password "
+"changes."
+msgstr "密码管理功能总是在虚机启动时重置账号的密码。该脚本通过对虚拟路由器的HTTP调用,获取需要重置的账号密码。启动时,只要虚拟路由器可以访问,虚机就可以获得应该设置的账号密码。当用户请求密码重置时,管理服务器会生成新密码,并发送到虚拟路由器。因而,虚机需要重启新密码才能生效。"
+
+# 7e61c96f8bbb4f4ca576ab92fe9ce78c
+#: ../../templates.rst:1242
+msgid ""
+"If the script is unable to contact the virtual router during instance boot "
+"it will not set the password but boot will continue normally."
+msgstr "在虚机重启时,如果脚本不能连接到虚拟路由器,则密码不会被重置,但启动过程还会继续正常执行。"
+
+# 49eed667df7349ffbb96bf4c5855b760
+#: ../../templates.rst:1246
+msgid "Linux OS Installation"
+msgstr "Linux系统安装"
+
+# cdb19794d6b74c899b8104d2993f5d8a
+#: ../../templates.rst:1248
+msgid "Use the following steps to begin the Linux OS installation:"
+msgstr "使用一下步骤开始Linux系统的安装:"
+
+# 103d0d138ee144c78942523b42447afd
+#: ../../templates.rst:1252
+msgid "Download the script file cloud-set-guest-password:"
+msgstr "下载cloud-set-guest-password脚本文件:"
+
+# d55938ee41df43778f8a15a14f3bea66
+#: ../../templates.rst:1256
+msgid ""
+"`http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in "
+"<http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-"
+"password.in>`_"
+msgstr "`http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_"
+
+# 69a9531c06f3411aab079ec846b69481
+#: ../../templates.rst:1260
+msgid "Copy this file to /etc/init.d."
+msgstr "拷贝本文件到 /etc/init.d 。"
+
+# 386ec6429c6d4721a35bf98174797cba
+#: ../../templates.rst:1262
+msgid "On some Linux distributions, copy the file to ``/etc/rc.d/init.d``."
+msgstr "在某些linux发行版拷贝此文件到 ``/etc/rc.d/init.d``。"
+
+# 8a851834aab54db0bd4728de50b5ce79
+#: ../../templates.rst:1266
+msgid "Run the following command to make the script executable:"
+msgstr "执行以下命令使脚本可执行:"
+
+# a32adaaea0b346c9a57ebee47ad88300
+#: ../../templates.rst:1274
+msgid ""
+"Depending on the Linux distribution, continue with the appropriate step."
+msgstr "根据不同的Linux发行版,选择适当的步骤继续。"
+
+# 4a6cab3c328841e6943b0113ca737c5b
+#: ../../templates.rst:1277
+msgid "On Fedora, CentOS/RHEL, and Debian, run:"
+msgstr "在Fedora,CentOS/RHEL和Debian上运行:"
+
+# 1d4622c6039c4d018da6f87125f5d8f5
+#: ../../templates.rst:1284
+msgid "Windows OS Installation"
+msgstr "Windows OS 安装"
+
+# ceaf3ec621d44c85ad793bdc04cb5ea8
+#: ../../templates.rst:1286
+msgid ""
+"Download the installer, CloudInstanceManager.msi, from the `Download page "
+"<http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download>`_"
+" and run the installer in the newly created Windows VM."
+msgstr "从`下载页<http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download>`_ 下载安装程序CloudInstanceManager.msi,并在新创建的Windows 虚拟机中运行安装程序。"
+
+# 26d4aac3e7914c3eb9e017404da446e7
+#: ../../templates.rst:1291
+msgid "Deleting Templates"
+msgstr "删除模板"
+
+# 254a98cbb5b9413287be33a6278244f4
+#: ../../templates.rst:1293
+msgid ""
+"Templates may be deleted. In general, when a template spans multiple Zones, "
+"only the copy that is selected for deletion will be deleted; the same "
+"template in other Zones will not be deleted. The provided CentOS template is"
+" an exception to this. If the provided CentOS template is deleted, it will "
+"be deleted from all Zones."
+msgstr "模板可以被删除。在一般情况下,当一个模板跨越多个区域,只有被选中的副本才会被删除,在其他区域相同的模板将不会被删除。CentOS的模板是一个例外。如果所提供的CentOS的模板被删除,它从所有区域都将被删除。"
+
+# dd775f9e560549d88e1e2f6582bc17b8
+#: ../../templates.rst:1299
+msgid ""
+"When templates are deleted, the VMs instantiated from them will continue to "
+"run. However, new VMs cannot be created based on the deleted template."
+msgstr "当删除模板时,从它们中产生的虚拟机实例将继续运行。然而,新的虚拟机不能在被删除模板的基础上创建。"


[34/40] git commit: CLOUDSTACK-5879: added encrypted values

Posted by ra...@apache.org.
CLOUDSTACK-5879: added encrypted values

Signed-off-by: Pierre-Luc Dion <pd...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/0c75dcc0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/0c75dcc0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/0c75dcc0

Branch: refs/heads/4.4
Commit: 0c75dcc044873f4c1fee604670616b82d7aff001
Parents: e0bbecb
Author: Erik Weber <te...@gmail.com>
Authored: Tue Aug 19 20:32:11 2014 +0200
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Aug 19 20:20:57 2014 -0400

----------------------------------------------------------------------
 source/events.rst | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/0c75dcc0/source/events.rst
----------------------------------------------------------------------
diff --git a/source/events.rst b/source/events.rst
index d500a5c..273435e 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -141,6 +141,59 @@ changes can control the behaviour.
 
       The ``eventNotificationBus`` bean represents the
       ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.
+      
+      If you want to use encrypted values for the username and password, you have to include a bean to pass those
+      as variables from a credentials file.
+      
+      A sample is given below
+      
+      .. code:: bash
+      
+         <beans xmlns="http://www.springframework.org/schema/beans"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:context="http://www.springframework.org/schema/context"
+                xmlns:aop="http://www.springframework.org/schema/aop"
+                xsi:schemaLocation="http://www.springframework.org/schema/beans
+                 http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+                 http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+                 http://www.springframework.org/schema/context
+                 http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+         >
+
+            <bean id="eventNotificationBus" class="org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus">
+               <property name="name" value="eventNotificationBus"/>
+               <property name="server" value="127.0.0.1"/>
+               <property name="port" value="5672"/>
+               <property name="username" value="${username}"/>
+               <property name="password" value="${password}"/>
+               <property name="exchange" value="cloudstack-events"/>
+            </bean>
+
+            <bean id="environmentVariablesConfiguration" class="org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig">
+               <property name="algorithm" value="PBEWithMD5AndDES" />
+               <property name="passwordEnvName" value="APP_ENCRYPTION_PASSWORD" />
+            </bean>
+
+            <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
+               <property name="config" ref="environmentVariablesConfiguration" />
+            </bean>
+
+            <bean id="propertyConfigurer" class="org.jasypt.spring3.properties.EncryptablePropertyPlaceholderConfigurer">
+               <constructor-arg ref="configurationEncryptor" />
+               <property name="location" value="classpath:/cred.properties" />
+            </bean>
+         </beans>
+
+
+      Create a new file in the same folder called ``cred.properties`` and the specify the values for username and password as jascrypt encrypted strings
+
+      Sample, with ``guest`` as values for both fields:
+         
+      .. code:: bash
+         
+         username=nh2XrM7jWHMG4VQK18iiBQ==
+         password=nh2XrM7jWHMG4VQK18iiBQ==
+         
 
 #. Restart the Management Server.
 


[03/40] git commit: Fixing typo in creating affinity group

Posted by ra...@apache.org.
Fixing typo in creating affinity group


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/5a4a44d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/5a4a44d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/5a4a44d2

Branch: refs/heads/4.4
Commit: 5a4a44d23edd5b55768c0e4836a2dca0b8461b99
Parents: a49d204
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Fri May 16 22:18:59 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Fri May 16 22:18:59 2014 +0200

----------------------------------------------------------------------
 source/virtual_machines.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5a4a44d2/source/virtual_machines.rst
----------------------------------------------------------------------
diff --git a/source/virtual_machines.rst b/source/virtual_machines.rst
index 568735a..2c9e8a3 100644
--- a/source/virtual_machines.rst
+++ b/source/virtual_machines.rst
@@ -400,7 +400,7 @@ To add an affinity group:
 
       Type. The only supported type shipped with CloudStack is Host
       Anti-Affinity. This indicates that the VMs in this group should
-      avoid being placed on the same VM with each other. If you see
+      avoid being placed on the same host with each other. If you see
       other types in this list, it means that your installation of
       CloudStack has been extended with customized affinity group
       plugins.


[24/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/hosts.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/hosts.po b/source/locale/zh_CN/LC_MESSAGES/hosts.po
new file mode 100644
index 0000000..4d900c2
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/hosts.po
@@ -0,0 +1,1059 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# renoshen <sh...@sinosig.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-10 06:42+0000\n"
+"Last-Translator: renoshen <sh...@sinosig.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 592d97db5d074967b8037886828bbbf7
+#: ../../hosts.rst:18
+msgid "Working with Hosts"
+msgstr "使用主机"
+
+# eb6157eff5a24266a1934dce1cc5c38e
+#: ../../hosts.rst:21
+msgid "Adding Hosts"
+msgstr "添加主机"
+
+# 8278623233e349e2bbe063bea7e23268
+#: ../../hosts.rst:23
+msgid ""
+"Additional hosts can be added at any time to provide more capacity for guest"
+" VMs. For requirements and instructions, see `“Adding a Host” "
+"<http://docs.cloudstack.apache.org/projects/cloudstack-"
+"installation/en/latest/configuration.html#adding-a-host>`_."
+msgstr "添加主机能为来宾VMs提供更多的性能。更多需求与说明请参阅 `“添加主机” <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/configuration.html#adding-a-host>`_。"
+
+# d13936e89f4e4d9ea480d52a5c693cab
+#: ../../hosts.rst:28
+msgid "Scheduled Maintenance and Maintenance Mode for Hosts"
+msgstr "主机的维护计划与维护模式"
+
+# c80faa4e959d4bf6a547b8898e582f71
+#: ../../hosts.rst:30
+msgid ""
+"You can place a host into maintenance mode. When maintenance mode is "
+"activated, the host becomes unavailable to receive new guest VMs, and the "
+"guest VMs already running on the host are seamlessly migrated to another "
+"host not in maintenance mode. This migration uses live migration technology "
+"and does not interrupt the execution of the guest."
+msgstr "你可以使一台主机进入维护模式。当激活维护模式时,这台主机将不会接纳新的来宾VMs,同时上面的VMs会无缝地迁移到其他非维护模式的主机上。这个迁移使用在线迁移技术并且不会中断用户的操作。"
+
+# 050155d6fe2d4fe9bfb03ae737991f51
+#: ../../hosts.rst:37
+msgid "vCenter and Maintenance Mode"
+msgstr "vCenter与维护模式"
+
+# 6e6dd514ac534a609dbba7282dd7d14e
+#: ../../hosts.rst:39
+msgid ""
+"To enter maintenance mode on a vCenter host, both vCenter and CloudStack "
+"must be used in concert. CloudStack and vCenter have separate maintenance "
+"modes that work closely together."
+msgstr "要使vCenter主机进入维护模式,vCenter和CloudStack上都必须进行此操作。CloudStack和vCenter有各自的维护模式,他们需要紧密合作。"
+
+# 1e1a327f506545d588b5c2dac6a6be66
+#: ../../hosts.rst:45
+msgid ""
+"Place the host into CloudStack's \"scheduled maintenance\" mode. This does "
+"not invoke the vCenter maintenance mode, but only causes VMs to be migrated "
+"off the host"
+msgstr "在CloudStack中,将主机进入\"维护计划\"模式。这个操作不会调用vCenter的维护模式,但是会将VMs迁离该主机。"
+
+# 10b6ab6a7f494f5e8df3db13ccfd3af8
+#: ../../hosts.rst:49
+msgid ""
+"When the CloudStack maintenance mode is requested, the host first moves into"
+" the Prepare for Maintenance state. In this state it cannot be the target of"
+" new guest VM starts. Then all VMs will be migrated off the server. Live "
+"migration will be used to move VMs off the host. This allows the guests to "
+"be migrated to other hosts with no disruption to the guests. After this "
+"migration is completed, the host will enter the Ready for Maintenance mode."
+msgstr "当CloudStack维护模式启用后,主机首先会进入准备维护状态。在这个阶段它不能运行新的来宾VMs。然后所有的VMs将会被迁离该主机。主机使用在线迁移来迁移VMs。这种方式能够使来宾VMs在迁移到其他主机的过程中不会中断用户的操作。"
+
+# 1628c924f80a4f4e9f5becf74ad3f0ee
+#: ../../hosts.rst:59
+msgid "Wait for the \"Ready for Maintenance\" indicator to appear in the UI."
+msgstr "等\"准备好维护\"指示灯出现在UI中。"
+
+# 4adef7c4df77454e8bd00237cd21e93c
+#: ../../hosts.rst:63
+msgid ""
+"Now use vCenter to perform whatever actions are necessary to maintain the "
+"host. During this time, the host cannot be the target of new VM allocations."
+msgstr "现在使用vCenter通过必要的步骤将主机进入维护模式。在此期间,主机不会运行新的VM。"
+
+# 7d67902696d54dba85c98361d7218cc4
+#: ../../hosts.rst:69
+msgid ""
+"When the maintenance tasks are complete, take the host out of maintenance "
+"mode as follows:"
+msgstr "当维护任务完成之后,按以下操作将主机退出维护模式:"
+
+# a3f38b02fdc24e5e9b3c51227bb08fd7
+#: ../../hosts.rst:74
+msgid "First use vCenter to exit the vCenter maintenance mode."
+msgstr "首先通过vCenter退出vCenter维护模式。"
+
+# d4f34ccb4d9b4a1bb09958fa5cf4de5e
+#: ../../hosts.rst:76
+msgid "This makes the host ready for CloudStack to reactivate it."
+msgstr "这么做是为了主机能够准备好以便CloudStack恢复它。"
+
+# fc22d153282549d19896184eb37b2090
+#: ../../hosts.rst:80
+msgid ""
+"Then use CloudStack's administrator UI to cancel the CloudStack maintenance "
+"mode"
+msgstr "然后通过CloudStack的管理员UI来取消CloudStack维护模式"
+
+# ce24285fd2e84a2d8e071223d9f7aa23
+#: ../../hosts.rst:83
+msgid ""
+"When the host comes back online, the VMs that were migrated off of it may be"
+" migrated back to it manually and new VMs can be added."
+msgstr "当主机恢复正常,被迁移走的VMs可能需要手工迁移回来并且也能在主机上添加新的VMs了。"
+
+# 1be609d82bc7437ab1f435f587dee885
+#: ../../hosts.rst:87
+msgid "XenServer and Maintenance Mode"
+msgstr "XenServer和维护模式"
+
+# 4801359e1b504036a523926cb3083fcf
+#: ../../hosts.rst:89
+msgid ""
+"For XenServer, you can take a server offline temporarily by using the "
+"Maintenance Mode feature in XenCenter. When you place a server into "
+"Maintenance Mode, all running VMs are automatically migrated from it to "
+"another host in the same pool. If the server is the pool master, a new "
+"master will also be selected for the pool. While a server is Maintenance "
+"Mode, you cannot create or start any VMs on it."
+msgstr "对于XenServer,你能够通过使用XenCenter中的维护模式功能将一台服务器临时的离线。当你使一台服务器进入维护模式,所有运行的VMs都会自动的迁移到同一个池中的其他主机上。如果此服务器是池master主机,那么此池会选举一个新的master主机。当一台服务器在维护模式下时,你不能在上面创建或启动任何VMs。"
+
+# 4a08aa70600a434a8cf5feeb551dd509
+#: ../../hosts.rst:96
+msgid "**To place a server in Maintenance Mode:**"
+msgstr "**使一台服务器进入维护模式:**"
+
+# f29fecea7fd547a4ac456396de215514
+# e5801557c9ac4721b34dd0390e57621f
+#: ../../hosts.rst:100 ../../hosts.rst:123
+msgid ""
+"In the Resources pane, select the server, then do one of the following:"
+msgstr "在资源面板,选择服务器,然后按下列步骤进行操作:"
+
+# 1c753ac55dcb457ca6a65e85506faea1
+#: ../../hosts.rst:105
+msgid "Right-click, then click Enter Maintenance Mode on the shortcut menu."
+msgstr "右击,然后在弹出的快捷菜单中点击进入维护模式。"
+
+# 457c53ac36f14ed5a1f83bc59f41713a
+#: ../../hosts.rst:110
+msgid "On the Server menu, click Enter Maintenance Mode."
+msgstr "在服务器菜单,点击进入维护模式。"
+
+# 8870ed34b2dc4486ac8f411a890d72c4
+#: ../../hosts.rst:114
+msgid "Click Enter Maintenance Mode."
+msgstr "点击进入维护模式。"
+
+# 2433c930578741a1909765bc2bade385
+#: ../../hosts.rst:116
+msgid ""
+"The server's status in the Resources pane shows when all running VMs have "
+"been successfully migrated off the server."
+msgstr "当所有运行当中的VMs成功的迁离该主机后,在资源面板中会显示服务器的状态。"
+
+# 42be08f037604e5a9f47001de252d369
+#: ../../hosts.rst:119
+msgid "**To take a server out of Maintenance Mode:**"
+msgstr "**使服务器退出维护模式:**"
+
+# f57ec4b8d883455d81686a1fd40f6160
+#: ../../hosts.rst:128
+msgid "Right-click, then click Exit Maintenance Mode on the shortcut menu."
+msgstr "右击,然后在弹出的快捷菜单中点击退出维护模式。"
+
+# 7d8e71c7ffbc4d71a75266dfba6b84df
+#: ../../hosts.rst:133
+msgid "On the Server menu, click Exit Maintenance Mode."
+msgstr "在服务器菜单,点击提出维护模式。"
+
+# 8d0f538994db4767b7f9417b1cb41871
+#: ../../hosts.rst:137
+msgid "Click Exit Maintenance Mode."
+msgstr "点击退出维护模式。"
+
+# bd837a82be2c48858847657c7b3cfdaa
+#: ../../hosts.rst:140
+msgid "Disabling and Enabling Zones, Pods, and Clusters"
+msgstr "禁用和启用Zones,Pods和Clusters"
+
+# 3aea5f5c94fc4404a3d7c5f194da767d
+#: ../../hosts.rst:142
+msgid ""
+"You can enable or disable a zone, pod, or cluster without permanently "
+"removing it from the cloud. This is useful for maintenance or when there are"
+" problems that make a portion of the cloud infrastructure unreliable. No new"
+" allocations will be made to a disabled zone, pod, or cluster until its "
+"state is returned to Enabled. When a zone, pod, or cluster is first added to"
+" the cloud, it is Disabled by default."
+msgstr "你可以启用或禁用一个zone,pod或者cluster而不用永久的从云中移除他们。这对于维护或者当云中一部分架构的可靠性有问题的时候很有用。禁用状态下的zone,pod或cluster不会接受新的分配,除非其状态变为启用。当一个zone,pod或cluster是初次添加到云中的,默认的情况下它是禁用的。"
+
+# a9c8925bb2d04ecc9962de6fd0fbc1fd
+#: ../../hosts.rst:149
+msgid "To disable and enable a zone, pod, or cluster:"
+msgstr "要禁用和启用一个zone,pod或者cluster:"
+
+# 32c0489f474c4fecb77b83336097e9db
+#: ../../hosts.rst:153
+msgid "Log in to the CloudStack UI as administrator"
+msgstr "使用管理员权限的账号登录到CloudStack"
+
+# 6b89d161130140ffbf2ccaee055008a3
+# 2f4cd598e62c47168a2ed22c6bec7674
+#: ../../hosts.rst:157 ../../hosts.rst:447
+msgid "In the left navigation bar, click Infrastructure."
+msgstr "在左侧导航栏中,点击基础架构"
+
+# 5ce0a640f1954756b46305873f389ad9
+#: ../../hosts.rst:161
+msgid "In Zones, click View More."
+msgstr "点击区域中的查看更多。"
+
+# 3d333ceeab284ce5ad02f60c1fa67471
+#: ../../hosts.rst:165
+msgid ""
+"If you are disabling or enabling a zone, find the name of the zone in the "
+"list, and click the Enable/Disable button. |enable-disable.png|"
+msgstr "如果你要禁用或启用一个zone,请在列表里找到zone的名称,然后点击启用/禁用按钮。|enable-disable.png|"
+
+# 0a4cfd78743b4e2c83066e46ce8464f8
+#: ../../hosts.rst:170
+msgid ""
+"If you are disabling or enabling a pod or cluster, click the name of the "
+"zone that contains the pod or cluster."
+msgstr "如果你要禁用或启用一个pod或者cluster,点击包含该pod或cluster的zone名称。"
+
+# 0dc7b10cd00b48c1a2c77859a0cd940a
+#: ../../hosts.rst:175
+msgid "Click the Compute tab."
+msgstr "点击计算这个标签。"
+
+# c7daddfdce6e4da6bb743f31b20c08df
+#: ../../hosts.rst:179
+msgid "In the Pods or Clusters node of the diagram, click View All."
+msgstr "在示意图中的Pods或者Clusters节点,点击查看所有。"
+
+# 35005e277f71455ca42dd6d65bf92a77
+#: ../../hosts.rst:183
+msgid "Click the pod or cluster name in the list."
+msgstr "点击列表中的pod或者cluster名称。"
+
+# e96437e7b142420f990a2c0717d1e472
+#: ../../hosts.rst:187
+msgid "Click the Enable/Disable button. |enable-disable.png|"
+msgstr "点击启用/禁用按钮。|enable-disable.png|"
+
+# 5ab36fe8716644fa8a74b1315198f7d3
+#: ../../hosts.rst:190
+msgid "Removing Hosts"
+msgstr "移除主机"
+
+# 2915247620714f17b21f9124f39d894e
+#: ../../hosts.rst:192
+msgid ""
+"Hosts can be removed from the cloud as needed. The procedure to remove a "
+"host depends on the hypervisor type."
+msgstr "主机在需要的时候可以被移除。这个过程取决于主机所使用的hypervisor类型。"
+
+# 04254d2838064c639d5331ae3ffc4753
+#: ../../hosts.rst:196
+msgid "Removing XenServer and KVM Hosts"
+msgstr "移除XenServer和KVM主机"
+
+# eccc01ddbac946f9800dccea47e31ba9
+#: ../../hosts.rst:198
+msgid ""
+"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:"
+msgstr "cluster中的主机只有进入维护模式才能被移除。这么做是为了确保其上所有的VMs被迁移至其他主机。要从云中移除一个主机:"
+
+# 82565e09d51041738069677fb128372d
+#: ../../hosts.rst:204
+msgid "Place the node in maintenance mode."
+msgstr "将主机进入维护模式。"
+
+# dd04ef23348a42fc815ff0a376123868
+#: ../../hosts.rst:206
+msgid ""
+"See `“Scheduled Maintenance and Maintenance Mode for Hosts” <#scheduled-"
+"maintenance-and-maintenance-mode-for-hosts>`_."
+msgstr "请参考`“主机的维护计划与维护模式” <#scheduled-maintenance-and-maintenance-mode-for-hosts>`_."
+
+# fed544dd8c474c2581684a87c9dae984
+#: ../../hosts.rst:211
+msgid "For KVM, stop the cloud-agent service."
+msgstr "对于KVM,停止cloud-agent服务。"
+
+# 1f7547325d9a4881a6768dd009061aae
+#: ../../hosts.rst:215
+msgid "Use the UI option to remove the node."
+msgstr "使用UI选项来移除主机。"
+
+# f00eeb5fdaae4a9cbd1e36d610e270ac
+#: ../../hosts.rst:217
+msgid ""
+"Then you may power down the Host, re-use its IP address, re-install it, etc"
+msgstr "然后你可以关掉主机,重用它的IP地址,重新安装系统,等等。"
+
+# ae67d2137019437192ee7fbe0d451012
+#: ../../hosts.rst:221
+msgid "Removing vSphere Hosts"
+msgstr "移除vSphere主机"
+
+# b5b44fe095f645ed89753427c54c129e
+#: ../../hosts.rst:223
+msgid ""
+"To remove this type of host, first place it in maintenance mode, as "
+"described in `“Scheduled Maintenance and Maintenance Mode for Hosts” "
+"<#scheduled-maintenance-and-maintenance-mode-for-hosts>`_. Then use "
+"CloudStack to remove the host. CloudStack will not direct commands to a host"
+" that has been removed using CloudStack. However, the host may still exist "
+"in the vCenter cluster."
+msgstr "要移除此类型的主机,首先按照 `“主机的维护计划与维护模式” <#scheduled-maintenance-and-maintenance-mode-for-hosts>`_中的描述将其进入维护模式。然后使用CloudStack来移除主机。使用CloudStack移除主机时,CloudStack不会直接操作主机。但是,主机可能仍然存留在vCenter群集中。"
+
+# 2634c1aab86c49d6847a1cb6b9ca885d
+#: ../../hosts.rst:231
+msgid "Re-Installing Hosts"
+msgstr "重新安装主机"
+
+# 4a42ccaecda646bca2ac6ac89016ca33
+#: ../../hosts.rst:233
+msgid ""
+"You can re-install a host after placing it in maintenance mode and then "
+"removing it. If a host is down and cannot be placed in maintenance mode, it "
+"should still be removed before the re-install."
+msgstr "你可以在将主机进入维护模式并移除它之后重新安装系统。如果主机是宕机状态而不能进入维护模式,在重装它之前仍然能被移除。"
+
+# 65deb360368a4ef6aeac7a84cfe5c1ab
+#: ../../hosts.rst:238
+msgid "Maintaining Hypervisors on Hosts"
+msgstr "在主机上维护Hypervisors"
+
+# b927785c512c4eb79d94c141907bf453
+#: ../../hosts.rst:240
+msgid ""
+"When running hypervisor software on hosts, be sure all the hotfixes provided"
+" by the hypervisor vendor are applied. Track the release of hypervisor "
+"patches through your hypervisor vendor’s support channel, and apply patches "
+"as soon as possible after they are released. CloudStack will not track or "
+"notify you of required hypervisor patches. It is essential that your hosts "
+"are completely up to date with the provided hypervisor patches. The "
+"hypervisor vendor is likely to refuse to support any system that is not up "
+"to date with patches."
+msgstr "当主机上运行了hypervisor软件,请确保安装了供应商提供的所有修补程序。请通过供应商跟踪虚拟化平台的补丁发布情况,一旦发布,请尽快打上补丁。CloudStack不会跟踪或通知您所需要的虚拟化平台补丁。您的主机及时打上最新虚拟化平台补丁是非常重要的。虚拟化平台厂商很可能会拒绝支持未打最新补丁的系统。"
+
+# 6e001d3995a4461a98eb2c84399f8040
+#: ../../hosts.rst:250
+msgid ""
+"The lack of up-do-date hotfixes can lead to data corruption and lost VMs."
+msgstr "没有最新的修补程序可能会导致数据出错或虚拟机丢失。"
+
+# 24e34948fedb4eebaaa0b332c6b3ea55
+#: ../../hosts.rst:252
+msgid ""
+"(XenServer) For more information, see `Highly Recommended Hotfixes for "
+"XenServer in the CloudStack Knowledge Base "
+"<http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2>`_."
+msgstr "(XenServer)更多信息,请参考`CloudStack知识库中高度推荐的XenServer修补程序 <http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2>`_."
+
+# e291026e0bcb4fc19c5f5ec67fb27962
+#: ../../hosts.rst:255
+msgid "Changing Host Password"
+msgstr "更改主机密码"
+
+# a2ecdc3bf4ea4777a754dbf829ae95cf
+#: ../../hosts.rst:257
+msgid ""
+"The password for a XenServer Node, KVM Node, or vSphere Node may be changed "
+"in the database. Note that all Nodes in a Cluster must have the same "
+"password."
+msgstr "数据库中的XenServer主机,KVM主机或者vShpere主机密码可能会被变更。注意群集中的所有节点密码必须一致。"
+
+# 932a8d5023a3408bb325bb9976e78c9f
+#: ../../hosts.rst:261
+msgid "To change a Node's password:"
+msgstr "用户名和密码要更改一台主机的密码:"
+
+# 02c81a7d530c40cfa1a6acfbdd7d7db5
+#: ../../hosts.rst:265
+msgid "Identify all hosts in the cluster."
+msgstr "让群集中所有的主机状态保持一致。"
+
+# 5493aaf270c04495a774d707812f6b71
+#: ../../hosts.rst:269
+msgid ""
+"Change the password on all hosts in the cluster. Now the password for the "
+"host and the password known to CloudStack will not match. Operations on the "
+"cluster will fail until the two passwords match."
+msgstr "更改群集中所有主机的密码。此刻主机上的密码与CloudStack已知的密码不一致。两个密码不一致的话会导致群集上的操作失败。"
+
+# 5a61d0b0dad244d5943f0f9a28393c34
+#: ../../hosts.rst:275
+msgid ""
+"Get the list of host IDs for the host in the cluster where you are changing "
+"the password. You will need to access the database to determine these host "
+"IDs. For each hostname \"h\" (or vSphere cluster) that you are changing the "
+"password for, execute:"
+msgstr "获取群集中你更改了密码的主机ID列表。你必须访问数据库来获取这些ID。为每个你要更改密码的主机名(或者vSphere群集) \"h\",执行:"
+
+# 6581ccaebb344383ac2fc40ddd20df3a
+#: ../../hosts.rst:286
+msgid ""
+"This should return a single ID. Record the set of such IDs for these hosts."
+msgstr "这条命令将会返回一个ID。记录这些主机的ID。"
+
+# 081546910b424a93a45df2dee1cc04ca
+#: ../../hosts.rst:291
+msgid ""
+"Update the passwords for the host in the database. In this example, we "
+"change the passwords for hosts with IDs 5, 10, and 12 to \"password\"."
+msgstr "在数据库中为这些主机更新密码。在这个例子中,我们将主机ID为5,10和12的密码更改为\"password\"。"
+
+# 08354d3af75c417c8f3bb81415fabd09
+#: ../../hosts.rst:300
+msgid "Over-Provisioning and Service Offering Limits"
+msgstr "超配和服务方案限制"
+
+# a3bafa57323548dd9a6431f678eee017
+#: ../../hosts.rst:302
+msgid "(Supported for XenServer, KVM, and VMware)"
+msgstr "(支持XenServer、KVM和VMware)"
+
+# 0b69ea7e552248b1be401f196dfbb5d3
+#: ../../hosts.rst:304
+msgid ""
+"CPU and memory (RAM) over-provisioning factors can be set for each cluster "
+"to change the number of VMs that can run on each host in the cluster. This "
+"helps optimize the use of resources. By increasing the over-provisioning "
+"ratio, more resource capacity will be used. If the ratio is set to 1, no "
+"over-provisioning is done."
+msgstr "CPU和内存(RAM)超配直接影响每个群集中主机上可以运行的VMs数量。这样可以帮助优化资源的使用。依靠增加超配比率,能使使资源更充分的被利用。如果比率设为1,那么表示没有使用超配。"
+
+# e80bfc39f5a24aec99fa634cef445579
+#: ../../hosts.rst:310
+msgid ""
+"The administrator can also set global default over-provisioning ratios in "
+"the cpu.overprovisioning.factor and mem.overprovisioning.factor global "
+"configuration variables. The default value of these variables is 1: over-"
+"provisioning is turned off by default."
+msgstr "管理员也可以在cpu.overprovisioning.factor和mem.overprovisioning.factor这两个全局配置变量中设置全局默认超配比率。默认的值是1:默认情况下超配是关闭的。"
+
+# 22e46dfef84e43f088ea1c9ba56b012b
+#: ../../hosts.rst:315
+msgid ""
+"Over-provisioning ratios are dynamically substituted in CloudStack's "
+"capacity calculations. For example:"
+msgstr "超配比率是由CloudStack的容量计算器动态调整的。比如:"
+
+# aeb35836bd204db3878f47e711625690
+#: ../../hosts.rst:318
+msgid ""
+"Capacity = 2 GB Over-provisioning factor = 2 Capacity after over-"
+"provisioning = 4 GB"
+msgstr "容量=2GB 超配系数=2 超配后容量=4GB"
+
+# fb3b9278bc9d46c7a2c77e1f574c1151
+#: ../../hosts.rst:322
+msgid "With this configuration, suppose you deploy 3 VMs of 1 GB each:"
+msgstr "按照这个配置,假设你部署了3个VMs,每个VM 1GB:"
+
+# 9feabccde7a04110b98c75d65bdfb257
+#: ../../hosts.rst:324
+msgid "Used = 3 GB Free = 1 GB"
+msgstr "已使用=3GB  空闲=1GB"
+
+# 5fb90dd3e25942db89cf99b12028bc9f
+#: ../../hosts.rst:327
+msgid ""
+"The administrator can specify a memory over-provisioning ratio, and can "
+"specify both CPU and memory over-provisioning ratios on a per-cluster basis."
+msgstr "管理员可以在每个群集中指定一个内存超配比率,也可以同时指定CPU和内存超配比率。"
+
+# 116d6bee32f044cbbd7e4da1d643e5b7
+#: ../../hosts.rst:331
+msgid ""
+"In any given cloud, the optimum number of VMs for each host is affected by "
+"such things as the hypervisor, storage, and hardware configuration. These "
+"may be different for each cluster in the same cloud. A single global over-"
+"provisioning setting can not provide the best utilization for all the "
+"different clusters in the cloud. It has to be set for the lowest common "
+"denominator. The per-cluster setting provides a finer granularity for better"
+" utilization of resources, no matter where the CloudStack placement "
+"algorithm decides to place a VM."
+msgstr "在任何已有的云中,hypervisor、存储和硬件配置影响每个主机上VMs最佳数量。同一个云中的每个群集的这些配置可能都不同。单一的全局超配设置不能为云中所有的群集提供最佳效果。它只能作为一个基线。无论CloudStack使用哪种算法来放置一个VM,每个群集都提供了细颗粒度的设置以提供更好的资源效果。"
+
+# 52d81b5edf1e4675934e117fe3f7e39b
+#: ../../hosts.rst:340
+msgid ""
+"The overprovisioning settings can be used along with dedicated resources "
+"(assigning a specific cluster to an account) to effectively offer different "
+"levels of service to different accounts. For example, an account paying for "
+"a more expensive level of service could be assigned to a dedicated cluster "
+"with an over-provisioning ratio of 1, and a lower-paying account to a "
+"cluster with a ratio of 2."
+msgstr "超配设置和专用资源(对一个账号分配一个特定的群集)一起使用时能对不同用户有效的提供的不同服务级别。比如,一个账号购买了比较高级别的服务,那么分配给他一个超配比率为1的专用群集,购买低级别服务的账号分配一个比率为2的群集。"
+
+# c36163afa88548cfba86a4569c955329
+#: ../../hosts.rst:347
+msgid ""
+"When a new host is added to a cluster, CloudStack will assume the host has "
+"the capability to perform the CPU and RAM over-provisioning which is "
+"configured for that cluster. It is up to the administrator to be sure the "
+"host is actually suitable for the level of over-provisioning which has been "
+"set."
+msgstr "当一个新主机被添加到群集中,CloudStack假设配置了超配的群集中的主机能够提供CPU和RAM的超配能力。这个要靠管理员来决定主机是否真的能够提供设置的超配级别。"
+
+# edc95af891bf48bf9348b06cd982309c
+#: ../../hosts.rst:354
+msgid "Limitations on Over-Provisioning in XenServer and KVM"
+msgstr "XenServer和KVM中超配的局限性"
+
+# cc00f5f645f64e0697ca6ebdd96d0def
+# fa75f18b499847fd8e2399cb4259df55
+#: ../../hosts.rst:358 ../../hosts.rst:465
+msgid ""
+"In XenServer, due to a constraint of this hypervisor, you can not use an "
+"over-provisioning factor greater than 4."
+msgstr "在XenServer中,由于这个hypervisor的限制,超配系数不能超过4。"
+
+# 0a8e4b3712eb41eb98132d75c64a88a7
+#: ../../hosts.rst:363
+msgid ""
+"The KVM hypervisor can not manage memory allocation to VMs dynamically. "
+"CloudStack sets the minimum and maximum amount of memory that a VM can use. "
+"The hypervisor adjusts the memory within the set limits based on the memory "
+"contention."
+msgstr "KVM hypervisor不能动态的管理分配给VMs的内存。CloudStack设置VM能够使用的内存最小和最大量。Hypervisor基于存储器争用技术在设定范围内调整内存。"
+
+# f2fe7c9bf6004d17af2fc11f9e60bcb5
+#: ../../hosts.rst:369
+msgid "Requirements for Over-Provisioning"
+msgstr "存储超配的要求"
+
+# bee683fe8af6414ba2ce5829f1cce894
+#: ../../hosts.rst:371
+msgid ""
+"Several prerequisites are required in order for over-provisioning to "
+"function properly. The feature is dependent on the OS type, hypervisor "
+"capabilities, and certain scripts. It is the administrator's responsibility "
+"to ensure that these requirements are met."
+msgstr "为了让超配能够正常工作需要几个前提条件。此特性取决于OS类型,hypervisor功能和特定的脚本。管理员负责确认这些条件都符合。"
+
+# ac320e5915bc4d5e92bae95824019630
+#: ../../hosts.rst:377
+msgid "Balloon Driver"
+msgstr "Balloon驱动"
+
+# 90096ecdf9dd4377bedd8eacc44a5805
+#: ../../hosts.rst:379
+msgid ""
+"All VMs should have a balloon driver installed in them. The hypervisor "
+"communicates with the balloon driver to free up and make the memory "
+"available to a VM."
+msgstr "所有VMs中都安装了balloon驱动。Hypervisor靠balloon驱动与VM通讯以释放内存和让内存变得可用。"
+
+# 3a85924afec74d44a1d3d84552e06e8f
+# 8cce762b3d4c48b5aaa49bca9049a7b8
+#: ../../hosts.rst:384 ../../hosts.rst:410
+msgid "XenServer"
+msgstr "XenServer"
+
+# 2bce40c454304c82b26a1b0275e7d257
+#: ../../hosts.rst:386
+msgid ""
+"The balloon driver can be found as a part of xen pv or PVHVM drivers. The "
+"xen pvhvm drivers are included in upstream linux kernels 2.6.36+."
+msgstr "Balloon驱动是Xen pv或者PVHVM驱动的一部分。Linux kernels 2.6.36和以上版本中包含了Xen pvhvm驱动。"
+
+# 9514bde1f9244064beacff1f13d21855
+#: ../../hosts.rst:390
+msgid "VMware"
+msgstr "VMware"
+
+# 1721067bf51441578864874e46fb712f
+#: ../../hosts.rst:392
+msgid ""
+"The balloon driver can be found as a part of the VMware tools. All the VMs "
+"that are deployed in a over-provisioned cluster should have the VMware tools"
+" installed."
+msgstr "Balloon驱动是VMware tools的一部分。在一台超配群集中部署的所有的VMs都应该安装VMware tools。"
+
+# fdfc3291197e40cbb6918abad409e86f
+#: ../../hosts.rst:397
+msgid "KVM"
+msgstr "KVM"
+
+# 393102255c6a4f449aa9100faef98786
+#: ../../hosts.rst:399
+msgid ""
+"All VMs are required to support the virtio drivers. These drivers are "
+"installed in all Linux kernel versions 2.6.25 and greater. The administrator"
+" must set CONFIG\\_VIRTIO\\_BALLOON=y in the virtio configuration."
+msgstr "所有VMs都需要支持virtio驱动。Linux kernel versions 2.6.25和更高版本中已经安装了这些驱动。管理员必须在virtio的配置文件中配置CONFIG\\_VIRTIO\\_BALLOON=y。"
+
+# 02e47b485a7e4c9792ff13a65325ff98
+#: ../../hosts.rst:405
+msgid "Hypervisor capabilities"
+msgstr "Hypervisor功能"
+
+# 24056966cd1e43f4b55061b3d1952313
+#: ../../hosts.rst:407
+msgid "The hypervisor must be capable of using the memory ballooning."
+msgstr "Hypervisor必须能够使用内存ballooning。"
+
+# cbb4ca754be34de8ac7f1de22df461b5
+#: ../../hosts.rst:412
+msgid ""
+"The DMC (Dynamic Memory Control) capability of the hypervisor should be "
+"enabled. Only XenServer Advanced and above versions have this feature."
+msgstr "Hypervisor必须启用了DMC(动态内存控制)功能。只有XenServer高级版以及更高版本拥有这个功能。"
+
+# 134f00ef1ff74950a8dff3d90e185df3
+#: ../../hosts.rst:416
+msgid "VMware, KVM"
+msgstr "VMware、KVM"
+
+# cbf853d94adb42db8f9447bcc6c094b4
+#: ../../hosts.rst:418
+msgid "Memory ballooning is supported by default."
+msgstr "默认支持内存ballooning。"
+
+# fe751eb8be7f47c4ac053e41b99a0c3f
+#: ../../hosts.rst:421
+msgid "Setting Over-Provisioning Ratios"
+msgstr "设置存储超配系数"
+
+# 362d1a967cde49bd8c050e25ce11a418
+#: ../../hosts.rst:423
+msgid ""
+"There are two ways the root admin can set CPU and RAM over-provisioning "
+"ratios. First, the global configuration settings cpu.overprovisioning.factor"
+" and mem.overprovisioning.factor will be applied when a new cluster is "
+"created. Later, the ratios can be modified for an existing cluster."
+msgstr "管理员有两种方法来设置CPU和RAM超配系数。第一,当新的群集被创建完成的时候全局配置中的cpu.overprovisioning.factor和mem.overprovisioning.factor将生效。第二,对于已存在的群集可以直接修改系数。  "
+
+# 1f116a42dfc04347bf2fbc30976a7fe1
+#: ../../hosts.rst:429
+msgid ""
+"Only VMs deployed after the change are affected by the new setting. If you "
+"want VMs deployed before the change to adopt the new over-provisioning "
+"ratio, you must stop and restart the VMs. When this is done, CloudStack "
+"recalculates or scales the used and reserved capacities based on the new "
+"over-provisioning ratios, to ensure that CloudStack is correctly tracking "
+"the amount of free capacity."
+msgstr "只有在变更之后部署VMs,设置才会生效。如果想让变更之前部署的VMs也能继承新的超配比率,你必须重启VMs。当此操作完成之后,CloudStack会重新计算或者调整已使用的资源,并且基于新的超配比率预留出容量,以保证CloudStack正确的掌握了剩余容量的情况。"
+
+# 93a9d4a11ea3467bab17fb3f4cd0dad6
+#: ../../hosts.rst:437
+msgid ""
+"It is safer not to deploy additional new VMs while the capacity "
+"recalculation is underway, in case the new values for available capacity are"
+" not high enough to accommodate the new VMs. Just wait for the new "
+"used/available values to become available, to be sure there is room for all "
+"the new VMs you want."
+msgstr "如果新的可用容量不足以满足新的VMs需求,那么当重新计算容量的过程中不去部署新的VMs是比较安全的。等新的已用/可用容量完全可用时,确认这空间对于你想创建的VMs足够用。"
+
+# e0366b1e2fa54380bcd721e1a380fc53
+#: ../../hosts.rst:439
+msgid "To change the over-provisioning ratios for an existing cluster:"
+msgstr "在已存在的群集中更改超配系数:"
+
+# 7ffed21dabe7462b8e09848f5725cc96
+#: ../../hosts.rst:443
+msgid "Log in as administrator to the CloudStack UI."
+msgstr "使用管理员登录到CloudStack管理界面。"
+
+# 4d7c773d04964e5b9f50c9425f2787da
+#: ../../hosts.rst:451
+msgid "Under Clusters, click View All."
+msgstr "在群集页面,点击查看所有。"
+
+# 84bddff125d543f283dd83cce8892998
+#: ../../hosts.rst:455
+msgid "Select the cluster you want to work with, and click the Edit button."
+msgstr "选择你要操作的群集,点击编辑按钮。"
+
+# 519a8079ef6b4d2eb83eb8537dfed6e8
+#: ../../hosts.rst:459
+msgid ""
+"Fill in your desired over-provisioning multipliers in the fields CPU "
+"overcommit ratio and RAM overcommit ratio. The value which is intially shown"
+" in these fields is the default value inherited from the global "
+"configuration settings."
+msgstr "在CPU overcommit ratio和RAM overcommit ratio区域里填入你希望的超配系数。这里的初始值是从全局配置设置里继承而来的。"
+
+# 8e7465fb587642f5aac407e899b0ad64
+#: ../../hosts.rst:468
+msgid "Service Offering Limits and Over-Provisioning"
+msgstr "服务方案限制和超配"
+
+# 0d6a4122110b4dee8cff81972c293a1f
+#: ../../hosts.rst:470
+msgid ""
+"Service offering limits (e.g. 1 GHz, 1 core) are strictly enforced for core "
+"count. For example, a guest with a service offering of one core will have "
+"only one core available to it regardless of other activity on the Host."
+msgstr "服务方案限制(比如1GHz,1 core)是受到core数严格限制的。比如,一个使用1 core服务方案的用户只能用 1core,无论这个主机多空闲。"
+
+# 480c139ad92a490a8cf4bf6004be1bf8
+#: ../../hosts.rst:475
+msgid ""
+"Service offering limits for gigahertz are enforced only in the presence of "
+"contention for CPU resources. For example, suppose that a guest was created "
+"with a service offering of 1 GHz on a Host that has 2 GHz cores, and that "
+"guest is the only guest running on the Host. The guest will have the full 2 "
+"GHz available to it. When multiple guests are attempting to use the CPU a "
+"weighting factor is used to schedule CPU resources. The weight is based on "
+"the clock speed in the service offering. Guests receive a CPU allocation "
+"that is proportionate to the GHz in the service offering. For example, a "
+"guest created from a 2 GHz service offering will receive twice the CPU "
+"allocation as a guest created from a 1 GHz service offering. CloudStack does"
+" not perform memory over-provisioning."
+msgstr "GHz的服务方案限制只存在于CPU资源的争用中。比如,假设用户在一个有2GHz core的主机上创建了一个1 GHz的服务方案,并且该用户是这个主机上唯一一个用户。那么该用户有2 GHz可用性能。当多个用户尝试使用CPU,则由权重系数来调度CPU资源。这个权重基于服务方案中的时钟速度。用户分配到的CPU GHz与服务方案中一致。比如,用户从一个2GHz服务方案中创建的VM分配到的CPU是从1 GHz方案中分配到的2倍。CloudStack不能提供内存的超配。"
+
+# 6973ca6704974a47964898e5e0e218dc
+#: ../../hosts.rst:488
+msgid "VLAN Provisioning"
+msgstr "VLAN供应"
+
+# 5b73126100d24f48a0f831790b6172db
+#: ../../hosts.rst:490
+msgid ""
+"CloudStack automatically creates and destroys interfaces bridged to VLANs on"
+" the hosts. In general the administrator does not need to manage this "
+"process."
+msgstr "CloudStack能在主机上自动创建和销毁桥接至VLAN的网络接口。一般来说,管理员不需要介入此处理过程。"
+
+# 4e2359bef8e1410d98f92288a2f72a96
+#: ../../hosts.rst:494
+msgid ""
+"CloudStack manages VLANs differently based on hypervisor type. For XenServer"
+" or KVM, the VLANs are created on only the hosts where they will be used and"
+" then they are destroyed when all guests that require them have been "
+"terminated or moved to another host."
+msgstr "CloudStack根据hypervisor类型的不同,管理VLANs的方式也不同。对于XenServer或者KVM来说,只在使用VLANs的主机上创建VLANs,并且当所有使用VLANs的来宾虚机被销毁或者移动至其他主机的时候,这些VLANs就会被销毁。"
+
+# cfd189a826f9412e8b54976947f52b54
+#: ../../hosts.rst:499
+msgid ""
+"For vSphere the VLANs are provisioned on all hosts in the cluster even if "
+"there is no guest running on a particular Host that requires the VLAN. This "
+"allows the administrator to perform live migration and other functions in "
+"vCenter without having to create the VLAN on the destination Host. "
+"Additionally, the VLANs are not removed from the Hosts when they are no "
+"longer needed."
+msgstr "vSphere上的VLANs是在群集中的所有主机上配置的,不管主机上有没有使用VLAN的来宾虚机在运行。这样允许管理员在vCenter中不需在目标主机上创建VLAN就可以执行在线迁移和其他功能。此外,当主机不再需要的时候VLANs也不会被移除。"
+
+# fc44fd764b804474b12d380d2b22dc04
+#: ../../hosts.rst:506
+msgid ""
+"You can use the same VLANs on different physical networks provided that each"
+" physical network has its own underlying layer-2 infrastructure, such as "
+"switches. For example, you can specify VLAN range 500 to 1000 while "
+"deploying physical networks A and B in an Advanced zone setup. This "
+"capability allows you to set up an additional layer-2 physical "
+"infrastructure on a different physical NIC and use the same set of VLANs if "
+"you run out of VLANs. Another advantage is that you can use the same set of "
+"IPs for different customers, each one with their own routers and the guest "
+"networks on different physical NICs."
+msgstr "你能够使用由不同的拥有二层网络结构的物理网络提供同样的VLANs,比如交换机。比如,在对高级zone中部署物理网络A和B的时候,你可以指定VLAN范围为500-1000。如果你的VLANs用尽了,这个功能允许你在不同的物理网卡上设置追加一个二层物理网络并且使用同样的VLANs设置。另一个优点是你可以在不同的物理网卡上为不同的客户使用同样的IPs设置,每个都有自己的路由器和来宾网络。"
+
+# 06f9c538941f4e3ca83477adfe036a8b
+#: ../../hosts.rst:517
+msgid "VLAN Allocation Example"
+msgstr "VLAN分配示例"
+
+# 7a8e238fd6a447e9803e0fcd39957760
+#: ../../hosts.rst:519
+msgid ""
+"VLANs are required for public and guest traffic. The following is an example"
+" of a VLAN allocation scheme:"
+msgstr "公共和来并流量需要VLAN,下面是一个VLAN分配的示例:"
+
+# 97aaca38941d42f183baf9eb2c560eec
+#: ../../hosts.rst:523
+msgid "VLAN IDs"
+msgstr "VLAN IDs"
+
+# d6cbed5a64fc49fda68543d1a54823ec
+#: ../../hosts.rst:523
+msgid "Traffic type"
+msgstr "流量类型"
+
+# c6a593644e2848398fdf1b4c86458434
+#: ../../hosts.rst:523
+msgid "Scope"
+msgstr "范围"
+
+# df3262b199df4244a2cb492f3134ee68
+#: ../../hosts.rst:525
+msgid "less than 500"
+msgstr "小于500"
+
+# 5fc5eed1fae7464bb9bd0cd832cb9901
+#: ../../hosts.rst:525
+msgid "Management traffic."
+msgstr "管理流量。"
+
+# d7ca9d9a93904c57808e9baf286d1374
+#: ../../hosts.rst:525
+msgid ""
+"Reserved for administrative purposes.  CloudStack software can access this, "
+"hypervisors, system VMs."
+msgstr "出于管理目的而预留的。CloudStack,hypervisors和系统虚机能访问它。"
+
+# 816d6141016845e68cc5cfbb70a5ca4a
+#: ../../hosts.rst:526
+msgid "500-599"
+msgstr "500-599"
+
+# 4c6772a236b949c6a827887e55f468dc
+#: ../../hosts.rst:526
+msgid "VLAN carrying public traffic."
+msgstr "承载公共流量。"
+
+# 9788f1148534421f8b3e69b0a2291d4c
+#: ../../hosts.rst:526
+msgid "CloudStack accounts."
+msgstr "CloudStack账户。"
+
+# faa736af78474fec844134eb7ee8f8e8
+#: ../../hosts.rst:527
+msgid "600-799"
+msgstr "600-799"
+
+# 00cdf19f243d48eda62692e050cca578
+# 968535793b2646eda10843e74d06390c
+#: ../../hosts.rst:527 ../../hosts.rst:528
+msgid "VLANs carrying guest traffic."
+msgstr "承载来宾流量"
+
+# 4c9c92a88e4240c8a3eb4021856220ab
+#: ../../hosts.rst:527
+msgid "CloudStack accounts. Account-specific VLAN is chosen from this pool."
+msgstr "CloudStack accounts. Account-specific VLAN is chosen from this pool."
+
+# 821a9f34a9dd4ccbbcb7099bc2e120ff
+#: ../../hosts.rst:528
+msgid "800-899"
+msgstr "800-899"
+
+# a0b968ec993843e7b61e267dcffdc110
+#: ../../hosts.rst:528
+msgid ""
+"CloudStack accounts. Account-specific VLAN chosen by CloudStack admin to "
+"assign to that account."
+msgstr "CloudStack 账户。CloudStack管理员为账户指定特定的VLAN。"
+
+# eebf870170034248bf44689d980f22fd
+#: ../../hosts.rst:529
+msgid "900-999"
+msgstr "900-999"
+
+# fcaefad65c864f0aa12decdbc8ea1a9f
+#: ../../hosts.rst:529
+msgid "VLAN carrying guest traffic"
+msgstr "承载来宾流量"
+
+# dbc8efd08bdb47939963f1e1ade787c4
+#: ../../hosts.rst:529
+msgid ""
+"CloudStack accounts. Can be scoped by project, domain, or all accounts."
+msgstr "CloudStack 账户。可作为项目、域或所有账户的作用域。"
+
+# b91c7c3931aa46dbaddfffb5b3497d75
+#: ../../hosts.rst:530
+msgid "greater than 1000"
+msgstr "大于1000"
+
+# 11b667ae6cb04cc68d5a10a133cee37b
+#: ../../hosts.rst:530
+msgid "Reserved for future use"
+msgstr "保留为将来使用"
+
+# 10b73559efa5445caf021d488a10c300
+#: ../../hosts.rst:534
+msgid "Adding Non Contiguous VLAN Ranges"
+msgstr "添加不连续的VLAN范围"
+
+# 632b0960356d40aabb5f7262a942d317
+#: ../../hosts.rst:536
+msgid ""
+"CloudStack provides you with the flexibility to add non contiguous VLAN "
+"ranges to your network. The administrator can either update an existing VLAN"
+" range or add multiple non contiguous VLAN ranges while creating a zone. You"
+" can also use the UpdatephysicalNetwork API to extend the VLAN range."
+msgstr "CloudStack能让你灵活的给你的网络添加不连续的VLAN范围。在创建一个zone的时候,管理员要么更新一个已存在的VLAN范围,要么添加多个不连续的VLAN范围。你同样可以使用UpdatephysicalNetwork API来扩展VLAN范围。"
+
+# 22166092fd8e4f749f83b22e91ed0a19
+#: ../../hosts.rst:544
+msgid "Log in to the CloudStack UI as an administrator or end user."
+msgstr "使用管理员或者终端用户账号登录CloudStack UI。"
+
+# c3cc468f1166400fbf2d5bbccec17632
+#: ../../hosts.rst:548
+msgid "Ensure that the VLAN range does not already exist."
+msgstr "确保VLAN范围没有被使用。"
+
+# 0cca254c9b6c4adab9fca2d53a8d2a99
+#: ../../hosts.rst:552
+msgid "In the left navigation, choose Infrastructure."
+msgstr "在左边的导航,选择基础架构。"
+
+# 501e52d3dc124b9b81b1a94a93af9f28
+#: ../../hosts.rst:556
+msgid ""
+"On Zones, click View More, then click the zone to which you want to work "
+"with."
+msgstr "在Zones上,点击查看更多,然后点击你要进行操作的zone。"
+
+# 6a6640c67ea34b0b9a0ca859696174c0
+#: ../../hosts.rst:561
+msgid "Click Physical Network."
+msgstr "点击物理网络。"
+
+# 9df7f0d650ab4fa8868898684c3025ba
+#: ../../hosts.rst:565
+msgid "In the Guest node of the diagram, click Configure."
+msgstr "在图中的来宾节点上,点击配置"
+
+# 81b5cc6e8b5e4cffada11d5628cf542b
+#: ../../hosts.rst:569
+msgid "Click Edit |edit-icon.png|."
+msgstr "点击编辑|edit-icon.png|。"
+
+# 128ddb2b1a0b403eaa01728b573229e2
+#: ../../hosts.rst:571
+msgid "The VLAN Ranges field now is editable."
+msgstr "现在VLAN范围区域是可编辑的了。"
+
+# ecf3f3c2e0a24b78aed1b4ed3eb44f3c
+#: ../../hosts.rst:575
+msgid "Specify the start and end of the VLAN range in comma-separated list."
+msgstr "指定VLAN范围的起始和结束用逗号隔开。"
+
+# 16e7961826d14270960e64272b17457a
+#: ../../hosts.rst:577
+msgid ""
+"Specify all the VLANs you want to use, VLANs not specified will be removed "
+"if you are adding new ranges to the existing list."
+msgstr "指定所有你想使用的VLANs,如果你添加新的范围到已有列表里,那么没有指定的VLANs将被移除。"
+
+# d6cbf61222844716888f5f8f862bfd82
+#: ../../hosts.rst:582
+msgid "Click Apply."
+msgstr "点击应用"
+
+# 87d75c37a1ca4312b9d73ae90c39dacf
+#: ../../hosts.rst:585
+msgid "Assigning VLANs to Isolated Networks"
+msgstr "给隔离的网络指定VLAN。"
+
+# 329c29ef5c0640298b62d8621919a04e
+#: ../../hosts.rst:587
+msgid ""
+"CloudStack provides you the ability to control VLAN assignment to Isolated "
+"networks. As a Root admin, you can assign a VLAN ID when a network is "
+"created, just the way it's done for Shared networks."
+msgstr "CloudStack能够让你控制VLAN分配至隔离网络。作为一个Root管理员,当一个网络被创建后,你能为其分配一个VLAN ID,这个网络只能是共享网络。"
+
+# d463cc2b2e6b45efbc688fae2f8c844e
+#: ../../hosts.rst:591
+msgid ""
+"The former behaviour also is supported — VLAN is randomly allocated to a "
+"network from the VNET range of the physical network when the network turns "
+"to Implemented state. The VLAN is released back to the VNET pool when the "
+"network shuts down as a part of the Network Garbage Collection. The VLAN can"
+" be re-used either by the same network when it is implemented again, or by "
+"any other network. On each subsequent implementation of a network, a new "
+"VLAN can be assigned."
+msgstr "同样被支持—当网络转换为运行状态是,VLAN是随机地通过物理网络的VNET范围分配给网络。当网络作为网络垃圾回收过程的一部分而关闭时,VLAN会被回收到VNET池。当网络再次启用的时候VLAN还能被其重用,或者其他网络使用。在每个新启用的网络中,都有一个新的VLAN被分配。"
+
+# 67f26f616c1d468f9f43fbad3a96d653
+#: ../../hosts.rst:599
+msgid ""
+"Only the Root admin can assign VLANs because the regular users or domain "
+"admin are not aware of the physical network topology. They cannot even view "
+"what VLAN is assigned to a network."
+msgstr "只有Root管理员能够分配VLANs,因为常规的用户和域管理员并不清楚物理网络拓扑。他们也不能查看哪个VLAN被分配给网络。"
+
+# 8cb6b5c237b24db2a036745c714fd0c1
+#: ../../hosts.rst:603
+msgid "To enable you to assign VLANs to Isolated networks,"
+msgstr "要把VLANs分配给隔离的网络,"
+
+# aa68c2b731f44e8ca5e7b12992e491e4
+#: ../../hosts.rst:607
+msgid "Create a network offering by specifying the following:"
+msgstr "使用下列指定的步骤创建一个网络方案:"
+
+# 6ac8335147a0424ea30c996690f508f6
+#: ../../hosts.rst:611
+msgid "**Guest Type**: Select Isolated."
+msgstr "**来宾网络类型**:选择隔离的。"
+
+# a4d3756da9654670af81f81ef51f5bea
+#: ../../hosts.rst:615
+msgid "**Specify VLAN**: Select the option."
+msgstr "**指定VLAN**:选择一个选项。"
+
+# 418a868357c54463be949ae219831e3f
+#: ../../hosts.rst:617
+msgid "For more information, see the CloudStack Installation Guide."
+msgstr "更多信息,请参考CloudStack安装指导。"
+
+# c7ae08cd2c954f069c402e2f29bd6498
+#: ../../hosts.rst:621
+msgid "Using this network offering, create a network."
+msgstr "使用这个网络方案,创建一个网络。"
+
+# b76ebd2ac4ec4be88b31ead41a0ffa76
+#: ../../hosts.rst:623
+msgid "You can create a VPC tier or an Isolated network."
+msgstr "你可以创建一个VPC层或者一个隔离网络。"
+
+# c827ff2cdfaa40c0a2f5dcefd4637b6f
+#: ../../hosts.rst:627
+msgid "Specify the VLAN when you create the network."
+msgstr "当你创建网络的时候指定VLAN。"
+
+# 8e3918b569284ecc9204e3c58114c951
+#: ../../hosts.rst:629
+msgid ""
+"When VLAN is specified, a CIDR and gateway are assigned to this network and "
+"the state is changed to Setup. In this state, the network will not be "
+"garbage collected."
+msgstr "当VLAN被指定后,CIDR和网关就被分配给这个网络了,并且它的状态也变成Setup了。在这个状态下,网络不会被回收。"
+
+# 710699c1ce8949f781a434db64439614
+#: ../../hosts.rst:634
+msgid ""
+"You cannot change a VLAN once it's assigned to the network. The VLAN remains"
+" with the network for its entire life cycle."
+msgstr "一旦VLAN被分配给一个网络的话,你就不能更改它。VLAN将伴随着网络的整个生命周期。"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/index.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/index.po b/source/locale/zh_CN/LC_MESSAGES/index.po
new file mode 100644
index 0000000..17c06c3
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/index.po
@@ -0,0 +1,104 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-04-29 05:15+0000\n"
+"Last-Translator: darrentang <da...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# d7684c4811fb465d8e5523136e60776b
+#: ../../index.rst:22
+msgid "Welcome to CloudStack Administration Documentation"
+msgstr "欢迎阅读CloudStack管理文档"
+
+# 89ba74160fc34ab384dce20831bba66f
+#: ../../index.rst:25
+msgid "User Interface"
+msgstr "用户界面"
+
+# 0b869c712c0549f794b04850fc92bbf0
+#: ../../index.rst:33
+msgid "Managing Accounts, Users and Domains"
+msgstr "管理账户,用户和域"
+
+# ade0aa6c65934d08b9439c9b55d76991
+#: ../../index.rst:41
+msgid "Using Projects to Organize User Resources"
+msgstr "使用项目来组织用户资源"
+
+# a4efa62c4fe0431e97cf1e8a8afa3c4c
+#: ../../index.rst:48
+msgid "Service Offerings"
+msgstr "服务方案"
+
+# 784d8d28e28c49e588607297adc80f3b
+#: ../../index.rst:56
+msgid "Setting up Networking for Users"
+msgstr "用户网络设置"
+
+# 99a275b31677470fb19d20cc2cfb3a66
+#: ../../index.rst:64
+msgid "Working with Virtual Machines"
+msgstr "使用虚拟机"
+
+# 8f3d1a01a82d4daca2072ce17e85191b
+#: ../../index.rst:72
+msgid "Working with Templates"
+msgstr "使用模板"
+
+# b618e01117be4bc8917aab2189ec3be4
+#: ../../index.rst:80
+msgid "Working with Hosts"
+msgstr "使用主机"
+
+# 1d07b6cc6bd74b689edf5f3f6305e11f
+#: ../../index.rst:88
+msgid "Working with Storage"
+msgstr "使用存储"
+
+# 538bdb71f1c34206a75745c0c45b8669
+#: ../../index.rst:96
+msgid "Working with System Virtual Machines"
+msgstr "使用系统虚拟机"
+
+# da80feddb6be416fb7a724951d7f6049
+#: ../../index.rst:104
+msgid "Working with Usage"
+msgstr "使用服务"
+
+# 89016757f86c44379eb90b8ea75b6d40
+#: ../../index.rst:112
+msgid "Managing Networks and Traffic"
+msgstr "网络和流量管理"
+
+# 4c1cbbb4d99f4c8bace30f6c0edbdd98
+#: ../../index.rst:120
+msgid "Managing the Cloud"
+msgstr "管理云"
+
+# 769cb32397e246beb100d0a77e9bf7ab
+#: ../../index.rst:128
+msgid "System Reliability and Availability"
+msgstr "系统可靠性和可用性"
+
+# 2256c3b81c7b49e18235f85ab474184f
+#: ../../index.rst:136
+msgid "Tuning"
+msgstr "调优"
+
+# 1577c7120b3648449625d8806030fe2b
+#: ../../index.rst:144
+msgid "Events and Troubleshooting"
+msgstr "事件和故障排查"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/management.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/management.po b/source/locale/zh_CN/LC_MESSAGES/management.po
new file mode 100644
index 0000000..c97d646
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/management.po
@@ -0,0 +1,605 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+# morgan wang <mo...@gmail.com>, 2014
+# renoshen <sh...@sinosig.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 02:41+0000\n"
+"Last-Translator: renoshen <sh...@sinosig.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 62fa0deba316409090e6e208765342a7
+#: ../../management.rst:18
+msgid "Managing the Cloud"
+msgstr "管理云"
+
+# a792503e467d4d97a1d4aa55140452a5
+#: ../../management.rst:21
+msgid "Using Tags to Organize Resources in the Cloud"
+msgstr "在云中使用Tags来组织资源。"
+
+# c61cae44c33f4a3b93bcbde61e020c22
+#: ../../management.rst:23
+msgid ""
+"A tag is a key-value pair that stores metadata about a resource in the "
+"cloud. Tags are useful for categorizing resources. For example, you can tag "
+"a user VM with a value that indicates the user's city of residence. In this "
+"case, the key would be \"city\" and the value might be \"Toronto\" or "
+"\"Tokyo.\" You can then request CloudStack to find all resources that have a"
+" given tag; for example, VMs for users in a given city."
+msgstr "标签是一类存储云中资源元数据的键值对。其主要用来分类资源,例如,可以将一个用户的虚拟机打上标签,以表明用户所在的城市。在这个例子中,键就是城市,而值可能是Toronto或是Tokyo。可以让cloudstack发现所有打上标签的资源。例如,发现指定城市里用户的虚拟机。"
+
+# b8bee7f6ee524c41a62546c3926fc5a6
+#: ../../management.rst:30
+msgid ""
+"You can tag a user virtual machine, volume, snapshot, guest network, "
+"template, ISO, firewall rule, port forwarding rule, public IP address, "
+"security group, load balancer rule, project, VPC, network ACL, or static "
+"route. You can not tag a remote access VPN."
+msgstr "可以给用户虚拟机,磁盘卷,快照,来宾网络,模板,ISO镜像,防火墙规则,端口转发规则,公共IP地址,安全组,负载均衡规则,项目,VPC,网络访问列表或者静态路由器等等,都打上标签。但不能给远程登录VPN打上标签。"
+
+# 41f9c119f564420ebc0b2ce07d6a5211
+#: ../../management.rst:35
+msgid ""
+"You can work with tags through the UI or through the API commands "
+"createTags, deleteTags, and listTags. You can define multiple tags for each "
+"resource. There is no limit on the number of tags you can define. Each tag "
+"can be up to 255 characters long. Users can define tags on the resources "
+"they own, and administrators can define tags on any resources in the cloud."
+msgstr "可以通过CloudStack的界面或者API来创建标签,删除标签或者列出标签。也可以为每一个资源定义多个标签。没有数量的限制。并且,每个标签可以达到255个字符的长度。用户可以定义自己拥有的资源的标签,而管理员可以定义云中所有资源的标签。"
+
+# 4987c5d196e64161aae21901c96b4c37
+#: ../../management.rst:42
+msgid ""
+"An optional input parameter, \"tags,\" exists on many of the list\\* API "
+"commands. The following example shows how to use this new parameter to find "
+"all the volumes having tag region=canada OR tag city=Toronto:"
+msgstr "一个可选的输入参数,标签,存在于多个API中。下面的例子展示了如何应用这个新参数来查找带有 地域=加拿大或城市=多伦多 标签的所有磁盘卷。"
+
+# 7914681bd50244bcaf4169707987eb00
+#: ../../management.rst:55
+msgid "The following API commands have the \"tags\" input parameter:"
+msgstr "下面的API命令具有以下输入参数:"
+
+# 61fbca041dee4db2aade53a7cf792de7
+#: ../../management.rst:59
+msgid "listVirtualMachines"
+msgstr "listVirtualMachines"
+
+# ba0235266c3845cc96ba7fcf7de44466
+#: ../../management.rst:63
+msgid "listVolumes"
+msgstr "listVolumes"
+
+# 1c68c5c60b174ea2a71f39ba93a211ac
+#: ../../management.rst:67
+msgid "listSnapshots"
+msgstr "listSnapshots"
+
+# 9f05731121b4498e9e51a500a79f2511
+#: ../../management.rst:71
+msgid "listNetworks"
+msgstr "listNetworks"
+
+# 36599c953977457c84ecffc6c9395338
+#: ../../management.rst:75
+msgid "listTemplates"
+msgstr "listTemplates"
+
+# c3b6ffcb5da240cea465ea296dd4ccfd
+#: ../../management.rst:79
+msgid "listIsos"
+msgstr "listIsos"
+
+# 6a47e3c18c6f476bb22295c172479796
+#: ../../management.rst:83
+msgid "listFirewallRules"
+msgstr "listFirewallRules"
+
+# 08d8500b98314effbb3d7916236f7e2b
+#: ../../management.rst:87
+msgid "listPortForwardingRules"
+msgstr "listPortForwardingRules"
+
+# 2a42e7c362bc427eba13e2d7e7bf7380
+#: ../../management.rst:91
+msgid "listPublicIpAddresses"
+msgstr "listPublicIpAddresses"
+
+# 4509004a0c73478ca0a184d142eb4a57
+#: ../../management.rst:95
+msgid "listSecurityGroups"
+msgstr "listSecurityGroups"
+
+# fd868f656abb4c0fb6f87da360511519
+#: ../../management.rst:99
+msgid "listLoadBalancerRules"
+msgstr "listLoadBalancerRules"
+
+# e65694d6fab44e9d946a5866f926091c
+#: ../../management.rst:103
+msgid "listProjects"
+msgstr "listProjects"
+
+# 830852c2a7c84d06b6c01a444f0b1b66
+#: ../../management.rst:107
+msgid "listVPCs"
+msgstr "listVPCs"
+
+# 9f2367d8d4df4802bb1c90dcd52a411f
+#: ../../management.rst:111
+msgid "listNetworkACLs"
+msgstr "listNetworkACLs"
+
+# 8afa8bc38679406e95930eda004cc27b
+#: ../../management.rst:115
+msgid "listStaticRoutes"
+msgstr "listStaticRoutes"
+
+# 073cb1458dc443a1b9e2e791e168eafe
+#: ../../management.rst:119
+msgid "Reporting CPU Sockets"
+msgstr "CPU Sockets报表"
+
+# d3bc3b48bddd4f228b7fde7ad5520fd3
+#: ../../management.rst:121
+msgid ""
+"PRODUCT manages different types of hosts that contains one or more physical "
+"CPU sockets. CPU socket is considered as a unit of measure used for "
+"licensing and billing cloud infrastructure. PRODUCT provides both UI and API"
+" support to collect the CPU socket statistics for billing purpose. The "
+"Infrastructure tab has a new tab for CPU sockets. You can view the "
+"statistics for CPU sockets managed by PRODUCT, which in turn reflects the "
+"size of the cloud. The CPU Socket page will give you the number of hosts and"
+" sockets used for each host type."
+msgstr "生产环境管理着包含一个多个物理CPU端口的不同类型的主机。CPU端口可以看作是一个测量单元,用来授权或制定云架构。生产环境提供UI和API支持来收集CPU端口统计,供订单使用。在架构选项中,有一个新的CPU端口项。可以查看生产环境管理的CPU端口统计数据,这些数据能够反映云的大小。CPU端口页会展示每一主机类型的主机数量及端口数。"
+
+# 179f99e5b8df40a1ba2a0197f6341be2
+#: ../../management.rst:130
+msgid "Log in to the PRODUCT UI."
+msgstr "登录到CloudStack用户界面。"
+
+# 57d62b4d9b054608adfe2e064e3dd8f8
+#: ../../management.rst:132
+msgid "In the left navigation bar, click Infrastructure."
+msgstr "在左侧导航栏中,点击基础架构"
+
+# 8e60a5440ac44537a259df5ffe6c34a6
+#: ../../management.rst:134
+msgid "On CPU Sockets, click View all."
+msgstr "在CPU Sockets中,点击查看全部。"
+
+# 1ae3d6da93ee4bbd939915b25643adf5
+#: ../../management.rst:136
+msgid ""
+"The CPU Socket page is displayed. The page shows the number of hosts and CPU"
+" sockets based on hypervisor types."
+msgstr "显示CPU插槽页。此页会显示主机数量以及基于虚拟机类型的CPU插槽数量。"
+
+# 4478c2a6941346c4a839b782797026a0
+#: ../../management.rst:141
+msgid "Changing the Database Configuration"
+msgstr "更改数据库配置"
+
+# b70d57ac66ee464eae4b05c578e89c8e
+#: ../../management.rst:143
+msgid ""
+"The CloudStack Management Server stores database configuration information "
+"(e.g., hostname, port, credentials) in the file "
+"``/etc/cloudstack/management/db.properties``. To effect a change, edit this "
+"file on each Management Server, then restart the Management Server."
+msgstr "CloudStack管理服务器存储了数据库配置信息(如主机名,端口,凭证),这些信息在/etc/cloudstack/management/db.properties文件中,为使更改生效,编辑每个管理服务器上的此文件,然后重启管理服务器"
+
+# d69ee7ee9b9646d7a8a016fccc2db9e4
+#: ../../management.rst:149
+msgid "Changing the Database Password"
+msgstr "更改数据库密码"
+
+# d84602682dbf4f349b1478edbbf567d1
+#: ../../management.rst:151
+msgid ""
+"You may need to change the password for the MySQL account used by "
+"CloudStack. If so, you'll need to change the password in MySQL, and then add"
+" the encrypted password to ``/etc/cloudstack/management/db.properties``."
+msgstr "可能会需要更改CloudStack使用的mysql账户密码。如果要更改,需要在MySQL中更改密码,同时要将加密的密码加入到/etc/cloudstack/management/db.properties文件中。"
+
+# 46979db784d447698778e73ecb8eaf02
+#: ../../management.rst:158
+msgid ""
+"Before changing the password, you'll need to stop CloudStack's management "
+"server and the usage engine if you've deployed that component."
+msgstr "在更改密码之前,需要停止CloudStack管理服务器,如果部署了使用引擎,也需要关闭使用引擎。"
+
+# 530bd78524724552bfa1d927234ca3b7
+#: ../../management.rst:169
+msgid ""
+"Next, you'll update the password for the CloudStack user on the MySQL "
+"server."
+msgstr "接下来,你将在MySQL服务器上更新CloudStack的用户密码。"
+
+# 342e9a0cf7114011a7a6e9909df7a65a
+#: ../../management.rst:176
+msgid "At the MySQL shell, you'll change the password and flush privileges:"
+msgstr "在MySQL命令行下,你将更改密码并且刷新权限:"
+
+# c906e56dd67a40f9a09b8fd0c69cca61
+#: ../../management.rst:186
+msgid ""
+"The next step is to encrypt the password and copy the encrypted password to "
+"CloudStack's database configuration "
+"(``/etc/cloudstack/management/db.properties``)."
+msgstr "下一步是加密密码然后拷贝加密后的密码到CloudStack的数据库配置中(``/etc/cloudstack/management/db.properties``)。"
+
+# 966a4c741fcc455d95a07582cd1148e2
+#: ../../management.rst:195
+msgid "File encryption type"
+msgstr "文件加密类型"
+
+# 6b56e1a2563f4b379240d045e9066699
+#: ../../management.rst:197
+msgid ""
+"Note that this is for the file encryption type. If you're using the web "
+"encryption type then you'll use "
+"password=\"management\\_server\\_secret\\_key\""
+msgstr "请注意这是给文件加密类型准备的。如果你使用web加密类型,那么你要使用password=\"management\\_server\\_secret\\_key\""
+
+# 12e8a0b52c124abfa87ae48dfc2bef1f
+#: ../../management.rst:203
+msgid ""
+"Now, you'll update ``/etc/cloudstack/management/db.properties`` with the new"
+" ciphertext. Open ``/etc/cloudstack/management/db.properties`` in a text "
+"editor, and update these parameters:"
+msgstr "现在,你会在 ``/etc/cloudstack/management/db.properties`` 中更新心的密文。使用文本编辑器打开``/etc/cloudstack/management/db.properties`` ,然后更新这些参数:"
+
+# 05fa3e47277c4963819e7b9d1ac941db
+#: ../../management.rst:214
+msgid ""
+"After copying the new password over, you can now start CloudStack (and the "
+"usage engine, if necessary)."
+msgstr "在复制新的密码过去之后,你可以启动CloudStack了(如果需要的话,还有用量引擎)。"
+
+# ab0e0b55f2304115bfd6653d5a7e0dd9
+#: ../../management.rst:223
+msgid "Administrator Alerts"
+msgstr "管理员告警信息"
+
+# 4fc127299b7e4745978235d4354bbccb
+#: ../../management.rst:225
+msgid ""
+"The system provides alerts and events to help with the management of the "
+"cloud. Alerts are notices to an administrator, generally delivered by "
+"e-mail, notifying the administrator that an error has occurred in the cloud."
+" Alert behavior is configurable."
+msgstr "系统提供告警和事件用以帮助云的管理。告警通知管理员,一般用邮件发送,提醒管理员云中有错误发生。告警的行为可以进行配置。"
+
+# 76ae47fe37774d1483c1b5363a6d4202
+#: ../../management.rst:230
+msgid ""
+"Events track all of the user and administrator actions in the cloud. For "
+"example, every guest VM start creates an associated event. Events are stored"
+" in the Management Server’s database."
+msgstr "事件会追踪云中所有用户和管理员的操作事件。比如,每个客户虚拟机的启动会建立一个对应的事件。每个时间都存储在管理节点的数据库中。"
+
+# a1e3c013206f4c6ab4e6995a41e2fb3b
+#: ../../management.rst:234
+msgid ""
+"Emails will be sent to administrators under the following circumstances:"
+msgstr "在以下情况,系统会发送邮件给管理员:"
+
+# 3bd4b2bfb7784f4c85a053970508cc79
+#: ../../management.rst:238
+msgid ""
+"The Management Server cluster runs low on CPU, memory, or storage resources"
+msgstr "管理节点集群中CPU,内存或者存储资源的可用量低。"
+
+# b200b975c0a74ffcba301baf70b4cbee
+#: ../../management.rst:243
+msgid ""
+"The Management Server loses heartbeat from a Host for more than 3 minutes"
+msgstr "管理节点和主机之间的心跳检查丢失超过3分钟。"
+
+# ccb116becdc34d05b675e0dd815eb45f
+#: ../../management.rst:248
+msgid "The Host cluster runs low on CPU, memory, or storage resources"
+msgstr "主机集群中CPU,内存或者存储资源的可用量低。"
+
+# 34703bd556ff4860a1b4276a8c595679
+#: ../../management.rst:251
+msgid "Sending Alerts to External SNMP and Syslog Managers"
+msgstr "将警告发送给外部的SNMP和Syslog管理器"
+
+# 2cd893dc03494c9f9d2e89a38be1365e
+#: ../../management.rst:253
+msgid ""
+"In addition to showing administrator alerts on the Dashboard in the "
+"CloudStack UI and sending them in email, CloudStack can also send the same "
+"alerts to external SNMP or Syslog management software. This is useful if you"
+" prefer to use an SNMP or Syslog manager to monitor your cloud."
+msgstr "除了在CloudStack UI中的仪表板上给管理员显示警告和发送电子邮件之外,CloudStack还可以发送同样的警告给外部的SNMP或者Syslog管理软件。如果你更愿意使用SNMP或者Syslog管理器来监视你的云的话,那这么做很有用。"
+
+# 183fd5a09ba94d239b50995e39c6d1bb
+#: ../../management.rst:259
+msgid "The alerts which can be sent are:"
+msgstr "可以发送的警告有:"
+
+# 9c0f28eb90514f2885638a6cc4c911d0
+#: ../../management.rst:261
+msgid ""
+"The following is the list of alert type numbers. The current alerts can be "
+"found by calling listAlerts."
+msgstr "以下是告警类型的列表。当前告警可以通过调用listAlerts得知。"
+
+# fcd80afc6c874d05a553c2385a73b1de
+#: ../../management.rst:373
+msgid ""
+"You can also display the most up to date list by calling the API command "
+"``listAlerts``."
+msgstr "通过调用API命令 ``listAlerts``,你还可以显示最新的列表。"
+
+# 55bd3cff1d234d10b6874e5bd2208730
+#: ../../management.rst:376
+msgid "SNMP Alert Details"
+msgstr "SNMP警告详情"
+
+# b7f474def21a45019ad42f1dcb03434e
+#: ../../management.rst:378
+msgid "The supported protocol is SNMP version 2."
+msgstr "支持SNMP v2。"
+
+# 93853f006fe94159a30cfacd98bacaef
+#: ../../management.rst:380
+msgid ""
+"Each SNMP trap contains the following information: message, podId, "
+"dataCenterId, clusterId, and generationTime."
+msgstr "每个SNMP陷阱报错以下信息:message、podId、dataCenterId、clusterId和generationTime。"
+
+# 7b720e085e5a440280e905349f42fd5e
+#: ../../management.rst:384
+msgid "Syslog Alert Details"
+msgstr "Syslog警报详情"
+
+# 632fd4dd34df40eaab1b80869ea0ef29
+#: ../../management.rst:386
+msgid ""
+"CloudStack generates a syslog message for every alert. Each syslog message "
+"incudes the fields alertType, message, podId, dataCenterId, and clusterId, "
+"in the following format. If any field does not have a valid value, it will "
+"not be included."
+msgstr "CloudStack为每个警告生成一个syslog信息。每个syslog信息包含下列格式的字段alertType、message、podId、dataCenterId和clusterId。如果任何字段没有有效值的话,它将不会包含在内。"
+
+# 16294475b8e9426f92abe561d0af9d18
+#: ../../management.rst:395
+msgid "For example:"
+msgstr "例如:"
+
+# 033011aa33934bbea10d0f9348ad5744
+#: ../../management.rst:402
+msgid "Configuring SNMP and Syslog Managers"
+msgstr "配置SNMP和Syslog日志管理"
+
+# 6c85d75e087e497288d50df030ecea6f
+#: ../../management.rst:404
+msgid ""
+"To configure one or more SNMP managers or Syslog managers to receive alerts "
+"from CloudStack:"
+msgstr "要配置一个或多个SNMP管理器或者Syslog管理器来接收来自CloudStack 的警告:"
+
+# c688dbbc722f42a5be3cb7cec4b0b7e8
+#: ../../management.rst:409
+msgid ""
+"For an SNMP manager, install the CloudStack MIB file on your SNMP manager "
+"system. This maps the SNMP OIDs to trap types that can be more easily read "
+"by users. The file must be publicly available. For more information on how "
+"to install this file, consult the documentation provided with the SNMP "
+"manager."
+msgstr "对于SNMP管理器,一个安装在你的SNMP管理系统上安装的CloudStack MIB文件。它映射SNMP OIDs到陷阱类型,目的让用户更容易阅读。这个文件必须是公开的。关于如何安装这个文件的更多信息,参阅SNMP管理器提供的文档。"
+
+# b89ad48e4ed84c129f21d619c068d364
+#: ../../management.rst:417
+msgid "Edit the file /etc/cloudstack/management/log4j-cloud.xml."
+msgstr "编辑 /etc/cloudstack/management/log4j-cloud.xml文件。"
+
+# 4b3128207e8349a9ad7401fc69b17a2b
+#: ../../management.rst:425
+msgid ""
+"Add an entry using the syntax shown below. Follow the appropriate example "
+"depending on whether you are adding an SNMP manager or a Syslog manager. To "
+"specify multiple external managers, separate the IP addresses and other "
+"configuration values with commas (,)."
+msgstr "使用下面给出的语法添加一个条目。选择你是要添加一个SNMP管理器还是一个Syslog管理器,然后按照适当的示例操作。要指定多个外部管理器,使用逗号(,)将IP地址和其他配置值隔开。"
+
+# fd1b4680483c4c89a013cdc0b216cd85
+#: ../../management.rst:430
+msgid ""
+"The recommended maximum number of SNMP or Syslog managers is 20 for each."
+msgstr "SNMP或Syslog管理器推荐的最大值是20。"
+
+# e2aaea38ebe14fa09cad5de41d56840f
+#: ../../management.rst:432
+msgid ""
+"The following example shows how to configure two SNMP managers at IP "
+"addresses 10.1.1.1 and 10.1.1.2. Substitute your own IP addresses, ports, "
+"and communities. Do not change the other values (name, threshold, class, and"
+" layout values)."
+msgstr "下面的例子展示了如果配置两个IP分别为10.1.1.1和10.1.1.2的SNMP管理器。在实际使用中请替换成你的IP、ports和communities。不要改变其他值(name、threshold、class和layout值)。"
+
+# 3b890460b1ab4e089a42043ac96ead1b
+#: ../../management.rst:450
+msgid ""
+"The following example shows how to configure two Syslog managers at IP "
+"addresses 10.1.1.1 and 10.1.1.2. Substitute your own IP addresses. You can "
+"set Facility to any syslog-defined value, such as LOCAL0 - LOCAL7. Do not "
+"change the other values."
+msgstr "下面的例子展示了如果配置两个IP分别为10.1.1.1和10.1.1.2的Syslog管理器。在实际是使用中请替换成你的IP。你可以设置Facility为任何syslog-defined的值,如 LOCAL0 - LOCAL7。不要改变其他的值。"
+
+# 6519d2611cb9461c9db740d0a6a88955
+#: ../../management.rst:468
+msgid ""
+"If your cloud has multiple Management Server nodes, repeat these steps to "
+"edit log4j-cloud.xml on every instance."
+msgstr "如果你的云有多个管理服务器节点,在编辑每个节点中log4j-cloud.xml的时候,重复这些步骤。"
+
+# 8f72a4c1d1a8453b87cc53aa201f48b4
+#: ../../management.rst:473
+msgid ""
+"If you have made these changes while the Management Server is running, wait "
+"a few minutes for the change to take effect."
+msgstr "当管理服务器正在运行的时候,你做了这些变更,等待一会让变更生效。"
+
+# 27c6084b918c4be5af71768e4b0d44db
+#: ../../management.rst:476
+msgid ""
+"**Troubleshooting:** If no alerts appear at the configured SNMP or Syslog "
+"manager after a reasonable amount of time, it is likely that there is an "
+"error in the syntax of the <appender> entry in log4j-cloud.xml. Check to be "
+"sure that the format and settings are correct."
+msgstr "**排错:**如果一段之后,在配置的SNMP或者Syslog管理器中没有警告出现,那么log4j-cloud.xml中<appender>的语法可能有错误。检查并确定格式和设置都是正确的。"
+
+# 6c4c318782b24c9f8ca91f295b54c425
+#: ../../management.rst:483
+msgid "Deleting an SNMP or Syslog Manager"
+msgstr "删除SNMP或Syslog日志管理"
+
+# 333c2a71b97e46b2b464c7febe95676e
+#: ../../management.rst:485
+msgid ""
+"To remove an external SNMP manager or Syslog manager so that it no longer "
+"receives alerts from CloudStack, remove the corresponding entry from the "
+"file ``/etc/cloudstack/management/log4j-cloud.xml``."
+msgstr "要移除一个外部SNMP管理器或者Syslog管理器以便它不再接收来自CloudStack 的警告,请删除``/etc/cloudstack/management/log4j-cloud.xml``文件中对应的条目。"
+
+# 41d170a469ed480ba6aeb1e5fad947d3
+#: ../../management.rst:490
+msgid "Customizing the Network Domain Name"
+msgstr "自定义网络域名"
+
+# 710127df750e46a29414e4b5949fdd84
+#: ../../management.rst:492
+msgid ""
+"The root administrator can optionally assign a custom DNS suffix at the "
+"level of a network, account, domain, zone, or entire CloudStack "
+"installation, and a domain administrator can do so within their own domain. "
+"To specify a custom domain name and put it into effect, follow these steps."
+msgstr "根管理员在网络, 帐户,域, 资源域以及整个CloudStack级别可选择设置DNS后缀,域管理员可以在自己的域做这样的设置。要自定义域名并使其有效, 请按照下面的步骤操作。"
+
+# 987b6416037e4b1ea4964ea02e0857b8
+#: ../../management.rst:500
+msgid "Set the DNS suffix at the desired scope"
+msgstr "在所需的范围内设置DNS后缀"
+
+# 4a55e259b9f540b28cdf2a67892b7742
+#: ../../management.rst:504
+msgid ""
+"At the network level, the DNS suffix can be assigned through the UI when "
+"creating a new network, as described in `“Adding an Additional Guest "
+"Network” <networking2#adding-an-additional-guest-network>`_ or with the "
+"updateNetwork command in the CloudStack API."
+msgstr "在网络级别中, DNS后缀可以通过UI在创建新的网络时设置, 这些在 `“添加额外的来宾网络” <networking2#adding-an-additional-guest-network>`_ 或CloudStack API的updateNetwork命令中都有描述."
+
+# 9bbd2a476c3946808b3e2adb221d3e39
+#: ../../management.rst:511
+msgid ""
+"At the account, domain, or zone level, the DNS suffix can be assigned with "
+"the appropriate CloudStack API commands: createAccount, editAccount, "
+"createDomain, editDomain, createZone, or editZone."
+msgstr "在帐户、域或者区域级别,DNS后缀可以由以下CloudStack API命令:createAccount、editAccount、createDomain、editDomain、createZone或editZone指定。"
+
+# 96dae8eb905745c4bdd5bd0cdd34a994
+#: ../../management.rst:518
+msgid ""
+"At the global level, use the configuration parameter guest.domain.suffix. "
+"You can also use the CloudStack API command updateConfiguration. After "
+"modifying this global configuration, restart the Management Server to put "
+"the new setting into effect."
+msgstr "在全局级别中,使用配置参数guest.domain.suffix。你也可以使用CloudStack API命令updateConfiguration。当更改了这个全局配置后,重启管理服务器的服务以便新的设置有效。"
+
+# 9a8fe7370653486b84e2578fe98f0907
+#: ../../management.rst:525
+msgid ""
+"To make the new DNS suffix take effect for an existing network, call the "
+"CloudStack API command updateNetwork. This step is not necessary when the "
+"DNS suffix was specified while creating a new network."
+msgstr "为了使你的新DNS后缀对已经存在的网络有效,你需要调用CloudStack API命令updateNetwork。对于DNS后缀已经更改后新建的网络这一步不是必需的。"
+
+# b990678db82f4ca593bdbf4d333df20e
+#: ../../management.rst:529
+msgid ""
+"The source of the network domain that is used depends on the following "
+"rules."
+msgstr "你使用的网络域的源取决于下面的一些规则。"
+
+# 128ab344160241e0b8edba4e6f9eb6ce
+#: ../../management.rst:534
+msgid ""
+"For all networks, if a network domain is specified as part of a network's "
+"own configuration, that value is used."
+msgstr "对于所有的网络,如果网络域作为这个网络自己配置的一部分,那这个网络域的值会被使用。"
+
+# 39bda91169304fcbb776da4b1eb65182
+#: ../../management.rst:539
+msgid ""
+"For an account-specific network, the network domain specified for the "
+"account is used. If none is specified, the system looks for a value in the "
+"domain, zone, and global configuration, in that order."
+msgstr "对于账户指定的网络,为这个账户指定的网域会被使用。如果没有指定,系统会按照域,区域和全局配置的顺序查找网域的值。"
+
+# 7e6ca25cc96d442cb4abbcaa1a058fb6
+#: ../../management.rst:545
+msgid ""
+"For a domain-specific network, the network domain specified for the domain "
+"is used. If none is specified, the system looks for a value in the zone and "
+"global configuration, in that order."
+msgstr "对于域指定的网络, 为这个域指定的网络域名会被使用. 如果没有指定, 系统会区域和全局配置中按顺序查找网络域名的值."
+
+# 3366663c410b4c01bc0ede1967e0057c
+#: ../../management.rst:551
+msgid ""
+"For a zone-specific network, the network domain specified for the zone is "
+"used. If none is specified, the system looks for a value in the global "
+"configuration."
+msgstr "对于区域指定的网络, 为这个域指定的网络域名会被使用. 如果没有指定, 系统会在全局配置里查找网络域名的值."
+
+# 574bfe6275184a228bf29c18f7d01f4e
+#: ../../management.rst:556
+msgid "Stopping and Restarting the Management Server"
+msgstr "停止和重启管理服务"
+
+# 03e70a994f15444d8c76fed8ea185b6c
+#: ../../management.rst:558
+msgid ""
+"The root administrator will need to stop and restart the Management Server "
+"from time to time."
+msgstr "超级管理员需要经常性的关闭和重启管理服务。"
+
+# 03739589fbc44d29b6c184ac61cd2bc1
+#: ../../management.rst:561
+msgid ""
+"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.."
+msgstr "例如,修改全局配置参数之后,要求重启管理服务器。如果您有多个管理服务器节点,请全部重启,以便使新参数值在整个云中生效。"
+
+# d45ce656da614e40af35f65d5da5b4c4
+#: ../../management.rst:566
+msgid ""
+"To stop the Management Server, issue the following command at the operating "
+"system prompt on the Management Server node:"
+msgstr "要停止管理服务,在管理服务节点所在的操作系统中运行如下命令:"
+
+# d6a59f81a7de46bfba9fc759713e09d5
+#: ../../management.rst:573
+msgid "To start the Management Server:"
+msgstr "启动管理服务:"


[07/40] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_load_balancing.rst
----------------------------------------------------------------------
diff --git a/source/networking/ip_load_balancing.rst b/source/networking/ip_load_balancing.rst
new file mode 100644
index 0000000..6d2edd9
--- /dev/null
+++ b/source/networking/ip_load_balancing.rst
@@ -0,0 +1,31 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+IP Load Balancing
+-----------------
+
+The user may choose to associate the same public IP for multiple guests.
+CloudStack implements a TCP-level load balancer with the following
+policies.
+
+-	Round-robin
+
+-	Least connection
+
+-	Source IP
+
+This is similar to port forwarding but the destination may be multiple
+IP addresses.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_reservation_in_guest_networks.rst
----------------------------------------------------------------------
diff --git a/source/networking/ip_reservation_in_guest_networks.rst b/source/networking/ip_reservation_in_guest_networks.rst
new file mode 100644
index 0000000..c8b8f38
--- /dev/null
+++ b/source/networking/ip_reservation_in_guest_networks.rst
@@ -0,0 +1,125 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+IP Reservation in Isolated Guest Networks
+-----------------------------------------
+
+In isolated guest networks, a part of the guest IP address space can be
+reserved for non-CloudStack VMs or physical servers. To do so, you
+configure a range of Reserved IP addresses by specifying the CIDR when a
+guest network is in Implemented state. If your customers wish to have
+non-CloudStack controlled VMs or physical servers on the same network,
+they can share a part of the IP address space that is primarily provided
+to the guest network.
+
+In an Advanced zone, an IP address range or a CIDR is assigned to a
+network when the network is defined. The CloudStack virtual router acts
+as the DHCP server and uses CIDR for assigning IP addresses to the guest
+VMs. If you decide to reserve CIDR for non-CloudStack purposes, you can
+specify a part of the IP address range or the CIDR that should only be
+allocated by the DHCP service of the virtual router to the guest VMs
+created in CloudStack. The remaining IPs in that network are called
+Reserved IP Range. When IP reservation is configured, the administrator
+can add additional VMs or physical servers that are not part of
+CloudStack to the same network and assign them the Reserved IP
+addresses. CloudStack guest VMs cannot acquire IPs from the Reserved IP
+Range.
+
+
+IP Reservation Considerations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Consider the following before you reserve an IP range for non-CloudStack
+machines:
+
+-  IP Reservation is supported only in Isolated networks.
+
+-  IP Reservation can be applied only when the network is in Implemented
+   state.
+
+-  No IP Reservation is done by default.
+
+-  Guest VM CIDR you specify must be a subset of the network CIDR.
+
+-  Specify a valid Guest VM CIDR. IP Reservation is applied only if no
+   active IPs exist outside the Guest VM CIDR.
+
+   You cannot apply IP Reservation if any VM is alloted with an IP
+   address that is outside the Guest VM CIDR.
+
+-  To reset an existing IP Reservation, apply IP reservation by
+   specifying the value of network CIDR in the CIDR field.
+
+   For example, the following table describes three scenarios of guest
+   network creation:
+
+   ===== ============= ============== ======================================== ========================================================
+   Case  CIDR          Network CIDR   Reserved IP Range for Non-CloudStack VMs Description
+   ===== ============= ============== ======================================== ========================================================
+   1     10.1.1.0/24   None           None                                     No IP Reservation.
+   2     10.1.1.0/26   10.1.1.0/24    10.1.1.64 to 10.1.1.254                  IP Reservation configured by the UpdateNetwork API with
+                                                                               guestvmcidr=10.1.1.0/26 or enter 10.1.1.0/26 in the CIDR 
+                                                                               field in the UI.
+   3     10.1.1.0/24   None           None                                     Removing IP Reservation by the UpdateNetwork API with
+                                                                               guestvmcidr=10.1.1.0/24 or enter 10.1.1.0/24 in the CIDR 
+                                                                               field in the UI.
+   ===== ============= ============== ======================================== ========================================================
+
+
+Limitations
+~~~~~~~~~~~
+
+-  The IP Reservation is not supported if active IPs that are found
+   outside the Guest VM CIDR.
+
+-  Upgrading network offering which causes a change in CIDR (such as
+   upgrading an offering with no external devices to one with external
+   devices) IP Reservation becomes void if any. Reconfigure IP
+   Reservation in the new re-implemeted network.
+
+
+Best Practices
+~~~~~~~~~~~~~~
+
+Apply IP Reservation to the guest network as soon as the network state
+changes to Implemented. If you apply reservation soon after the first
+guest VM is deployed, lesser conflicts occurs while applying
+reservation.
+
+
+Reserving an IP Range
+~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network you want to modify.
+
+#. In the Details tab, click Edit. |ip-edit-icon.png|
+
+   The CIDR field changes to editable one.
+
+#. In CIDR, specify the Guest VM CIDR.
+
+#. Click Apply.
+
+   Wait for the update to complete. The Network CIDR and the Reserved IP
+   Range are displayed on the Details page.
+
+
+.. |ip-edit-icon.png| image:: /_static/images/edit-icon.png
+   :alt: button to edit.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/isolation_in_advanced_zone_with_vlan.rst
----------------------------------------------------------------------
diff --git a/source/networking/isolation_in_advanced_zone_with_vlan.rst b/source/networking/isolation_in_advanced_zone_with_vlan.rst
new file mode 100644
index 0000000..61a4e57
--- /dev/null
+++ b/source/networking/isolation_in_advanced_zone_with_vlan.rst
@@ -0,0 +1,202 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Isolation in Advanced Zone Using Private VLAN
+---------------------------------------------
+
+Isolation of guest traffic in shared networks can be achieved by using
+Private VLANs (PVLAN). PVLANs provide Layer 2 isolation between ports
+within the same VLAN. In a PVLAN-enabled shared network, a user VM
+cannot reach other user VM though they can reach the DHCP server and
+gateway, this would in turn allow users to control traffic within a
+network and help them deploy multiple applications without communication
+between application as well as prevent communication with other users'
+VMs.
+
+-  Isolate VMs in a shared networks by using Private VLANs.
+
+-  Supported on KVM, XenServer, and VMware hypervisors
+
+-  PVLAN-enabled shared network can be a part of multiple networks of a
+   guest VM.
+
+
+About Private VLAN
+~~~~~~~~~~~~~~~~~~
+
+In an Ethernet switch, a VLAN is a broadcast domain where hosts can
+establish direct communication with each another at Layer 2. Private
+VLAN is designed as an extension of VLAN standard to add further
+segmentation of the logical broadcast domain. A regular VLAN is a single
+broadcast domain, whereas a private VLAN partitions a larger VLAN
+broadcast domain into smaller sub-domains. A sub-domain is represented
+by a pair of VLANs: a Primary VLAN and a Secondary VLAN. The original
+VLAN that is being divided into smaller groups is called Primary, which
+implies that all VLAN pairs in a private VLAN share the same Primary
+VLAN. All the secondary VLANs exist only inside the Primary. Each
+Secondary VLAN has a specific VLAN ID associated to it, which
+differentiates one sub-domain from another.
+
+Three types of ports exist in a private VLAN domain, which essentially
+determine the behaviour of the participating hosts. Each ports will have
+its own unique set of rules, which regulate a connected host's ability
+to communicate with other connected host within the same private VLAN
+domain. Configure each host that is part of a PVLAN pair can be by using
+one of these three port designation:
+
+-  **Promiscuous**: A promiscuous port can communicate with all the
+   interfaces, including the community and isolated host ports that
+   belong to the secondary VLANs. In Promiscuous mode, hosts are
+   connected to promiscuous ports and are able to communicate directly
+   with resources on both primary and secondary VLAN. Routers, DHCP
+   servers, and other trusted devices are typically attached to
+   promiscuous ports.
+
+-  **Isolated VLANs**: The ports within an isolated VLAN cannot
+   communicate with each other at the layer-2 level. The hosts that are
+   connected to Isolated ports can directly communicate only with the
+   Promiscuous resources. If your customer device needs to have access
+   only to a gateway router, attach it to an isolated port.
+
+-  **Community VLANs**: The ports within a community VLAN can
+   communicate with each other and with the promiscuous ports, but they
+   cannot communicate with the ports in other communities at the layer-2
+   level. In a Community mode, direct communication is permitted only
+   with the hosts in the same community and those that are connected to
+   the Primary PVLAN in promiscuous mode. If your customer has two
+   devices that need to be isolated from other customers' devices, but
+   to be able to communicate among themselves, deploy them in community
+   ports.
+
+For further reading:
+
+-  `Understanding Private
+   VLANs <http://www.cisco.com/en/US/docs/switches/lan/catalyst3750/software/release/12.2_25_see/configuration/guide/swpvlan.html#wp1038379>`_
+
+-  `Cisco Systems' Private VLANs: Scalable Security in a Multi-Client
+   Environment <http://tools.ietf.org/html/rfc5517>`_
+
+-  `Private VLAN (PVLAN) on vNetwork Distributed Switch - Concept
+   Overview (1010691) <http://kb.vmware.com>`_
+
+
+Prerequisites
+~~~~~~~~~~~~~
+
+-  Use a PVLAN supported switch.
+
+   See `Private VLAN Catalyst Switch Support
+   Matrix <http://www.cisco.com/en/US/products/hw/switches/ps708/products_tech_note09186a0080094830.shtml>`_ for
+   more information.
+
+-  All the layer 2 switches, which are PVLAN-aware, are connected to
+   each other, and one of them is connected to a router. All the ports
+   connected to the host would be configured in trunk mode. Open
+   Management VLAN, Primary VLAN (public) and Secondary Isolated VLAN
+   ports. Configure the switch port connected to the router in PVLAN
+   promiscuous trunk mode, which would translate an isolated VLAN to
+   primary VLAN for the PVLAN-unaware router.
+
+   Note that only Cisco Catalyst 4500 has the PVLAN promiscuous trunk
+   mode to connect both normal VLAN and PVLAN to a PVLAN-unaware switch.
+   For the other Catalyst PVLAN support switch, connect the switch to
+   upper switch by using cables, one each for a PVLAN pair.
+
+-  Configure private VLAN on your physical switches out-of-band.
+
+-  Before you use PVLAN on XenServer and KVM, enable Open vSwitch (OVS).
+
+   .. note:: 
+      OVS on XenServer and KVM does not support PVLAN natively. Therefore,
+      CloudStack managed to simulate PVLAN on OVS for XenServer and KVM by
+      modifying the flow table.
+
+
+Creating a PVLAN-Enabled Guest Network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as administrator.
+
+#. In the left navigation, choose Infrastructure.
+
+#. On Zones, click View More.
+
+#. Click the zone to which you want to add a guest network.
+
+#. Click the Physical Network tab.
+
+#. Click the physical network you want to work with.
+
+#. On the Guest node of the diagram, click Configure.
+
+#. Click the Network tab.
+
+#. Click Add guest network.
+
+   The Add guest network window is displayed.
+
+#. Specify the following:
+
+   -  **Name**: The name of the network. This will be visible to the
+      user.
+
+   -  **Description**: The short description of the network that can be
+      displayed to users.
+
+   -  **VLAN ID**: The unique ID of the VLAN.
+
+   -  **Secondary Isolated VLAN ID**: The unique ID of the Secondary
+      Isolated VLAN.
+
+      For the description on Secondary Isolated VLAN, see
+      `About Private VLAN" <#about-private-vlan>`_.
+
+   -  **Scope**: The available scopes are Domain, Account, Project, and
+      All.
+
+      -  **Domain**: Selecting Domain limits the scope of this guest
+         network to the domain you specify. The network will not be
+         available for other domains. If you select Subdomain Access,
+         the guest network is available to all the sub domains within
+         the selected domain.
+
+      -  **Account**: The account for which the guest network is being
+         created for. You must specify the domain the account belongs
+         to.
+
+      -  **Project**: The project for which the guest network is being
+         created for. You must specify the domain the project belongs
+         to.
+
+      -  **All**: The guest network is available for all the domains,
+         account, projects within the selected zone.
+
+   -  **Network Offering**: If the administrator has configured multiple
+      network offerings, select the one you want to use for this
+      network.
+
+   -  **Gateway**: The gateway that the guests should use.
+
+   -  **Netmask**: The netmask in use on the subnet the guests will use.
+
+   -  **IP Range**: A range of IP addresses that are accessible from the
+      Internet and are assigned to the guest VMs.
+
+   -  **Network Domain**: A custom DNS suffix at the level of a network.
+      If you want to assign a special domain name to the guest VM
+      network, specify a DNS suffix.
+
+#. Click OK to confirm.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/multiple_guest_networks.rst
----------------------------------------------------------------------
diff --git a/source/networking/multiple_guest_networks.rst b/source/networking/multiple_guest_networks.rst
new file mode 100644
index 0000000..dd90f66
--- /dev/null
+++ b/source/networking/multiple_guest_networks.rst
@@ -0,0 +1,207 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Using Multiple Guest Networks
+-----------------------------
+
+In zones that use advanced networking, additional networks for guest
+traffic may be added at any time after the initial installation. You can
+also customize the domain name associated with the network by specifying
+a DNS suffix for each network.
+
+A VM's networks are defined at VM creation time. A VM cannot add or
+remove networks after it has been created, although the user can go into
+the guest and remove the IP address from the NIC on a particular
+network.
+
+Each VM has just one default network. The virtual router's DHCP reply
+will set the guest's default gateway as that for the default network.
+Multiple non-default networks may be added to a guest in addition to the
+single, required default network. The administrator can control which
+networks are available as the default network.
+
+Additional networks can either be available to all accounts or be
+assigned to a specific account. Networks that are available to all
+accounts are zone-wide. Any user with access to the zone can create a VM
+with access to that network. These zone-wide networks provide little or
+no isolation between guests.Networks that are assigned to a specific
+account provide strong isolation.
+
+
+Adding an Additional Guest Network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click Add guest network. Provide the following information:
+
+   -  **Name**: The name of the network. This will be user-visible.
+
+   -  **Display Text**: The description of the network. This will be
+      user-visible.
+
+   -  **Zone**. The name of the zone this network applies to. Each zone
+      is a broadcast domain, and therefore each zone has a different IP
+      range for the guest network. The administrator must configure the
+      IP range for each zone.
+
+   -  **Network offering**: If the administrator has configured multiple
+      network offerings, select the one you want to use for this
+      network.
+
+   -  **Guest Gateway**: The gateway that the guests should use.
+
+   -  **Guest Netmask**: The netmask in use on the subnet the guests
+      will use.
+
+#. Click Create.
+
+
+Reconfiguring Networks in VMs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+CloudStack provides you the ability to move VMs between networks and
+reconfigure a VM's network. You can remove a VM from a network and add
+to a new network. You can also change the default network of a virtual
+machine. With this functionality, hybrid or traditional server loads can
+be accommodated with ease.
+
+This feature is supported on XenServer, VMware, and KVM hypervisors.
+
+
+Prerequisites
+^^^^^^^^^^^^^
+
+Ensure that vm-tools are running on guest VMs for adding or removing
+networks to work on VMware hypervisor.
+
+
+Adding a Network
+^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, click Instances.
+
+#. Choose the VM that you want to work with.
+
+#. Click the NICs tab.
+
+#. Click Add network to VM.
+
+   The Add network to VM dialog is displayed.
+
+#. In the drop-down list, select the network that you would like to add
+   this VM to.
+
+   A new NIC is added for this network. You can view the following
+   details in the NICs page:
+
+   -  ID
+
+   -  Network Name
+
+   -  Type
+
+   -  IP Address
+
+   -  Gateway
+
+   -  Netmask
+
+   -  Is default
+
+   -  CIDR (for IPv6)
+
+
+Removing a Network
+^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, click Instances.
+
+#. Choose the VM that you want to work with.
+
+#. Click the NICs tab.
+
+#. Locate the NIC you want to remove.
+
+#. Click Remove NIC button. |remove-nic.png|
+
+#. Click Yes to confirm.
+
+
+Selecting the Default Network
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, click Instances.
+
+#. Choose the VM that you want to work with.
+
+#. Click the NICs tab.
+
+#. Locate the NIC you want to work with.
+
+#. Click the Set default NIC button. |set-default-nic.png|.
+
+#. Click Yes to confirm.
+
+Changing the Network Offering on a Guest Network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A user or administrator can change the network offering that is
+associated with an existing guest network.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. If you are changing from a network offering that uses the CloudStack
+   virtual router to one that uses external devices as network service
+   providers, you must first stop all the VMs on the network.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network you want to modify.
+
+#. In the Details tab, click Edit. |edit-icon.png|
+
+#. In Network Offering, choose the new network offering, then click
+   Apply.
+
+   A prompt is displayed asking whether you want to keep the existing
+   CIDR. This is to let you know that if you change the network
+   offering, the CIDR will be affected.
+
+   If you upgrade between virtual router as a provider and an external
+   network device as provider, acknowledge the change of CIDR to
+   continue, so choose Yes.
+
+#. Wait for the update to complete. Don't try to restart VMs until the
+   network change is complete.
+
+#. If you stopped any VMs, restart them.
+
+
+.. |remove-nic.png| image:: /_static/images/remove-nic.png
+   :alt: button to remove a NIC.
+.. |set-default-nic.png| image:: /_static/images/set-default-nic.png
+   :alt: button to set a NIC as default one.
+.. |edit-icon.png| image:: /_static/images/edit-icon.png
+   :alt: button to edit.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/multiple_ip_ranges.rst
----------------------------------------------------------------------
diff --git a/source/networking/multiple_ip_ranges.rst b/source/networking/multiple_ip_ranges.rst
new file mode 100644
index 0000000..2833c60
--- /dev/null
+++ b/source/networking/multiple_ip_ranges.rst
@@ -0,0 +1,43 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+About Multiple IP Ranges
+------------------------
+
+.. note:: The feature can only be implemented on IPv4 addresses.
+
+CloudStack provides you with the flexibility to add guest IP ranges from
+different subnets in Basic zones and security groups-enabled Advanced
+zones. For security groups-enabled Advanced zones, it implies multiple
+subnets can be added to the same VLAN. With the addition of this
+feature, you will be able to add IP address ranges from the same subnet
+or from a different one when IP address are exhausted. This would in
+turn allows you to employ higher number of subnets and thus reduce the
+address management overhead. To support this feature, the capability of
+``createVlanIpRange`` API is extended to add IP ranges also from a
+different subnet.
+
+Ensure that you manually configure the gateway of the new subnet before
+adding the IP range. Note that CloudStack supports only one gateway for
+a subnet; overlapping subnets are not currently supported.
+
+Use the ``deleteVlanRange`` API to delete IP ranges. This operation
+fails if an IP from the remove range is in use. If the remove range
+contains the IP address on which the DHCP server is running, CloudStack
+acquires a new IP from the same subnet. If no IP is available in the
+subnet, the remove operation fails.
+
+This feature is supported on KVM, xenServer, and VMware hypervisors.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/multiple_ips_on_single_nic.rst
----------------------------------------------------------------------
diff --git a/source/networking/multiple_ips_on_single_nic.rst b/source/networking/multiple_ips_on_single_nic.rst
new file mode 100644
index 0000000..b67109a
--- /dev/null
+++ b/source/networking/multiple_ips_on_single_nic.rst
@@ -0,0 +1,98 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Configuring Multiple IP Addresses on a Single NIC
+-------------------------------------------------
+
+CloudStack provides you the ability to associate multiple private IP
+addresses per guest VM NIC. In addition to the primary IP, you can
+assign additional IPs to the guest VM NIC. This feature is supported on
+all the network configurations: Basic, Advanced, and VPC. Security
+Groups, Static NAT and Port forwarding services are supported on these
+additional IPs.
+
+As always, you can specify an IP from the guest subnet; if not
+specified, an IP is automatically picked up from the guest VM subnet.
+You can view the IPs associated with for each guest VM NICs on the UI.
+You can apply NAT on these additional guest IPs by using network
+configuration option in the CloudStack UI. You must specify the NIC to
+which the IP should be associated.
+
+This feature is supported on XenServer, KVM, and VMware hypervisors.
+Note that Basic zone security groups are not supported on VMware.
+
+
+Use Cases
+~~~~~~~~~
+
+Some of the use cases are described below:
+
+-  Network devices, such as firewalls and load balancers, generally work
+   best when they have access to multiple IP addresses on the network
+   interface.
+
+-  Moving private IP addresses between interfaces or instances.
+   Applications that are bound to specific IP addresses can be moved
+   between instances.
+
+-  Hosting multiple SSL Websites on a single instance. You can install
+   multiple SSL certificates on a single instance, each associated with
+   a distinct IP address.
+
+
+Guidelines
+~~~~~~~~~~
+
+To prevent IP conflict, configure different subnets when multiple
+networks are connected to the same VM.
+
+
+Assigning Additional IPs to a VM
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI.
+
+#. In the left navigation bar, click Instances.
+
+#. Click the name of the instance you want to work with.
+
+#. In the Details tab, click NICs.
+
+#. Click View Secondary IPs.
+
+#. Click Acquire New Secondary IP, and click Yes in the confirmation
+   dialog.
+
+   You need to configure the IP on the guest VM NIC manually. CloudStack
+   will not automatically configure the acquired IP address on the VM.
+   Ensure that the IP address configuration persist on VM reboot.
+
+   Within a few moments, the new IP address should appear with the state
+   Allocated. You can now use the IP address in Port Forwarding or
+   StaticNAT rules.
+
+
+Port Forwarding and StaticNAT Services Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Because multiple IPs can be associated per NIC, you are allowed to
+select a desired IP for the Port Forwarding and StaticNAT services. The
+default is the primary IP. To enable this functionality, an extra
+optional parameter 'vmguestip' is added to the Port forwarding and
+StaticNAT APIs (enableStaticNat, createIpForwardingRule) to indicate on
+what IP address NAT need to be configured. If vmguestip is passed, NAT
+is configured on the specified private IP of the VM. if not passed, NAT
+is configured on the primary IP of the VM.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/multiple_subnets_in_shared_network.rst
----------------------------------------------------------------------
diff --git a/source/networking/multiple_subnets_in_shared_network.rst b/source/networking/multiple_subnets_in_shared_network.rst
new file mode 100644
index 0000000..53b30bb
--- /dev/null
+++ b/source/networking/multiple_subnets_in_shared_network.rst
@@ -0,0 +1,99 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Multiple Subnets in Shared Network
+----------------------------------
+
+CloudStack provides you with the flexibility to add guest IP ranges from
+different subnets in Basic zones and security groups-enabled Advanced
+zones. For security groups-enabled Advanced zones, it implies multiple
+subnets can be added to the same VLAN. With the addition of this
+feature, you will be able to add IP address ranges from the same subnet
+or from a different one when IP address are exhausted. This would in
+turn allows you to employ higher number of subnets and thus reduce the
+address management overhead. You can delete the IP ranges you have
+added.
+
+
+Prerequisites and Guidelines
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  This feature can only be implemented:
+
+   -  on IPv4 addresses
+
+   -  if virtual router is the DHCP provider
+
+   -  on KVM, xenServer, and VMware hypervisors
+
+-  Manually configure the gateway of the new subnet before adding the IP
+   range.
+
+-  CloudStack supports only one gateway for a subnet; overlapping
+   subnets are not currently supported
+
+
+Adding Multiple Subnets to a Shared Network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Infrastructure.
+
+#. On Zones, click View More, then click the zone to which you want to
+   work with..
+
+#. Click Physical Network.
+
+#. In the Guest node of the diagram, click Configure.
+
+#. Click Networks.
+
+#. Select the networks you want to work with.
+
+#. Click View IP Ranges.
+
+#. Click Add IP Range.
+
+   The Add IP Range dialog is displayed, as follows:
+
+   |add-ip-range.png|
+
+#. Specify the following:
+
+   All the fields are mandatory.
+
+   -  **Gateway**: The gateway for the tier you create. Ensure that the
+      gateway is within the Super CIDR range that you specified while
+      creating the VPC, and is not overlapped with the CIDR of any
+      existing tier within the VPC.
+
+   -  **Netmask**: The netmask for the tier you create.
+
+      For example, if the VPC CIDR is 10.0.0.0/16 and the network tier
+      CIDR is 10.0.1.0/24, the gateway of the tier is 10.0.1.1, and the
+      netmask of the tier is 255.255.255.0.
+
+   -  **Start IP/ End IP**: A range of IP addresses that are accessible
+      from the Internet and will be allocated to guest VMs. Enter the
+      first and last IP addresses that define a range that CloudStack
+      can assign to guest VMs .
+
+#. Click OK.
+
+
+.. |add-ip-range.png| image:: /_static/images/add-ip-range.png
+   :alt: adding an IP range to a network.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/networking_in_pod.rst
----------------------------------------------------------------------
diff --git a/source/networking/networking_in_pod.rst b/source/networking/networking_in_pod.rst
new file mode 100644
index 0000000..b7305be
--- /dev/null
+++ b/source/networking/networking_in_pod.rst
@@ -0,0 +1,45 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Networking in a Pod
+-------------------
+
+The figure below illustrates network setup within a single pod. The
+hosts are connected to a pod-level switch. At a minimum, the hosts
+should have one physical uplink to each switch. Bonded NICs are
+supported as well. The pod-level switch is a pair of redundant gigabit
+switches with 10 G uplinks.
+
+|networksinglepod.png| 
+
+Servers are connected as follows:
+
+-  Storage devices are connected to only the network that carries
+   management traffic.
+
+-  Hosts are connected to networks for both management traffic and
+   public traffic.
+
+-  Hosts are also connected to one or more networks carrying guest
+   traffic.
+
+We recommend the use of multiple physical Ethernet cards to implement
+each network interface as well as redundant switch fabric in order to
+maximize throughput and improve reliability.
+
+
+.. |networksinglepod.png| image:: /_static/images/network-singlepod.png
+   :alt: diagram showing logical view of network in a pod.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/networking_in_zone.rst
----------------------------------------------------------------------
diff --git a/source/networking/networking_in_zone.rst b/source/networking/networking_in_zone.rst
new file mode 100644
index 0000000..ae6231d
--- /dev/null
+++ b/source/networking/networking_in_zone.rst
@@ -0,0 +1,34 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Networking in a Zone
+--------------------
+
+The following figure illustrates the network setup within a single zone.
+
+|networksetupzone.png|
+
+A firewall for management traffic operates in the NAT mode. The network
+typically is assigned IP addresses in the 192.168.0.0/16 Class B private
+address space. Each pod is assigned IP addresses in the 192.168.\*.0/24
+Class C private address space.
+
+Each zone has its own set of public IP addresses. Public IP addresses
+from different zones do not overlap.
+
+
+.. |networksetupzone.png| image:: /_static/images/network-setup-zone.png
+   :alt: Depicts network setup in a single zone.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/palo_alto_config.rst
----------------------------------------------------------------------
diff --git a/source/networking/palo_alto_config.rst b/source/networking/palo_alto_config.rst
new file mode 100644
index 0000000..456b3c2
--- /dev/null
+++ b/source/networking/palo_alto_config.rst
@@ -0,0 +1,475 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Setup a Palo Alto Networks Firewall
+-----------------------------------
+
+
+Functionality Provided
+~~~~~~~~~~~~~~~~~~~~~~
+
+This implementation enables the orchestration of a Palo Alto Networks Firewall 
+from within CloudStack UI and API.  
+
+**The following features are supported**:
+
+-  List/Add/Delete Palo Alto Networks service provider
+
+-  List/Add/Delete Palo Alto Networks network service offering
+
+-  List/Add/Delete Palo Alto Networks network using the above service offering
+
+-  Add an instance to a Palo Alto Networks network
+
+-  Source NAT management on network create and delete
+
+-  List/Add/Delete Ingress Firewall rule
+
+-  List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules 
+   supported)
+
+-  List/Add/Delete Port Forwarding rule
+
+-  List/Add/Delete Static NAT rule
+
+-  Apply a Threat Profile to all firewall rules (more details in the 
+   Additional Features section)
+
+-  Apply a Log Forwarding profile to all firewall rules (more details in the 
+   Additional Features section)
+
+
+
+Initial Palo Alto Networks Firewall Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Anatomy of the Palo Alto Networks Firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+-  In **'Network > Interfaces'** there is a list of physical interfaces as 
+   well as aggregated physical interfaces which are used for managing traffic 
+   in and out of the Palo Alto Networks Firewall device.
+
+-  In **'Network > Zones'** there is a list of the different configuration 
+   zones.  This implementation will use two zones; a public (defaults to 
+   'untrust') and private (defaults to 'trust') zone.
+
+-  In **'Network > Virtual Routers'** there is a list of VRs which handle 
+   traffic routing for the Palo Alto Firewall.  We only use a single Virtual 
+   Router on the firewall and it is used to handle all the routing to the next 
+   network hop.
+
+-  In **'Objects > Security Profile Groups'** there is a list of profiles 
+   which can be applied to firewall rules.  These profiles are used to better 
+   understand the types of traffic that is flowing through your network.  
+   Configured when you add the firewall provider to CloudStack.
+
+-  In **'Objects > Log Forwarding'** there is a list of profiles which can be 
+   applied to firewall rules.  These profiles are used to better track the 
+   logs generated by the firewall.  Configured when you add the firewall 
+   provider to CloudStack.
+
+-  In **'Policies > Security'** there is a list of firewall rules that are 
+   currently configured.  You will not need to modify this section because it 
+   will be completely automated by CloudStack, but you can review the firewall 
+   rules which have been created here.
+
+-  In **'Policies > NAT'** there is a list of the different NAT rules.  You 
+   will not need to modify this section because it will be completely 
+   automated by CloudStack, but you can review the different NAT rules that 
+   have been created here.  Source NAT, Static NAT and Destination NAT (Port 
+   Forwarding) rules will show up in this list.
+
+
+
+Configure the Public / Private Zones on the firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+No manual configuration is required to setup these zones because CloudStack 
+will configure them automatically when you add the Palo Alto Networks firewall 
+device to CloudStack as a service provider.  This implementation depends on 
+two zones, one for the public side and one for the private side of the 
+firewall.  
+
+-  The public zone (defaults to 'untrust') will contain all of the public 
+   interfaces and public IPs.
+
+-  The private zone (defaults to 'trust') will contain all of the private 
+   interfaces and guest network gateways.
+
+The NAT and firewall rules will be configured between these zones.
+
+
+
+Configure the Public / Private Interfaces on the firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This implementation supports standard physical interfaces as well as grouped 
+physical interfaces called aggregated interfaces.  Both standard interfaces 
+and aggregated interfaces are treated the same, so they can be used 
+interchangeably. For this document, we will assume that we are using 
+'ethernet1/1' as the public interface and 'ethernet1/2' as the private 
+interface.  If aggregated interfaces where used, you would use something 
+like 'ae1' and 'ae2' as the interfaces.
+
+This implementation requires that the 'Interface Type' be set to 'Layer3' for 
+both the public and private interfaces.  If you want to be able to use the 
+'Untagged' VLAN tag for public traffic in CloudStack, you will need to enable 
+support for it in the public 'ethernet1/1' interface (details below).  
+
+**Steps to configure the Public Interface**:
+
+#. Log into Palo Alto Networks Firewall
+
+#. Navigate to 'Network > Interfaces'
+
+#. Click on 'ethernet1/1' (for aggregated ethernet, it will probably be called 
+   'ae1')
+
+#. Select 'Layer3' from the 'Interface Type' list
+
+#. Click 'Advanced'
+
+#. Check the 'Untagged Subinterface' check-box
+
+#. Click 'OK'
+
+**Steps to configure the Private Interface**:
+
+#. Click on 'ethernet1/2' (for aggregated ethernet, it will probably be called 
+   'ae2')
+
+#. Select 'Layer3' from the 'Interface Type' list
+
+#. Click 'OK'
+
+
+
+Configure a Virtual Router on the firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The Virtual Router on the Palo Alto Networks Firewall is not to be confused 
+with the Virtual Routers that CloudStack provisions.  For this implementation, 
+the Virtual Router on the Palo Alto Networks Firewall will ONLY handle the 
+upstream routing from the Firewall to the next hop.
+
+**Steps to configure the Virtual Router**:
+
+#. Log into Palo Alto Networks Firewall
+
+#. Navigate to 'Network > Virtual Routers'
+
+#. Select the 'default' Virtual Router or Add a new Virtual Router if there 
+   are none in the list
+
+   - If you added a new Virtual Router, you will need to give it a 'Name'
+
+#. Navigate to 'Static Routes > IPv4'
+
+#. 'Add' a new static route
+
+   -  **Name**: next_hop (you can name it anything you want)
+   
+   -  **Destination**: 0.0.0.0/0 (send all traffic to this route)
+   
+   -  **Interface**: ethernet1/1 (or whatever you set your public interface 
+      as)
+   
+   -  **Next Hop**: (specify the gateway IP for the next hop in your network)
+   
+   -  Click 'OK'
+
+#. Click 'OK'
+
+
+
+Configure the default Public Subinterface
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The current implementation of the Palo Alto Networks firewall integration uses 
+CIDRs in the form of 'w.x.y.z/32' for the public IP addresses that CloudStack 
+provisions.  Because no broadcast or gateway IPs are in this single IP range, 
+there is no way for the firewall to route the traffic for these IPs.  To route 
+the traffic for these IPs, we create a single subinterface on the public 
+interface with an IP and a CIDR which encapsulates the CloudStack public IP 
+range.  This IP will need to be inside the subnet defined by the CloudStack 
+public range netmask, but outside the CloudStack public IP range.  The CIDR 
+should reflect the same subnet defined by the CloudStack public range netmask.  
+The name of the subinterface is determined by the VLAN configured for the 
+public range in CloudStack.
+
+To clarify this concept, we will use the following example.
+
+**Example CloudStack Public Range Configuration**:
+
+-  **Gateway**: 172.30.0.1
+
+-  **Netmask**: 255.255.255.0
+
+-  **IP Range**: 172.30.0.100 - 172.30.0.199
+
+-  **VLAN**: Untagged
+
+**Configure the Public Subinterface**:
+
+#. Log into Palo Alto Networks Firewall
+
+#. Navigate to 'Network > Interfaces'
+
+#. Select the 'ethernet1/1' line (not clicking on the name)
+
+#. Click 'Add Subinterface' at the bottom of the window
+
+#. Enter 'Interface Name': 'ethernet1/1' . '9999' 
+
+   -  9999 is used if the CloudStack public range VLAN is 'Untagged'
+   
+   -  If the CloudStack public range VLAN is tagged (eg: 333), then the name 
+      will reflect that tag
+
+#. The 'Tag' is the VLAN tag that the traffic is sent to the next hop with, so 
+   set it accordingly.  If you are passing 'Untagged' traffic from CloudStack 
+   to your next hop, leave it blank.  If you want to pass tagged traffic from 
+   CloudStack, specify the tag.
+
+#. Select 'default' from the 'Config > Virtual Router' drop-down (assuming 
+   that is what your virtual router is called)
+
+#. Click the 'IPv4' tab
+
+#. Select 'Static' from the 'Type' radio options
+
+#. Click 'Add' in the 'IP' section
+
+#. Enter '172.30.0.254/24' in the new line
+
+   -  The IP can be any IP outside the CloudStack public IP range, but inside 
+      the CloudStack public range netmask (it can NOT be the gateway IP)
+   
+   -  The subnet defined by the CIDR should match the CloudStack public range 
+      netmask
+   
+#. Click 'OK'
+
+
+Commit configuration on the Palo Alto Networks Firewall
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In order for all the changes we just made to take effect, we need to commit 
+the changes.
+
+#. Click the 'Commit' link in the top right corner of the window
+
+#. Click 'OK' in the commit window overlay
+
+#. Click 'Close' to the resulting commit status window after the commit 
+   finishes
+
+
+
+Setup the Palo Alto Networks Firewall in CloudStack
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add the Palo Alto Networks Firewall as a Service Provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Navigate to 'Infrastructure > Zones > ZONE_NAME > Physical Network > 
+   NETWORK_NAME (guest) > Configure; Network Service Providers'
+
+#. Click on 'Palo Alto' in the list
+
+#. Click 'View Devices'
+
+#. Click 'Add Palo Alto Device'
+
+#. Enter your configuration in the overlay.  This example will reflect the 
+   details previously used in this guide.
+
+   -  **IP Address**: (the IP of the Palo Alto Networks Firewall)
+   
+   -  **Username**: (the admin username for the firewall)
+   
+   -  **Password**: (the admin password for the firewall)
+   
+   -  **Type**: Palo Alto Firewall
+   
+   -  **Public Interface**: ethernet1/1 (use what you setup earlier as the 
+      public interface if it is different from my examples)
+   
+   -  **Private Interface**: ethernet1/2 (use what you setup earlier as the 
+      private interface if it is different from my examples)
+   
+   -  **Number of Retries**: 2 (the default is fine)
+   
+   -  **Timeout**: 300 (the default is fine) 
+   
+   -  **Public Network**: untrust (this is the public zone on the firewall and 
+      did not need to be configured)
+   
+   -  **Private Network**: trust (this is the private zone on the firewall and 
+      did not need to be configured)
+   
+   -  **Virtual Router**: default (this is the name of the Virtual Router we 
+      setup on the firewall)
+   
+   -  **Palo Alto Threat Profile**: (not required.  name of the 'Security 
+      Profile Groups' to apply.  more details in the 'Additional Features' 
+      section)
+   
+   -  **Palo Alto Log Profile**: (not required.  name of the 'Log Forwarding' 
+      profile to apply.  more details in the 'Additional Features' section)
+   
+   -  **Capacity**: (not required) 
+   
+   -  **Dedicated**: (not required)
+
+#. Click 'OK'
+
+#. Click on 'Palo Alto' in the breadcrumbs to go back one screen.
+
+#. Click on 'Enable Provider' |EnableDisableFeature.png|
+
+
+Add a Network Service Offering to use the new Provider
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There are 6 'Supported Services' that need to be configured in the network 
+service offering for this functionality.  They are DHCP, DNS, Firewall, Source 
+NAT, Static NAT and Port Forwarding.  For the other settings, there are 
+probably additional configurations which will work, but I will just document a 
+common case.
+
+#. Navigate to 'Service Offerings'
+
+#. In the drop-down at the top, select 'Network Offerings'
+
+#. Click 'Add Network Offering'
+
+   -  **Name**: (name it whatever you want)
+
+   -  **Description**: (again, can be whatever you want)
+
+   -  **Guest Type**: Isolated
+
+   -  **Supported Services**:
+
+      -  **DHCP**: Provided by 'VirtualRouter'
+
+      -  **DNS**: Provided by 'VirtualRouter'
+
+      -  **Firewall**: Provided by 'PaloAlto'
+
+      -  **Source NAT**: Provided by 'PaloAlto'
+
+      -  **Static NAT**: Provided by 'PaloAlto'
+
+      -  **Port Forwarding**: Provided by 'PaloAlto'
+
+   -  **System Offering for Router**: System Offering For Software Router
+
+   -  **Supported Source NAT Type**: Per account (this is the only supported 
+      option)
+
+   -  **Default egress policy**: (both 'Allow' and 'Deny' are supported)
+
+#. Click 'OK'
+
+#. Click on the newly created service offering
+
+#. Click 'Enable network offering' |EnableDisableFeature.png|
+
+When adding networks in CloudStack, select this network offering to use the 
+Palo Alto Networks firewall.
+
+
+Additional Features
+~~~~~~~~~~~~~~~~~~~
+
+In addition to the standard functionality exposed by CloudStack, we have added 
+a couple additional features to this implementation.  We did not add any new 
+screens to CloudStack, but we have added a couple fields to the 'Add Palo Alto 
+Service Provider' screen which will add functionality globally for the device.
+
+
+Palo Alto Networks Threat Profile
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This feature allows you to specify a 'Security Profile Group' to be applied to 
+all of the firewall rules which are created on the Palo Alto Networks firewall 
+device.
+
+To create a 'Security Profile Group' on the Palo Alto Networks firewall, do 
+the following: 
+
+#. Log into the Palo Alto Networks firewall
+
+#. Navigate to 'Objects > Security Profile Groups'
+
+#. Click 'Add' at the bottom of the page to add a new group
+
+#. Give the group a Name and specify the profiles you would like to include in 
+   the group
+
+#. Click 'OK'
+
+#. Click the 'Commit' link in the top right of the screen and follow the on 
+   screen instructions
+
+Once you have created a profile, you can reference it by Name in the 'Palo 
+Alto Threat Profile' field in the 'Add the Palo Alto Networks Firewall as a 
+Service Provider' step.
+
+
+Palo Alto Networks Log Forwarding Profile
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This feature allows you to specify a 'Log Forwarding' profile to better manage 
+where the firewall logs are sent to.  This is helpful for keeping track of 
+issues that can arise on the firewall.
+
+To create a 'Log Forwarding' profile on the Palo Alto Networks Firewall, do 
+the following: 
+
+#. Log into the Palo Alto Networks firewall
+
+#. Navigate to 'Objects > Log Forwarding'
+
+#. Click 'Add' at the bottom of the page to add a new profile
+
+#. Give the profile a Name and specify the details you want for the traffic 
+   and threat settings
+
+#. Click 'OK'
+
+#. Click the 'Commit' link in the top right of the screen and follow the on 
+   screen instructions
+
+Once you have created a profile, you can reference it by Name in the 'Palo 
+Alto Log Profile' field in the 'Add the Palo Alto Networks Firewall as a 
+Service Provider' step.
+
+
+
+Limitations
+~~~~~~~~~~~
+
+-  The implementation currently only supports a single public IP range in 
+   CloudStack
+   
+-  Usage tracking is not yet implemented
+
+.. |EnableDisableFeature.png| image:: /_static/images/enable-disable-autoscale.png
+   :alt: button to enable or disable feature.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/persistent_networks.rst
----------------------------------------------------------------------
diff --git a/source/networking/persistent_networks.rst b/source/networking/persistent_networks.rst
new file mode 100644
index 0000000..9aa15d5
--- /dev/null
+++ b/source/networking/persistent_networks.rst
@@ -0,0 +1,94 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Persistent Networks
+-------------------
+
+The network that you can provision without having to deploy any VMs on
+it is called a persistent network. A persistent network can be part of a
+VPC or a non-VPC environment.
+
+When you create other types of network, a network is only a database
+entry until the first VM is created on that network. When the first VM
+is created, a VLAN ID is assigned and the network is provisioned. Also,
+when the last VM is destroyed, the VLAN ID is released and the network
+is no longer available. With the addition of persistent network, you
+will have the ability to create a network in CloudStack in which
+physical devices can be deployed without having to run any VMs.
+Additionally, you can deploy physical devices on that network.
+
+One of the advantages of having a persistent network is that you can
+create a VPC with a tier consisting of only physical devices. For
+example, you might create a VPC for a three-tier application, deploy VMs
+for Web and Application tier, and use physical machines for the Database
+tier. Another use case is that if you are providing services by using
+physical hardware, you can define the network as persistent and
+therefore even if all its VMs are destroyed the services will not be
+discontinued.
+
+
+Persistent Network Considerations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  Persistent network is designed for isolated networks.
+
+-  All default network offerings are non-persistent.
+
+-  A network offering cannot be editable because changing it affects the
+   behavior of the existing networks that were created using this
+   network offering.
+
+-  When you create a guest network, the network offering that you select
+   defines the network persistence. This in turn depends on whether
+   persistent network is enabled in the selected network offering.
+
+-  An existing network can be made persistent by changing its network
+   offering to an offering that has the Persistent option enabled. While
+   setting this property, even if the network has no running VMs, the
+   network is provisioned.
+
+-  An existing network can be made non-persistent by changing its
+   network offering to an offering that has the Persistent option
+   disabled. If the network has no running VMs, during the next network
+   garbage collection run the network is shut down.
+
+-  When the last VM on a network is destroyed, the network garbage
+   collector checks if the network offering associated with the network
+   is persistent, and shuts down the network only if it is
+   non-persistent.
+
+
+Creating a Persistent Guest Network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To create a persistent network, perform the following:
+
+#. Create a network offering with the Persistent option enabled.
+
+   See `"Creating a New Network Offering" 
+   <networking.html#creating-a-new-network-offering>`_.
+
+#. Select Network from the left navigation pane.
+
+#. Select the guest network that you want to offer this network service
+   to.
+
+#. Click the Edit button.
+
+#. From the Network Offering drop-down, select the persistent network
+   offering you have just created.
+
+#. Click OK.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/portable_ips.rst
----------------------------------------------------------------------
diff --git a/source/networking/portable_ips.rst b/source/networking/portable_ips.rst
new file mode 100644
index 0000000..7daed13
--- /dev/null
+++ b/source/networking/portable_ips.rst
@@ -0,0 +1,131 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+   
+
+Portable IPs
+------------
+
+About Portable IP
+~~~~~~~~~~~~~~~~~
+
+Portable IPs in CloudStack are region-level pool of IPs, which are
+elastic in nature, that can be transferred across geographically
+separated zones. As an administrator, you can provision a pool of
+portable public IPs at region level and are available for user
+consumption. The users can acquire portable IPs if admin has provisioned
+portable IPs at the region level they are part of. These IPs can be use
+for any service within an advanced zone. You can also use portable IPs
+for EIP services in basic zones.
+
+The salient features of Portable IP are as follows:
+
+-  IP is statically allocated
+
+-  IP need not be associated with a network
+
+-  IP association is transferable across networks
+
+-  IP is transferable across both Basic and Advanced zones
+
+-  IP is transferable across VPC, non-VPC isolated and shared networks
+
+-  Portable IP transfer is available only for static NAT.
+
+
+Guidelines
+^^^^^^^^^^
+
+Before transferring to another network, ensure that no network rules
+(Firewall, Static NAT, Port Forwarding, and so on) exist on that
+portable IP.
+
+
+Configuring Portable IPs
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, click Regions.
+
+#. Choose the Regions that you want to work with.
+
+#. Click View Portable IP.
+
+#. Click Portable IP Range.
+
+   The Add Portable IP Range window is displayed.
+
+#. Specify the following:
+
+   -  **Start IP/ End IP**: A range of IP addresses that are accessible
+      from the Internet and will be allocated to guest VMs. Enter the
+      first and last IP addresses that define a range that CloudStack
+      can assign to guest VMs.
+
+   -  **Gateway**: The gateway in use for the Portable IP addresses you
+      are configuring.
+
+   -  **Netmask**: The netmask associated with the Portable IP range.
+
+   -  **VLAN**: The VLAN that will be used for public traffic.
+
+#. Click OK.
+
+
+Acquiring a Portable IP
+~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click Acquire New IP.
+
+   The Acquire New IP window is displayed.
+
+#. Specify whether you want cross-zone IP or not.
+
+#. Click Yes in the confirmation dialog.
+
+   Within a few moments, the new IP address should appear with the state
+   Allocated. You can now use the IP address in port forwarding or
+   static NAT rules.
+
+
+Transferring Portable IP
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+An IP can be transferred from one network to another only if Static NAT
+is enabled. However, when a portable IP is associated with a network,
+you can use it for any service in the network.
+
+To transfer a portable IP across the networks, execute the following
+API:
+
+.. code:: bash
+
+    http://localhost:8096/client/api?command=enableStaticNat&response=json&ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&virtualmachineid=a242c476-ef37-441e-9c7b-b303e2a9cb4f&networkid=6e7cd8d1-d1ba-4c35-bdaf-333354cbd49810
+
+Replace the UUID with appropriate UUID. For example, if you want to
+transfer a portable IP to network X and VM Y in a network, execute the
+following:
+
+.. code:: bash
+
+    http://localhost:8096/client/api?command=enableStaticNat&response=json&ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&virtualmachineid=Y&networkid=X

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/public_ips_and_vlans_for_accounts.rst
----------------------------------------------------------------------
diff --git a/source/networking/public_ips_and_vlans_for_accounts.rst b/source/networking/public_ips_and_vlans_for_accounts.rst
new file mode 100644
index 0000000..42a4640
--- /dev/null
+++ b/source/networking/public_ips_and_vlans_for_accounts.rst
@@ -0,0 +1,154 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Reserving Public IP Addresses and VLANs for Accounts
+----------------------------------------------------
+
+CloudStack provides you the ability to reserve a set of public IP
+addresses and VLANs exclusively for an account. During zone creation,
+you can continue defining a set of VLANs and multiple public IP ranges.
+This feature extends the functionality to enable you to dedicate a fixed
+set of VLANs and guest IP addresses for a tenant.
+
+Note that if an account has consumed all the VLANs and IPs dedicated to
+it, the account can acquire two more resources from the system.
+CloudStack provides the root admin with two configuration parameter to
+modify this default behavior: use.system.public.ips and
+use.system.guest.vlans. These global parameters enable the root admin to
+disallow an account from acquiring public IPs and guest VLANs from the
+system, if the account has dedicated resources and these dedicated
+resources have all been consumed. Both these configurations are
+configurable at the account level.
+
+This feature provides you the following capabilities:
+
+-  Reserve a VLAN range and public IP address range from an Advanced
+   zone and assign it to an account
+
+-  Disassociate a VLAN and public IP address range from an account
+
+-  View the number of public IP addresses allocated to an account
+
+-  Check whether the required range is available and is conforms to
+   account limits.
+
+   The maximum IPs per account limit cannot be superseded.
+
+
+Dedicating IP Address Ranges to an Account
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Log in to the CloudStack UI as administrator.
+
+#. In the left navigation bar, click Infrastructure.
+
+#. In Zones, click View All.
+
+#. Choose the zone you want to work with.
+
+#. Click the Physical Network tab.
+
+#. In the Public node of the diagram, click Configure.
+
+#. Click the IP Ranges tab.
+
+   You can either assign an existing IP range to an account, or create a
+   new IP range and assign to an account.
+
+#. To assign an existing IP range to an account, perform the following:
+
+   #. Locate the IP range you want to work with.
+
+   #. Click Add Account |addAccount-icon.png| button.
+
+      The Add Account dialog is displayed.
+
+   #. Specify the following:
+
+      -  **Account**: The account to which you want to assign the IP
+         address range.
+
+      -  **Domain**: The domain associated with the account.
+
+      To create a new IP range and assign an account, perform the
+      following:
+
+      #. Specify the following:
+
+         -  **Gateway**
+
+         -  **Netmask**
+
+         -  **VLAN**
+
+         -  **Start IP**
+
+         -  **End IP**
+
+         -  **Account**: Perform the following:
+
+            #. Click Account.
+
+               The Add Account page is displayed.
+
+            #. Specify the following:
+
+               -  **Account**: The account to which you want to
+                  assign an IP address range.
+
+               -  **Domain**: The domain associated with the
+                  account.
+
+            #. Click OK.
+
+      #. Click Add.
+
+
+Dedicating VLAN Ranges to an Account
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. After the CloudStack Management Server is installed, log in to the
+   CloudStack UI as administrator.
+
+#. In the left navigation bar, click Infrastructure.
+
+#. In Zones, click View All.
+
+#. Choose the zone you want to work with.
+
+#. Click the Physical Network tab.
+
+#. In the Guest node of the diagram, click Configure.
+
+#. Select the Dedicated VLAN Ranges tab.
+
+#. Click Dedicate VLAN Range.
+
+   The Dedicate VLAN Range dialog is displayed.
+
+#. Specify the following:
+
+   -  **VLAN Range**: The VLAN range that you want to assign to an
+      account.
+
+   -  **Account**: The account to which you want to assign the
+      selected VLAN range.
+
+   -  **Domain**: The domain associated with the account.
+
+
+.. |addAccount-icon.png| image:: /_static/images/addAccount-icon.png
+   :alt: button to assign an IP range to an account.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/releasing_an_ip_address.rst
----------------------------------------------------------------------
diff --git a/source/networking/releasing_an_ip_address.rst b/source/networking/releasing_an_ip_address.rst
new file mode 100644
index 0000000..a662d0d
--- /dev/null
+++ b/source/networking/releasing_an_ip_address.rst
@@ -0,0 +1,38 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+Releasing an IP Address
+-----------------------
+
+When the last rule for an IP address is removed, you can release that IP
+address. The IP address still belongs to the VPC; however, it can be
+picked up for any guest network again.
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click the IP address you want to release.
+
+#. Click the Release IP button. |ReleaseIPButton.png|
+
+
+.. |ReleaseIPButton.png| image:: /_static/images/release-ip-icon.png
+   :alt: button to release an IP


[05/40] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking2.rst
----------------------------------------------------------------------
diff --git a/source/networking2.rst b/source/networking2.rst
deleted file mode 100644
index b3743fc..0000000
--- a/source/networking2.rst
+++ /dev/null
@@ -1,7033 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information#
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-   
-
-Managing Networks and Traffic
-=============================
-
-In a CloudStack, guest VMs can communicate with each other using shared
-infrastructure with the security and user perception that the guests
-have a private LAN. The CloudStack virtual router is the main component
-providing networking features for guest traffic.
-
-Guest Traffic
--------------
-
-A network can carry guest traffic only between VMs within one zone.
-Virtual machines in different zones cannot communicate with each other
-using their IP addresses; they must communicate with each other by
-routing through a public IP address.
-
-See a typical guest traffic setup given below:
-
-|guest-traffic-setup.png| 
-
-Typically, the Management Server automatically creates a virtual router
-for each network. A virtual router is a special virtual machine that
-runs on the hosts. Each virtual router in an isolated network has three
-network interfaces. If multiple public VLAN is used, the router will
-have multiple public interfaces. Its eth0 interface serves as the
-gateway for the guest traffic and has the IP address of 10.1.1.1. Its
-eth1 interface is used by the system to configure the virtual router.
-Its eth2 interface is assigned a public IP address for public traffic.
-If multiple public VLAN is used, the router will have multiple public
-interfaces.
-
-The virtual router provides DHCP and will automatically assign an IP
-address for each guest VM within the IP range assigned for the network.
-The user can manually reconfigure guest VMs to assume different IP
-addresses.
-
-Source NAT is automatically configured in the virtual router to forward
-outbound traffic for all guest VMs
-
-Networking in a Pod
--------------------
-
-The figure below illustrates network setup within a single pod. The
-hosts are connected to a pod-level switch. At a minimum, the hosts
-should have one physical uplink to each switch. Bonded NICs are
-supported as well. The pod-level switch is a pair of redundant gigabit
-switches with 10 G uplinks.
-
-|networksinglepod.png| 
-
-Servers are connected as follows:
-
--  
-
-   Storage devices are connected to only the network that carries
-   management traffic.
-
--  
-
-   Hosts are connected to networks for both management traffic and
-   public traffic.
-
--  
-
-   Hosts are also connected to one or more networks carrying guest
-   traffic.
-
-We recommend the use of multiple physical Ethernet cards to implement
-each network interface as well as redundant switch fabric in order to
-maximize throughput and improve reliability.
-
-Networking in a Zone
---------------------
-
-The following figure illustrates the network setup within a single zone.
-
-|networksetupzone.png|
-
-A firewall for management traffic operates in the NAT mode. The network
-typically is assigned IP addresses in the 192.168.0.0/16 Class B private
-address space. Each pod is assigned IP addresses in the 192.168.\*.0/24
-Class C private address space.
-
-Each zone has its own set of public IP addresses. Public IP addresses
-from different zones do not overlap.
-
-Basic Zone Physical Network Configuration
------------------------------------------
-
-In a basic network, configuring the physical network is fairly
-straightforward. You only need to configure one guest network to carry
-traffic that is generated by guest VMs. When you first add a zone to
-CloudStack, you set up the guest network through the Add Zone screens.
-
-Advanced Zone Physical Network Configuration
---------------------------------------------
-
-Within a zone that uses advanced networking, you need to tell the
-Management Server how the physical network is set up to carry different
-kinds of traffic in isolation.
-
-Configure Guest Traffic in an Advanced Zone
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-These steps assume you have already logged in to the CloudStack UI. To
-configure the base guest network:
-
-#. 
-
-   In the left navigation, choose Infrastructure. On Zones, click View
-   More, then click the zone to which you want to add a network.
-
-#. 
-
-   Click the Network tab.
-
-#. 
-
-   Click Add guest network.
-
-   The Add guest network window is displayed:
-
-   |addguestnetwork.png|
-
-#. 
-
-   Provide the following information:
-
-   -  
-
-      **Name**. The name of the network. This will be user-visible
-
-   -  
-
-      **Display Text**: The description of the network. This will be
-      user-visible
-
-   -  
-
-      **Zone**: The zone in which you are configuring the guest network.
-
-   -  
-
-      **Network offering**: If the administrator has configured multiple
-      network offerings, select the one you want to use for this network
-
-   -  
-
-      **Guest Gateway**: The gateway that the guests should use
-
-   -  
-
-      **Guest Netmask**: The netmask in use on the subnet the guests
-      will use
-
-#. 
-
-   Click OK.
-
-Configure Public Traffic in an Advanced Zone
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In a zone that uses advanced networking, you need to configure at least
-one range of IP addresses for Internet traffic.
-
-Configuring a Shared Guest Network
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as administrator.
-
-#. 
-
-   In the left navigation, choose Infrastructure.
-
-#. 
-
-   On Zones, click View More.
-
-#. 
-
-   Click the zone to which you want to add a guest network.
-
-#. 
-
-   Click the Physical Network tab.
-
-#. 
-
-   Click the physical network you want to work with.
-
-#. 
-
-   On the Guest node of the diagram, click Configure.
-
-#. 
-
-   Click the Network tab.
-
-#. 
-
-   Click Add guest network.
-
-   The Add guest network window is displayed.
-
-#. 
-
-   Specify the following:
-
-   -  
-
-      **Name**: The name of the network. This will be visible to the
-      user.
-
-   -  
-
-      **Description**: The short description of the network that can be
-      displayed to users.
-
-   -  
-
-      **VLAN ID**: The unique ID of the VLAN.
-
-   -  
-
-      **Isolated VLAN ID**: The unique ID of the Secondary Isolated
-      VLAN.
-
-   -  
-
-      **Scope**: The available scopes are Domain, Account, Project, and
-      All.
-
-      -  
-
-         **Domain**: Selecting Domain limits the scope of this guest
-         network to the domain you specify. The network will not be
-         available for other domains. If you select Subdomain Access,
-         the guest network is available to all the sub domains within
-         the selected domain.
-
-      -  
-
-         **Account**: The account for which the guest network is being
-         created for. You must specify the domain the account belongs
-         to.
-
-      -  
-
-         **Project**: The project for which the guest network is being
-         created for. You must specify the domain the project belongs
-         to.
-
-      -  
-
-         **All**: The guest network is available for all the domains,
-         account, projects within the selected zone.
-
-   -  
-
-      **Network Offering**: If the administrator has configured multiple
-      network offerings, select the one you want to use for this
-      network.
-
-   -  
-
-      **Gateway**: The gateway that the guests should use.
-
-   -  
-
-      **Netmask**: The netmask in use on the subnet the guests will use.
-
-   -  
-
-      **IP Range**: A range of IP addresses that are accessible from the
-      Internet and are assigned to the guest VMs.
-
-      If one NIC is used, these IPs should be in the same CIDR in the
-      case of IPv6.
-
-   -  
-
-      **IPv6 CIDR**: The network prefix that defines the guest network
-      subnet. This is the CIDR that describes the IPv6 addresses in use
-      in the guest networks in this zone. To allot IP addresses from
-      within a particular address block, enter a CIDR.
-
-   -  
-
-      **Network Domain**: A custom DNS suffix at the level of a network.
-      If you want to assign a special domain name to the guest VM
-      network, specify a DNS suffix.
-
-#. 
-
-   Click OK to confirm.
-
-Using Multiple Guest Networks
------------------------------
-
-In zones that use advanced networking, additional networks for guest
-traffic may be added at any time after the initial installation. You can
-also customize the domain name associated with the network by specifying
-a DNS suffix for each network.
-
-A VM's networks are defined at VM creation time. A VM cannot add or
-remove networks after it has been created, although the user can go into
-the guest and remove the IP address from the NIC on a particular
-network.
-
-Each VM has just one default network. The virtual router's DHCP reply
-will set the guest's default gateway as that for the default network.
-Multiple non-default networks may be added to a guest in addition to the
-single, required default network. The administrator can control which
-networks are available as the default network.
-
-Additional networks can either be available to all accounts or be
-assigned to a specific account. Networks that are available to all
-accounts are zone-wide. Any user with access to the zone can create a VM
-with access to that network. These zone-wide networks provide little or
-no isolation between guests.Networks that are assigned to a specific
-account provide strong isolation.
-
-Adding an Additional Guest Network
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, choose Network.
-
-#. 
-
-   Click Add guest network. Provide the following information:
-
-   -  
-
-      **Name**: The name of the network. This will be user-visible.
-
-   -  
-
-      **Display Text**: The description of the network. This will be
-      user-visible.
-
-   -  
-
-      **Zone**. The name of the zone this network applies to. Each zone
-      is a broadcast domain, and therefore each zone has a different IP
-      range for the guest network. The administrator must configure the
-      IP range for each zone.
-
-   -  
-
-      **Network offering**: If the administrator has configured multiple
-      network offerings, select the one you want to use for this
-      network.
-
-   -  
-
-      **Guest Gateway**: The gateway that the guests should use.
-
-   -  
-
-      **Guest Netmask**: The netmask in use on the subnet the guests
-      will use.
-
-#. 
-
-   Click Create.
-
-Reconfiguring Networks in VMs
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-CloudStack provides you the ability to move VMs between networks and
-reconfigure a VM's network. You can remove a VM from a network and add
-to a new network. You can also change the default network of a virtual
-machine. With this functionality, hybrid or traditional server loads can
-be accommodated with ease.
-
-This feature is supported on XenServer, VMware, and KVM hypervisors.
-
-Prerequisites
-^^^^^^^^^^^^^
-
-Ensure that vm-tools are running on guest VMs for adding or removing
-networks to work on VMware hypervisor.
-
-Adding a Network
-^^^^^^^^^^^^^^^^
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, click Instances.
-
-#. 
-
-   Choose the VM that you want to work with.
-
-#. 
-
-   Click the NICs tab.
-
-#. 
-
-   Click Add network to VM.
-
-   The Add network to VM dialog is displayed.
-
-#. 
-
-   In the drop-down list, select the network that you would like to add
-   this VM to.
-
-   A new NIC is added for this network. You can view the following
-   details in the NICs page:
-
-   -  
-
-      ID
-
-   -  
-
-      Network Name
-
-   -  
-
-      Type
-
-   -  
-
-      IP Address
-
-   -  
-
-      Gateway
-
-   -  
-
-      Netmask
-
-   -  
-
-      Is default
-
-   -  
-
-      CIDR (for IPv6)
-
-Removing a Network
-^^^^^^^^^^^^^^^^^^
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, click Instances.
-
-#. 
-
-   Choose the VM that you want to work with.
-
-#. 
-
-   Click the NICs tab.
-
-#. 
-
-   Locate the NIC you want to remove.
-
-#. 
-
-   Click Remove NIC button. |remove-nic.png|
-
-#. 
-
-   Click Yes to confirm.
-
-Selecting the Default Network
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, click Instances.
-
-#. 
-
-   Choose the VM that you want to work with.
-
-#. 
-
-   Click the NICs tab.
-
-#. 
-
-   Locate the NIC you want to work with.
-
-#. 
-
-   Click the Set default NIC button. |set-default-nic.png|.
-
-#. 
-
-   Click Yes to confirm.
-
-Changing the Network Offering on a Guest Network
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A user or administrator can change the network offering that is
-associated with an existing guest network.
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   If you are changing from a network offering that uses the CloudStack
-   virtual router to one that uses external devices as network service
-   providers, you must first stop all the VMs on the network.
-
-#. 
-
-   In the left navigation, choose Network.
-
-#. 
-
-   Click the name of the network you want to modify.
-
-#. 
-
-   In the Details tab, click Edit. |edit-icon.png|
-
-#. 
-
-   In Network Offering, choose the new network offering, then click
-   Apply.
-
-   A prompt is displayed asking whether you want to keep the existing
-   CIDR. This is to let you know that if you change the network
-   offering, the CIDR will be affected.
-
-   If you upgrade between virtual router as a provider and an external
-   network device as provider, acknowledge the change of CIDR to
-   continue, so choose Yes.
-
-#. 
-
-   Wait for the update to complete. Don't try to restart VMs until the
-   network change is complete.
-
-#. 
-
-   If you stopped any VMs, restart them.
-
-IP Reservation in Isolated Guest Networks
------------------------------------------
-
-In isolated guest networks, a part of the guest IP address space can be
-reserved for non-CloudStack VMs or physical servers. To do so, you
-configure a range of Reserved IP addresses by specifying the CIDR when a
-guest network is in Implemented state. If your customers wish to have
-non-CloudStack controlled VMs or physical servers on the same network,
-they can share a part of the IP address space that is primarily provided
-to the guest network.
-
-In an Advanced zone, an IP address range or a CIDR is assigned to a
-network when the network is defined. The CloudStack virtual router acts
-as the DHCP server and uses CIDR for assigning IP addresses to the guest
-VMs. If you decide to reserve CIDR for non-CloudStack purposes, you can
-specify a part of the IP address range or the CIDR that should only be
-allocated by the DHCP service of the virtual router to the guest VMs
-created in CloudStack. The remaining IPs in that network are called
-Reserved IP Range. When IP reservation is configured, the administrator
-can add additional VMs or physical servers that are not part of
-CloudStack to the same network and assign them the Reserved IP
-addresses. CloudStack guest VMs cannot acquire IPs from the Reserved IP
-Range.
-
-IP Reservation Considerations
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Consider the following before you reserve an IP range for non-CloudStack
-machines:
-
--  
-
-   IP Reservation is supported only in Isolated networks.
-
--  
-
-   IP Reservation can be applied only when the network is in Implemented
-   state.
-
--  
-
-   No IP Reservation is done by default.
-
--  
-
-   Guest VM CIDR you specify must be a subset of the network CIDR.
-
--  
-
-   Specify a valid Guest VM CIDR. IP Reservation is applied only if no
-   active IPs exist outside the Guest VM CIDR.
-
-   You cannot apply IP Reservation if any VM is alloted with an IP
-   address that is outside the Guest VM CIDR.
-
--  
-
-   To reset an existing IP Reservation, apply IP reservation by
-   specifying the value of network CIDR in the CIDR field.
-
-   For example, the following table describes three scenarios of guest
-   network creation:
-
-   ===== ============= =============== =========================================== ========================================================
-   Case  CIDR          Network CIDR    Reserved IP Range for Non-CloudStack VMs    Description
-   ===== ============= =============== =========================================== ========================================================
-   1     10.1.1.0/24   None            None                                        No IP Reservation.
-   2     10.1.1.0/26   10.1.1.0/24     10.1.1.64 to 10.1.1.254                     IP Reservation configured by the UpdateNetwork API with
-                                                                                   guestvmcidr=10.1.1.0/26 or enter 10.1.1.0/26 in the CIDR 
-                                                                                   field in the UI.
-   3     10.1.1.0/24   None            None                                        Removing IP Reservation by the UpdateNetwork API with
-                                                                                   guestvmcidr=10.1.1.0/24 or enter 10.1.1.0/24 in the CIDR 
-                                                                                   field in the UI.
-   ===== ============= =============== =========================================== ========================================================
-
-Limitations
-~~~~~~~~~~~
-
--  
-
-   The IP Reservation is not supported if active IPs that are found
-   outside the Guest VM CIDR.
-
--  
-
-   Upgrading network offering which causes a change in CIDR (such as
-   upgrading an offering with no external devices to one with external
-   devices) IP Reservation becomes void if any. Reconfigure IP
-   Reservation in the new re-implemeted network.
-
-Best Practices
-~~~~~~~~~~~~~~
-
-Apply IP Reservation to the guest network as soon as the network state
-changes to Implemented. If you apply reservation soon after the first
-guest VM is deployed, lesser conflicts occurs while applying
-reservation.
-
-Reserving an IP Range
-~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, choose Network.
-
-#. 
-
-   Click the name of the network you want to modify.
-
-#. 
-
-   In the Details tab, click Edit. |edit-icon.png|
-
-   The CIDR field changes to editable one.
-
-#. 
-
-   In CIDR, specify the Guest VM CIDR.
-
-#. 
-
-   Click Apply.
-
-   Wait for the update to complete. The Network CIDR and the Reserved IP
-   Range are displayed on the Details page.
-
-Reserving Public IP Addresses and VLANs for Accounts
-----------------------------------------------------
-
-CloudStack provides you the ability to reserve a set of public IP
-addresses and VLANs exclusively for an account. During zone creation,
-you can continue defining a set of VLANs and multiple public IP ranges.
-This feature extends the functionality to enable you to dedicate a fixed
-set of VLANs and guest IP addresses for a tenant.
-
-Note that if an account has consumed all the VLANs and IPs dedicated to
-it, the account can acquire two more resources from the system.
-CloudStack provides the root admin with two configuration parameter to
-modify this default behavior: use.system.public.ips and
-use.system.guest.vlans. These global parameters enable the root admin to
-disallow an account from acquiring public IPs and guest VLANs from the
-system, if the account has dedicated resources and these dedicated
-resources have all been consumed. Both these configurations are
-configurable at the account level.
-
-This feature provides you the following capabilities:
-
--  
-
-   Reserve a VLAN range and public IP address range from an Advanced
-   zone and assign it to an account
-
--  
-
-   Disassociate a VLAN and public IP address range from an account
-
--  
-
-   View the number of public IP addresses allocated to an account
-
--  
-
-   Check whether the required range is available and is conforms to
-   account limits.
-
-   The maximum IPs per account limit cannot be superseded.
-
-Dedicating IP Address Ranges to an Account
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as administrator.
-
-#. 
-
-   In the left navigation bar, click Infrastructure.
-
-#. 
-
-   In Zones, click View All.
-
-#. 
-
-   Choose the zone you want to work with.
-
-#. 
-
-   Click the Physical Network tab.
-
-#. 
-
-   In the Public node of the diagram, click Configure.
-
-#. 
-
-   Click the IP Ranges tab.
-
-   You can either assign an existing IP range to an account, or create a
-   new IP range and assign to an account.
-
-#. 
-
-   To assign an existing IP range to an account, perform the following:
-
-   #. 
-
-      Locate the IP range you want to work with.
-
-   #. 
-
-      Click Add Account |addAccount-icon.png| button.
-
-      The Add Account dialog is displayed.
-
-   #. 
-
-      Specify the following:
-
-      -  
-
-         **Account**: The account to which you want to assign the IP
-         address range.
-
-      -  
-
-         **Domain**: The domain associated with the account.
-
-      To create a new IP range and assign an account, perform the
-      following:
-
-      #. 
-
-         Specify the following:
-
-         -  
-
-            **Gateway**
-
-         -  
-
-            **Netmask**
-
-         -  
-
-            **VLAN**
-
-         -  
-
-            **Start IP**
-
-         -  
-
-            **End IP**
-
-         -  
-
-            **Account**: Perform the following:
-
-            #. 
-
-               Click Account.
-
-               The Add Account page is displayed.
-
-            #. 
-
-               Specify the following:
-
-               -  
-
-                  ****Account****: The account to which you want to
-                  assign an IP address range.
-
-               -  
-
-                  ****Domain****: The domain associated with the
-                  account.
-
-            #. 
-
-               Click OK.
-
-      #. 
-
-         Click Add.
-
-Dedicating VLAN Ranges to an Account
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   After the CloudStack Management Server is installed, log in to the
-   CloudStack UI as administrator.
-
-#. 
-
-   In the left navigation bar, click Infrastructure.
-
-#. 
-
-   In Zones, click View All.
-
-#. 
-
-   Choose the zone you want to work with.
-
-#. 
-
-   Click the Physical Network tab.
-
-#. 
-
-   In the Guest node of the diagram, click Configure.
-
-#. 
-
-   Select the Dedicated VLAN Ranges tab.
-
-#. 
-
-   Click Dedicate VLAN Range.
-
-   The Dedicate VLAN Range dialog is displayed.
-
-#. 
-
-   Specify the following:
-
-   -  
-
-      ****VLAN Range****: The VLAN range that you want to assign to an
-      account.
-
-   -  
-
-      ****Account****: The account to which you want to assign the
-      selected VLAN range.
-
-   -  
-
-      ****Domain****: The domain associated with the account.
-
-Configuring Multiple IP Addresses on a Single NIC
--------------------------------------------------
-
-CloudStack provides you the ability to associate multiple private IP
-addresses per guest VM NIC. In addition to the primary IP, you can
-assign additional IPs to the guest VM NIC. This feature is supported on
-all the network configurations: Basic, Advanced, and VPC. Security
-Groups, Static NAT and Port forwarding services are supported on these
-additional IPs.
-
-As always, you can specify an IP from the guest subnet; if not
-specified, an IP is automatically picked up from the guest VM subnet.
-You can view the IPs associated with for each guest VM NICs on the UI.
-You can apply NAT on these additional guest IPs by using network
-configuration option in the CloudStack UI. You must specify the NIC to
-which the IP should be associated.
-
-This feature is supported on XenServer, KVM, and VMware hypervisors.
-Note that Basic zone security groups are not supported on VMware.
-
-Use Cases
-~~~~~~~~~
-
-Some of the use cases are described below:
-
--  
-
-   Network devices, such as firewalls and load balancers, generally work
-   best when they have access to multiple IP addresses on the network
-   interface.
-
--  
-
-   Moving private IP addresses between interfaces or instances.
-   Applications that are bound to specific IP addresses can be moved
-   between instances.
-
--  
-
-   Hosting multiple SSL Websites on a single instance. You can install
-   multiple SSL certificates on a single instance, each associated with
-   a distinct IP address.
-
-Guidelines
-~~~~~~~~~~
-
-To prevent IP conflict, configure different subnets when multiple
-networks are connected to the same VM.
-
-Assigning Additional IPs to a VM
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI.
-
-#. 
-
-   In the left navigation bar, click Instances.
-
-#. 
-
-   Click the name of the instance you want to work with.
-
-#. 
-
-   In the Details tab, click NICs.
-
-#. 
-
-   Click View Secondary IPs.
-
-#. 
-
-   Click Acquire New Secondary IP, and click Yes in the confirmation
-   dialog.
-
-   You need to configure the IP on the guest VM NIC manually. CloudStack
-   will not automatically configure the acquired IP address on the VM.
-   Ensure that the IP address configuration persist on VM reboot.
-
-   Within a few moments, the new IP address should appear with the state
-   Allocated. You can now use the IP address in Port Forwarding or
-   StaticNAT rules.
-
-Port Forwarding and StaticNAT Services Changes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Because multiple IPs can be associated per NIC, you are allowed to
-select a desired IP for the Port Forwarding and StaticNAT services. The
-default is the primary IP. To enable this functionality, an extra
-optional parameter 'vmguestip' is added to the Port forwarding and
-StaticNAT APIs (enableStaticNat, createIpForwardingRule) to indicate on
-what IP address NAT need to be configured. If vmguestip is passed, NAT
-is configured on the specified private IP of the VM. if not passed, NAT
-is configured on the primary IP of the VM.
-
-About Multiple IP Ranges
-------------------------
-
-.. note:: The feature can only be implemented on IPv4 addresses.
-
-CloudStack provides you with the flexibility to add guest IP ranges from
-different subnets in Basic zones and security groups-enabled Advanced
-zones. For security groups-enabled Advanced zones, it implies multiple
-subnets can be added to the same VLAN. With the addition of this
-feature, you will be able to add IP address ranges from the same subnet
-or from a different one when IP address are exhausted. This would in
-turn allows you to employ higher number of subnets and thus reduce the
-address management overhead. To support this feature, the capability of
-``createVlanIpRange`` API is extended to add IP ranges also from a
-different subnet.
-
-Ensure that you manually configure the gateway of the new subnet before
-adding the IP range. Note that CloudStack supports only one gateway for
-a subnet; overlapping subnets are not currently supported.
-
-Use the ``deleteVlanRange`` API to delete IP ranges. This operation
-fails if an IP from the remove range is in use. If the remove range
-contains the IP address on which the DHCP server is running, CloudStack
-acquires a new IP from the same subnet. If no IP is available in the
-subnet, the remove operation fails.
-
-This feature is supported on KVM, xenServer, and VMware hypervisors.
-
-About Elastic IP
-----------------
-
-Elastic IP (EIP) addresses are the IP addresses that are associated with
-an account, and act as static IP addresses. The account owner has the
-complete control over the Elastic IP addresses that belong to the
-account. As an account owner, you can allocate an Elastic IP to a VM of
-your choice from the EIP pool of your account. Later if required you can
-reassign the IP address to a different VM. This feature is extremely
-helpful during VM failure. Instead of replacing the VM which is down,
-the IP address can be reassigned to a new VM in your account.
-
-Similar to the public IP address, Elastic IP addresses are mapped to
-their associated private IP addresses by using StaticNAT. The EIP
-service is equipped with StaticNAT (1:1) service in an EIP-enabled basic
-zone. The default network offering,
-DefaultSharedNetscalerEIPandELBNetworkOffering, provides your network
-with EIP and ELB network services if a NetScaler device is deployed in
-your zone. Consider the following illustration for more details.
-
-|eip-ns-basiczone.png|
-
-In the illustration, a NetScaler appliance is the default entry or exit
-point for the CloudStack instances, and firewall is the default entry or
-exit point for the rest of the data center. Netscaler provides LB
-services and staticNAT service to the guest networks. The guest traffic
-in the pods and the Management Server are on different subnets / VLANs.
-The policy-based routing in the data center core switch sends the public
-traffic through the NetScaler, whereas the rest of the data center goes
-through the firewall.
-
-The EIP work flow is as follows:
-
--  
-
-   When a user VM is deployed, a public IP is automatically acquired
-   from the pool of public IPs configured in the zone. This IP is owned
-   by the VM's account.
-
--  
-
-   Each VM will have its own private IP. When the user VM starts, Static
-   NAT is provisioned on the NetScaler device by using the Inbound
-   Network Address Translation (INAT) and Reverse NAT (RNAT) rules
-   between the public IP and the private IP.
-
-   .. note:: 
-      Inbound NAT (INAT) is a type of NAT supported by NetScaler, in which
-      the destination IP address is replaced in the packets from the public
-      network, such as the Internet, with the private IP address of a VM in
-      the private network. Reverse NAT (RNAT) is a type of NAT supported by
-      NetScaler, in which the source IP address is replaced in the packets
-      generated by a VM in the private network with the public IP address.
-
--  
-
-   This default public IP will be released in two cases:
-
-   -  
-
-      When the VM is stopped. When the VM starts, it again receives a
-      new public IP, not necessarily the same one allocated initially,
-      from the pool of Public IPs.
-
-   -  
-
-      The user acquires a public IP (Elastic IP). This public IP is
-      associated with the account, but will not be mapped to any private
-      IP. However, the user can enable Static NAT to associate this IP
-      to the private IP of a VM in the account. The Static NAT rule for
-      the public IP can be disabled at any time. When Static NAT is
-      disabled, a new public IP is allocated from the pool, which is not
-      necessarily be the same one allocated initially.
-
-For the deployments where public IPs are limited resources, you have the
-flexibility to choose not to allocate a public IP by default. You can
-use the Associate Public IP option to turn on or off the automatic
-public IP assignment in the EIP-enabled Basic zones. If you turn off the
-automatic public IP assignment while creating a network offering, only a
-private IP is assigned to a VM when the VM is deployed with that network
-offering. Later, the user can acquire an IP for the VM and enable static
-NAT.
-
-For more information on the Associate Public IP option, see
-`"Creating a New Network Offering" <networking.html#creating-a-new-network-offering>`_.
-
-.. note:: 
-   The Associate Public IP feature is designed only for use with user VMs.
-   The System VMs continue to get both public IP and private by default,
-   irrespective of the network offering configuration.
-
-New deployments which use the default shared network offering with EIP
-and ELB services to create a shared network in the Basic zone will
-continue allocating public IPs to each user VM.
-
-Portable IPs
-------------
-
-About Portable IP
-~~~~~~~~~~~~~~~~~
-
-Portable IPs in CloudStack are region-level pool of IPs, which are
-elastic in nature, that can be transferred across geographically
-separated zones. As an administrator, you can provision a pool of
-portable public IPs at region level and are available for user
-consumption. The users can acquire portable IPs if admin has provisioned
-portable IPs at the region level they are part of. These IPs can be use
-for any service within an advanced zone. You can also use portable IPs
-for EIP services in basic zones.
-
-The salient features of Portable IP are as follows:
-
--  
-
-   IP is statically allocated
-
--  
-
-   IP need not be associated with a network
-
--  
-
-   IP association is transferable across networks
-
--  
-
-   IP is transferable across both Basic and Advanced zones
-
--  
-
-   IP is transferable across VPC, non-VPC isolated and shared networks
-
--  
-
-   Portable IP transfer is available only for static NAT.
-
-Guidelines
-^^^^^^^^^^
-
-Before transferring to another network, ensure that no network rules
-(Firewall, Static NAT, Port Forwarding, and so on) exist on that
-portable IP.
-
-Configuring Portable IPs
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, click Regions.
-
-#. 
-
-   Choose the Regions that you want to work with.
-
-#. 
-
-   Click View Portable IP.
-
-#. 
-
-   Click Portable IP Range.
-
-   The Add Portable IP Range window is displayed.
-
-#. 
-
-   Specify the following:
-
-   -  
-
-      **Start IP/ End IP**: A range of IP addresses that are accessible
-      from the Internet and will be allocated to guest VMs. Enter the
-      first and last IP addresses that define a range that CloudStack
-      can assign to guest VMs.
-
-   -  
-
-      **Gateway**: The gateway in use for the Portable IP addresses you
-      are configuring.
-
-   -  
-
-      **Netmask**: The netmask associated with the Portable IP range.
-
-   -  
-
-      **VLAN**: The VLAN that will be used for public traffic.
-
-#. 
-
-   Click OK.
-
-Acquiring a Portable IP
-~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, choose Network.
-
-#. 
-
-   Click the name of the network where you want to work with.
-
-#. 
-
-   Click View IP Addresses.
-
-#. 
-
-   Click Acquire New IP.
-
-   The Acquire New IP window is displayed.
-
-#. 
-
-   Specify whether you want cross-zone IP or not.
-
-#. 
-
-   Click Yes in the confirmation dialog.
-
-   Within a few moments, the new IP address should appear with the state
-   Allocated. You can now use the IP address in port forwarding or
-   static NAT rules.
-
-Transferring Portable IP
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-An IP can be transferred from one network to another only if Static NAT
-is enabled. However, when a portable IP is associated with a network,
-you can use it for any service in the network.
-
-To transfer a portable IP across the networks, execute the following
-API:
-
-.. code:: bash
-
-    http://localhost:8096/client/api?command=enableStaticNat&response=json&ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&virtualmachineid=a242c476-ef37-441e-9c7b-b303e2a9cb4f&networkid=6e7cd8d1-d1ba-4c35-bdaf-333354cbd49810
-
-Replace the UUID with appropriate UUID. For example, if you want to
-transfer a portable IP to network X and VM Y in a network, execute the
-following:
-
-.. code:: bash
-
-    http://localhost:8096/client/api?command=enableStaticNat&response=json&ipaddressid=a4bc37b2-4b4e-461d-9a62-b66414618e36&virtualmachineid=Y&networkid=X
-
-Multiple Subnets in Shared Network
-----------------------------------
-
-CloudStack provides you with the flexibility to add guest IP ranges from
-different subnets in Basic zones and security groups-enabled Advanced
-zones. For security groups-enabled Advanced zones, it implies multiple
-subnets can be added to the same VLAN. With the addition of this
-feature, you will be able to add IP address ranges from the same subnet
-or from a different one when IP address are exhausted. This would in
-turn allows you to employ higher number of subnets and thus reduce the
-address management overhead. You can delete the IP ranges you have
-added.
-
-Prerequisites and Guidelines
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
--  
-
-   This feature can only be implemented:
-
-   -  
-
-      on IPv4 addresses
-
-   -  
-
-      if virtual router is the DHCP provider
-
-   -  
-
-      on KVM, xenServer, and VMware hypervisors
-
--  
-
-   Manually configure the gateway of the new subnet before adding the IP
-   range.
-
--  
-
-   CloudStack supports only one gateway for a subnet; overlapping
-   subnets are not currently supported
-
-Adding Multiple Subnets to a Shared Network
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, choose Infrastructure.
-
-#. 
-
-   On Zones, click View More, then click the zone to which you want to
-   work with..
-
-#. 
-
-   Click Physical Network.
-
-#. 
-
-   In the Guest node of the diagram, click Configure.
-
-#. 
-
-   Click Networks.
-
-#. 
-
-   Select the networks you want to work with.
-
-#. 
-
-   Click View IP Ranges.
-
-#. 
-
-   Click Add IP Range.
-
-   The Add IP Range dialog is displayed, as follows:
-
-   |add-ip-range.png|
-
-#. 
-
-   Specify the following:
-
-   All the fields are mandatory.
-
-   -  
-
-      **Gateway**: The gateway for the tier you create. Ensure that the
-      gateway is within the Super CIDR range that you specified while
-      creating the VPC, and is not overlapped with the CIDR of any
-      existing tier within the VPC.
-
-   -  
-
-      **Netmask**: The netmask for the tier you create.
-
-      For example, if the VPC CIDR is 10.0.0.0/16 and the network tier
-      CIDR is 10.0.1.0/24, the gateway of the tier is 10.0.1.1, and the
-      netmask of the tier is 255.255.255.0.
-
-   -  
-
-      **Start IP/ End IP**: A range of IP addresses that are accessible
-      from the Internet and will be allocated to guest VMs. Enter the
-      first and last IP addresses that define a range that CloudStack
-      can assign to guest VMs .
-
-#. 
-
-   Click OK.
-
-Isolation in Advanced Zone Using Private VLAN
----------------------------------------------
-
-Isolation of guest traffic in shared networks can be achieved by using
-Private VLANs (PVLAN). PVLANs provide Layer 2 isolation between ports
-within the same VLAN. In a PVLAN-enabled shared network, a user VM
-cannot reach other user VM though they can reach the DHCP server and
-gateway, this would in turn allow users to control traffic within a
-network and help them deploy multiple applications without communication
-between application as well as prevent communication with other users'
-VMs.
-
--  
-
-   Isolate VMs in a shared networks by using Private VLANs.
-
--  
-
-   Supported on KVM, XenServer, and VMware hypervisors
-
--  
-
-   PVLAN-enabled shared network can be a part of multiple networks of a
-   guest VM.
-
-About Private VLAN
-~~~~~~~~~~~~~~~~~~
-
-In an Ethernet switch, a VLAN is a broadcast domain where hosts can
-establish direct communication with each another at Layer 2. Private
-VLAN is designed as an extension of VLAN standard to add further
-segmentation of the logical broadcast domain. A regular VLAN is a single
-broadcast domain, whereas a private VLAN partitions a larger VLAN
-broadcast domain into smaller sub-domains. A sub-domain is represented
-by a pair of VLANs: a Primary VLAN and a Secondary VLAN. The original
-VLAN that is being divided into smaller groups is called Primary, which
-implies that all VLAN pairs in a private VLAN share the same Primary
-VLAN. All the secondary VLANs exist only inside the Primary. Each
-Secondary VLAN has a specific VLAN ID associated to it, which
-differentiates one sub-domain from another.
-
-Three types of ports exist in a private VLAN domain, which essentially
-determine the behaviour of the participating hosts. Each ports will have
-its own unique set of rules, which regulate a connected host's ability
-to communicate with other connected host within the same private VLAN
-domain. Configure each host that is part of a PVLAN pair can be by using
-one of these three port designation:
-
--  
-
-   **Promiscuous**: A promiscuous port can communicate with all the
-   interfaces, including the community and isolated host ports that
-   belong to the secondary VLANs. In Promiscuous mode, hosts are
-   connected to promiscuous ports and are able to communicate directly
-   with resources on both primary and secondary VLAN. Routers, DHCP
-   servers, and other trusted devices are typically attached to
-   promiscuous ports.
-
--  
-
-   **Isolated VLANs**: The ports within an isolated VLAN cannot
-   communicate with each other at the layer-2 level. The hosts that are
-   connected to Isolated ports can directly communicate only with the
-   Promiscuous resources. If your customer device needs to have access
-   only to a gateway router, attach it to an isolated port.
-
--  
-
-   **Community VLANs**: The ports within a community VLAN can
-   communicate with each other and with the promiscuous ports, but they
-   cannot communicate with the ports in other communities at the layer-2
-   level. In a Community mode, direct communication is permitted only
-   with the hosts in the same community and those that are connected to
-   the Primary PVLAN in promiscuous mode. If your customer has two
-   devices that need to be isolated from other customers' devices, but
-   to be able to communicate among themselves, deploy them in community
-   ports.
-
-For further reading:
-
--  
-
-   `Understanding Private
-   VLANs <http://www.cisco.com/en/US/docs/switches/lan/catalyst3750/software/release/12.2_25_see/configuration/guide/swpvlan.html#wp1038379>`_
-
--  
-
-   `Cisco Systems' Private VLANs: Scalable Security in a Multi-Client
-   Environment <http://tools.ietf.org/html/rfc5517>`_
-
--  
-
-   `Private VLAN (PVLAN) on vNetwork Distributed Switch - Concept
-   Overview (1010691) <http://kb.vmware.com>`_
-
-Prerequisites
-~~~~~~~~~~~~~
-
--  
-
-   Use a PVLAN supported switch.
-
-   See `Private VLAN Catalyst Switch Support
-   Matrix <http://www.cisco.com/en/US/products/hw/switches/ps708/products_tech_note09186a0080094830.shtml>`_ for
-   more information.
-
--  
-
-   All the layer 2 switches, which are PVLAN-aware, are connected to
-   each other, and one of them is connected to a router. All the ports
-   connected to the host would be configured in trunk mode. Open
-   Management VLAN, Primary VLAN (public) and Secondary Isolated VLAN
-   ports. Configure the switch port connected to the router in PVLAN
-   promiscuous trunk mode, which would translate an isolated VLAN to
-   primary VLAN for the PVLAN-unaware router.
-
-   Note that only Cisco Catalyst 4500 has the PVLAN promiscuous trunk
-   mode to connect both normal VLAN and PVLAN to a PVLAN-unaware switch.
-   For the other Catalyst PVLAN support switch, connect the switch to
-   upper switch by using cables, one each for a PVLAN pair.
-
--  
-
-   Configure private VLAN on your physical switches out-of-band.
-
--  
-
-   Before you use PVLAN on XenServer and KVM, enable Open vSwitch (OVS).
-
-   .. note:: 
-      OVS on XenServer and KVM does not support PVLAN natively. Therefore,
-      CloudStack managed to simulate PVLAN on OVS for XenServer and KVM by
-      modifying the flow table.
-
-Creating a PVLAN-Enabled Guest Network
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as administrator.
-
-#. 
-
-   In the left navigation, choose Infrastructure.
-
-#. 
-
-   On Zones, click View More.
-
-#. 
-
-   Click the zone to which you want to add a guest network.
-
-#. 
-
-   Click the Physical Network tab.
-
-#. 
-
-   Click the physical network you want to work with.
-
-#. 
-
-   On the Guest node of the diagram, click Configure.
-
-#. 
-
-   Click the Network tab.
-
-#. 
-
-   Click Add guest network.
-
-   The Add guest network window is displayed.
-
-#. 
-
-   Specify the following:
-
-   -  
-
-      **Name**: The name of the network. This will be visible to the
-      user.
-
-   -  
-
-      **Description**: The short description of the network that can be
-      displayed to users.
-
-   -  
-
-      **VLAN ID**: The unique ID of the VLAN.
-
-   -  
-
-      **Secondary Isolated VLAN ID**: The unique ID of the Secondary
-      Isolated VLAN.
-
-      For the description on Secondary Isolated VLAN, see
-      `About Private VLAN" <#about-private-vlan>`_.
-
-   -  
-
-      **Scope**: The available scopes are Domain, Account, Project, and
-      All.
-
-      -  
-
-         **Domain**: Selecting Domain limits the scope of this guest
-         network to the domain you specify. The network will not be
-         available for other domains. If you select Subdomain Access,
-         the guest network is available to all the sub domains within
-         the selected domain.
-
-      -  
-
-         **Account**: The account for which the guest network is being
-         created for. You must specify the domain the account belongs
-         to.
-
-      -  
-
-         **Project**: The project for which the guest network is being
-         created for. You must specify the domain the project belongs
-         to.
-
-      -  
-
-         **All**: The guest network is available for all the domains,
-         account, projects within the selected zone.
-
-   -  
-
-      **Network Offering**: If the administrator has configured multiple
-      network offerings, select the one you want to use for this
-      network.
-
-   -  
-
-      **Gateway**: The gateway that the guests should use.
-
-   -  
-
-      **Netmask**: The netmask in use on the subnet the guests will use.
-
-   -  
-
-      **IP Range**: A range of IP addresses that are accessible from the
-      Internet and are assigned to the guest VMs.
-
-   -  
-
-      **Network Domain**: A custom DNS suffix at the level of a network.
-      If you want to assign a special domain name to the guest VM
-      network, specify a DNS suffix.
-
-#. 
-
-   Click OK to confirm.
-
-Security Groups
----------------
-
-About Security Groups
-~~~~~~~~~~~~~~~~~~~~~
-
-Security groups provide a way to isolate traffic to VMs. A security
-group is a group of VMs that filter their incoming and outgoing traffic
-according to a set of rules, called ingress and egress rules. These
-rules filter network traffic according to the IP address that is
-attempting to communicate with the VM. Security groups are particularly
-useful in zones that use basic networking, because there is a single
-guest network for all guest VMs. In advanced zones, security groups are
-supported only on the KVM hypervisor.
-
-.. note:: 
-   In a zone that uses advanced networking, you can instead define multiple guest networks to isolate traffic to VMs.
-
-Each CloudStack account comes with a default security group that denies
-all inbound traffic and allows all outbound traffic. The default
-security group can be modified so that all new VMs inherit some other
-desired set of rules.
-
-Any CloudStack user can set up any number of additional security groups.
-When a new VM is launched, it is assigned to the default security group
-unless another user-defined security group is specified. A VM can be a
-member of any number of security groups. Once a VM is assigned to a
-security group, it remains in that group for its entire lifetime; you
-can not move a running VM from one security group to another.
-
-You can modify a security group by deleting or adding any number of
-ingress and egress rules. When you do, the new rules apply to all VMs in
-the group, whether running or stopped.
-
-If no ingress rules are specified, then no traffic will be allowed in,
-except for responses to any traffic that has been allowed out through an
-egress rule.
-
-Adding a Security Group
-~~~~~~~~~~~~~~~~~~~~~~~
-
-A user or administrator can define a new security group.
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, choose Network
-
-#. 
-
-   In Select view, choose Security Groups.
-
-#. 
-
-   Click Add Security Group.
-
-#. 
-
-   Provide a name and description.
-
-#. 
-
-   Click OK.
-
-   The new security group appears in the Security Groups Details tab.
-
-#. 
-
-   To make the security group useful, continue to Adding Ingress and
-   Egress Rules to a Security Group.
-
-Security Groups in Advanced Zones (KVM Only)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-CloudStack provides the ability to use security groups to provide
-isolation between guests on a single shared, zone-wide network in an
-advanced zone where KVM is the hypervisor. Using security groups in
-advanced zones rather than multiple VLANs allows a greater range of
-options for setting up guest isolation in a cloud.
-
-Limitations
-^^^^^^^^^^^
-
-The following are not supported for this feature:
-
--  
-
-   Two IP ranges with the same VLAN and different gateway or netmask in
-   security group-enabled shared network.
-
--  
-
-   Two IP ranges with the same VLAN and different gateway or netmask in
-   account-specific shared networks.
-
--  
-
-   Multiple VLAN ranges in security group-enabled shared network.
-
--  
-
-   Multiple VLAN ranges in account-specific shared networks.
-
-Security groups must be enabled in the zone in order for this feature to
-be used.
-
-Enabling Security Groups
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-In order for security groups to function in a zone, the security groups
-feature must first be enabled for the zone. The administrator can do
-this when creating a new zone, by selecting a network offering that
-includes security groups. The procedure is described in Basic Zone
-Configuration in the Advanced Installation Guide. The administrator can
-not enable security groups for an existing zone, only when creating a
-new zone.
-
-Adding Ingress and Egress Rules to a Security Group
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, choose Network
-
-#. 
-
-   In Select view, choose Security Groups, then click the security group
-   you want .
-
-#. 
-
-   To add an ingress rule, click the Ingress Rules tab and fill out the
-   following fields to specify what network traffic is allowed into VM
-   instances in this security group. If no ingress rules are specified,
-   then no traffic will be allowed in, except for responses to any
-   traffic that has been allowed out through an egress rule.
-
-   -  
-
-      **Add by CIDR/Account**. Indicate whether the source of the
-      traffic will be defined by IP address (CIDR) or an existing
-      security group in a CloudStack account (Account). Choose Account
-      if you want to allow incoming traffic from all VMs in another
-      security group
-
-   -  
-
-      **Protocol**. The networking protocol that sources will use to
-      send traffic to the security group. TCP and UDP are typically used
-      for data exchange and end-user communications. ICMP is typically
-      used to send error messages or network monitoring data.
-
-   -  
-
-      **Start Port, End Port**. (TCP, UDP only) A range of listening
-      ports that are the destination for the incoming traffic. If you
-      are opening a single port, use the same number in both fields.
-
-   -  
-
-      **ICMP Type, ICMP Code**. (ICMP only) The type of message and
-      error code that will be accepted.
-
-   -  
-
-      **CIDR**. (Add by CIDR only) To accept only traffic from IP
-      addresses within a particular address block, enter a CIDR or a
-      comma-separated list of CIDRs. The CIDR is the base IP address of
-      the incoming traffic. For example, 192.168.0.0/22. To allow all
-      CIDRs, set to 0.0.0.0/0.
-
-   -  
-
-      **Account, Security Group**. (Add by Account only) To accept only
-      traffic from another security group, enter the CloudStack account
-      and name of a security group that has already been defined in that
-      account. To allow traffic between VMs within the security group
-      you are editing now, enter the same name you used in step 7.
-
-   The following example allows inbound HTTP access from anywhere:
-
-   |httpaccess.png|
-
-#. 
-
-   To add an egress rule, click the Egress Rules tab and fill out the
-   following fields to specify what type of traffic is allowed to be
-   sent out of VM instances in this security group. If no egress rules
-   are specified, then all traffic will be allowed out. Once egress
-   rules are specified, the following types of traffic are allowed out:
-   traffic specified in egress rules; queries to DNS and DHCP servers;
-   and responses to any traffic that has been allowed in through an
-   ingress rule
-
-   -  
-
-      **Add by CIDR/Account**. Indicate whether the destination of the
-      traffic will be defined by IP address (CIDR) or an existing
-      security group in a CloudStack account (Account). Choose Account
-      if you want to allow outgoing traffic to all VMs in another
-      security group.
-
-   -  
-
-      **Protocol**. The networking protocol that VMs will use to send
-      outgoing traffic. TCP and UDP are typically used for data exchange
-      and end-user communications. ICMP is typically used to send error
-      messages or network monitoring data.
-
-   -  
-
-      **Start Port, End Port**. (TCP, UDP only) A range of listening
-      ports that are the destination for the outgoing traffic. If you
-      are opening a single port, use the same number in both fields.
-
-   -  
-
-      **ICMP Type, ICMP Code**. (ICMP only) The type of message and
-      error code that will be sent
-
-   -  
-
-      **CIDR**. (Add by CIDR only) To send traffic only to IP addresses
-      within a particular address block, enter a CIDR or a
-      comma-separated list of CIDRs. The CIDR is the base IP address of
-      the destination. For example, 192.168.0.0/22. To allow all CIDRs,
-      set to 0.0.0.0/0.
-
-   -  
-
-      **Account, Security Group**. (Add by Account only) To allow
-      traffic to be sent to another security group, enter the CloudStack
-      account and name of a security group that has already been defined
-      in that account. To allow traffic between VMs within the security
-      group you are editing now, enter its name.
-
-#. 
-
-   Click Add.
-
-External Firewalls and Load Balancers
--------------------------------------
-
-CloudStack is capable of replacing its Virtual Router with an external
-Juniper SRX device and an optional external NetScaler or F5 load
-balancer for gateway and load balancing services. In this case, the VMs
-use the SRX as their gateway.
-
-About Using a NetScaler Load Balancer
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Citrix NetScaler is supported as an external network element for load
-balancing in zones that use isolated networking in advanced zones. Set
-up an external load balancer when you want to provide load balancing
-through means other than CloudStack's provided virtual router.
-
-.. note:: 
-   In a Basic zone, load balancing service is supported only if Elastic IP or Elastic LB services are enabled.
-
-When NetScaler load balancer is used to provide EIP or ELB services in a
-Basic zone, ensure that all guest VM traffic must enter and exit through
-the NetScaler device. When inbound traffic goes through the NetScaler
-device, traffic is routed by using the NAT protocol depending on the
-EIP/ELB configured on the public IP to the private IP. The traffic that
-is originated from the guest VMs usually goes through the layer 3
-router. To ensure that outbound traffic goes through NetScaler device
-providing EIP/ELB, layer 3 router must have a policy-based routing. A
-policy-based route must be set up so that all traffic originated from
-the guest VM's are directed to NetScaler device. This is required to
-ensure that the outbound traffic from the guest VM's is routed to a
-public IP by using NAT.For more information on Elastic IP, see
-`"About Elastic IP" <#about-elastic-ip>`_.
-
-The NetScaler can be set up in direct (outside the firewall) mode. It
-must be added before any load balancing rules are deployed on guest VMs
-in the zone.
-
-The functional behavior of the NetScaler with CloudStack is the same as
-described in the CloudStack documentation for using an F5 external load
-balancer. The only exception is that the F5 supports routing domains,
-and NetScaler does not. NetScaler can not yet be used as a firewall.
-
-To install and enable an external load balancer for CloudStack
-management, see External Guest Load Balancer Integration in the
-Installation Guide.
-
-The Citrix NetScaler comes in three varieties. The following table
-summarizes how these variants are treated in CloudStack.
-
-NetScaler ADC Type
-
-Description of Capabilities
-
-CloudStack Supported Features
-
-MPX
-
-Physical appliance. Capable of deep packet inspection. Can act as
-application firewall and load balancer
-
-In advanced zones, load balancer functionality fully supported without
-limitation. In basic zones, static NAT, elastic IP (EIP), and elastic
-load balancing (ELB) are also provided.
-
-VPX
-
-Virtual appliance. Can run as VM on XenServer, ESXi, and Hyper-V
-hypervisors. Same functionality as MPX
-
-Supported on ESXi and XenServer. Same functional support as for MPX.
-CloudStack will treat VPX and MPX as the same device type.
-
-SDX
-
-Physical appliance. Can create multiple fully isolated VPX instances on
-a single appliance to support multi-tenant usage
-
-CloudStack will dynamically provision, configure, and manage the life
-cycle of VPX instances on the SDX. Provisioned instances are added into
-CloudStack automatically - no manual configuration by the administrator
-is required. Once a VPX instance is added into CloudStack, it is treated
-the same as a VPX on an ESXi host.
-
-Configuring SNMP Community String on a RHEL Server
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The SNMP Community string is similar to a user id or password that
-provides access to a network device, such as router. This string is sent
-along with all SNMP requests. If the community string is correct, the
-device responds with the requested information. If the community string
-is incorrect, the device discards the request and does not respond.
-
-The NetScaler device uses SNMP to communicate with the VMs. You must
-install SNMP and configure SNMP Community string for a secure
-communication between the NetScaler device and the RHEL machine.
-
-#. 
-
-   Ensure that you installed SNMP on RedHat. If not, run the following
-   command:
-
-   .. code:: bash
-
-       yum install net-snmp-utils
-
-#. 
-
-   Edit the /etc/snmp/snmpd.conf file to allow the SNMP polling from the
-   NetScaler device.
-
-   #. 
-
-      Map the community name into a security name (local and mynetwork,
-      depending on where the request is coming from):
-
-      .. note:: 
-         Use a strong password instead of public when you edit the
-         following table.
-
-      .. code:: bash
-
-          #         sec.name   source        community
-          com2sec    local      localhost     public
-          com2sec   mynetwork   0.0.0.0       public
-
-      .. note:: Setting to 0.0.0.0 allows all IPs to poll the NetScaler server.
-
-   #. 
-
-      Map the security names into group names:
-
-      .. code:: bash
-
-          #      group.name   sec.model  sec.name
-          group   MyRWGroup     v1         local
-          group   MyRWGroup     v2c        local
-          group   MyROGroup     v1        mynetwork
-          group   MyROGroup     v2c       mynetwork
-
-   #. 
-
-      Create a view to allow the groups to have the permission to:
-
-      .. code:: bash
-
-          incl/excl subtree mask view all included .1
-
-   #. 
-
-      Grant access with different write permissions to the two groups to
-      the view you created.
-
-      .. code:: bash
-
-          # context     sec.model     sec.level     prefix     read     write     notif
-            access      MyROGroup ""  any noauth     exact      all      none     none
-            access      MyRWGroup ""  any noauth     exact      all      all      all
-
-#. 
-
-   Unblock SNMP in iptables.
-
-   .. code:: bash
-
-       iptables -A INPUT -p udp --dport 161 -j ACCEPT
-
-#. 
-
-   Start the SNMP service:
-
-   .. code:: bash
-
-       service snmpd start
-
-#. 
-
-   Ensure that the SNMP service is started automatically during the
-   system startup:
-
-   .. code:: bash
-
-       chkconfig snmpd on
-
-Initial Setup of External Firewalls and Load Balancers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When the first VM is created for a new account, CloudStack programs the
-external firewall and load balancer to work with the VM. The following
-objects are created on the firewall:
-
--  
-
-   A new logical interface to connect to the account's private VLAN. The
-   interface IP is always the first IP of the account's private subnet
-   (e.g. 10.1.1.1).
-
--  
-
-   A source NAT rule that forwards all outgoing traffic from the
-   account's private VLAN to the public Internet, using the account's
-   public IP address as the source address
-
--  
-
-   A firewall filter counter that measures the number of bytes of
-   outgoing traffic for the account
-
-The following objects are created on the load balancer:
-
--  
-
-   A new VLAN that matches the account's provisioned Zone VLAN
-
--  
-
-   A self IP for the VLAN. This is always the second IP of the account's
-   private subnet (e.g. 10.1.1.2).
-
-Ongoing Configuration of External Firewalls and Load Balancers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Additional user actions (e.g. setting a port forward) will cause further
-programming of the firewall and load balancer. A user may request
-additional public IP addresses and forward traffic received at these IPs
-to specific VMs. This is accomplished by enabling static NAT for a
-public IP address, assigning the IP to a VM, and specifying a set of
-protocols and port ranges to open. When a static NAT rule is created,
-CloudStack programs the zone's external firewall with the following
-objects:
-
--  
-
-   A static NAT rule that maps the public IP address to the private IP
-   address of a VM.
-
--  
-
-   A security policy that allows traffic within the set of protocols and
-   port ranges that are specified.
-
--  
-
-   A firewall filter counter that measures the number of bytes of
-   incoming traffic to the public IP.
-
-The number of incoming and outgoing bytes through source NAT, static
-NAT, and load balancing rules is measured and saved on each external
-element. This data is collected on a regular basis and stored in the
-CloudStack database.
-
-Load Balancer Rules
-~~~~~~~~~~~~~~~~~~~
-
-A CloudStack user or administrator may create load balancing rules that
-balance traffic received at a public IP to one or more VMs. A user
-creates a rule, specifies an algorithm, and assigns the rule to a set of
-VMs.
-
-.. note:: 
-   If you create load balancing rules while using a network service
-   offering that includes an external load balancer device such as
-   NetScaler, and later change the network service offering to one that
-   uses the CloudStack virtual router, you must create a firewall rule on
-   the virtual router for each of your existing load balancing rules so
-   that they continue to function.
-
-.. _adding-lb-rule:
-
-Adding a Load Balancer Rule
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. 
-
-   Log in to the CloudStack UI as an administrator or end user.
-
-#. 
-
-   In the left navigation, choose Network.
-
-#. 
-
-   Click the name of the network where you want to load balance the
-   traffic.
-
-#. 
-
-   Click View IP Addresses.
-
-#. 
-
-   Click the IP address for which you want to create the rule, then
-   click the Configuration tab.
-
-#. 
-
-   In the Load Balancing node of the diagram, click View All.
-
-   In a Basic zone, you can also create a load balancing rule without
-   acquiring or selecting an IP address. CloudStack internally assign an
-   IP when you create the load balancing rule, which is listed in the IP
-   Addresses page when the rule is created.
-
-   To do that, select the name of the network, then click Add Load
-   Balancer tab. Continue with #7.
-
-#. 
-
-   Fill in the following:
-
-   -  
-
-      **Name**: A name for the load balancer rule.
-
-   -  
-
-      **Public Port**: The port receiving incoming traffic to be
-      balanced.
-
-   -  
-
-      **Private Port**: The port that the VMs will use to receive the
-      traffic.
-
-   -  
-
-      **Algorithm**: Choose the load balancing algorithm you want
-      CloudStack to use. CloudStack supports a variety of well-known
-      algorithms. If you are not familiar with these choices, you will
-      find plenty of information about them on the Internet.
-
-   -  
-
-      **Stickiness**: (Optional) Click Configure and choose the
-      algorithm for the stickiness policy. See Sticky Session Policies
-      for Load Balancer Rules.
-
-   -  
-
-      **AutoScale**: Click Configure and complete the AutoScale
-      configuration as explained in :ref:`conf-autoscale`.
-
-   -  
-
-      **Health Check**: (Optional; NetScaler load balancers only) Click
-      Configure and fill in the characteristics of the health check
-      policy. See :ref:`health-check`.
-
-      -  
-
-         **Ping path (Optional)**: Sequence of destinations to which to
-         send health check queries. Default: / (all).
-
-      -  
-
-         **Response time (Optional)**: How long to wait for a response
-         from the health check (2 - 60 seconds). Default: 5 seconds.
-
-      -  
-
-         **Interval time (Optional)**: Amount of time between health
-         checks (1 second - 5 minutes). Default value is set in the
-         global configuration parameter lbrule\_health
-         check\_time\_interval.
-
-      -  
-
-         **Healthy threshold (Optional)**: Number of consecutive health
-         check successes that are required before declaring an instance
-         healthy. Default: 2.
-
-      -  
-
-         **Unhealthy threshold (Optional)**: Number of consecutive
-         health check failures that are required before declaring an
-         instance unhealthy. Default: 10.
-
-#. 
-
-   Click Add VMs, then select two or more VMs that will divide the load
-   of incoming traffic, and click Apply.
-
-   The new load balancer rule appears in the list. You can repeat these
-   steps to add more load balancer rules for this IP address.
-
-Sticky Session Policies for Load Balancer Rules
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Sticky sessions are used in Web-based applications to ensure continued
-availability of information across the multiple requests in a user's
-session. For example, if a shopper is filling a cart, you need to
-remember what has been purchased so far. The concept of "stickiness" is
-also referred to as persistence or maintaining state.
-
-Any load balancer rule defined in CloudStack can have a stickiness
-policy. The policy consists of a name, stickiness method, and
-parameters. The parameters are name-value pairs or flags, which are
-defined by the load balancer vendor. The stickiness method could be load
-balancer-generated cookie, application-generated cookie, or
-source-based. In the source-based method, the source IP address is used
-to identify the user and locate the user's stored data. In the other
-methods, cookies are used. The cookie generated by the load balancer or
-application is included in request and response URLs to create
-persistence. The cookie name can be specified by the administrator or
-automatically generated. A variety of options are provided to control
-the exact behavior of cookies, such as how they are generated and
-whether they are cached.
-
-For the most up to date list of available stickiness methods, see the
-CloudStack UI or call listNetworks and check the
-SupportedStickinessMethods capability.
-
-.. _health-check:
-
-Health Checks for Load Balancer Rules
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-(NetScaler load balancer only; requires NetScaler version 10.0)
-
-Health checks are used in load-balanced applications to ensure that
-requests are forwarded only to running, available services. When
-creating a load balancer rule, you can specify a health check policy.
-This is in addition to specifying the stickiness policy, algorithm, and
-other load balancer rule options. You can configure one health check
-policy per load balancer rule.
-
-Any load balancer rule defined on a NetScaler load balancer in
-CloudStack can have a health check policy. The policy consists of a ping
-path, thresholds to define "healthy" and "unhealthy" states, health
-check frequency, and timeout wait interval.
-
-When a health check policy is in effect, the load balancer will stop
-forwarding requests to any resources that are found to be unhealthy. If
-the resource later becomes available again, the periodic health check
-will discover it, and the resource will once again be added to the pool
-of resources that can receive requests from the load balancer. At any
-given time, the most recent result of the health check is displayed in
-the UI. For any VM that is attached to a load balancer rule with a
-health check configured, the state will be shown as UP or DOWN in the UI
-depending on the result of the most recent health check.
-
-You can delete or modify existing health check policies.
-
-To configure how often the health check is performed by default, use the
-global configuration setting healthcheck.update.interval (default value
-is 600 seconds). You can override this value for an individual health
-check policy.
-
-For details on how to set a health check policy using the UI, see
-:ref:`adding-lb-rule`.
-
-.. _conf-autoscale:
-
-Configuring AutoScale
-~~~~~~~~~~~~~~~~~~~~~
-
-AutoScaling allows you to scale your back-end services or application
-VMs up or down seamlessly and automatically according to the conditions
-you define. With AutoScaling enabled, you can ensure that the number of
-VMs you are using seamlessly scale up when demand increases, and
-automatically decreases when demand subsides. Thus it helps you save
-compute costs by terminating underused VMs automatically and launching
-new VMs when you need them, without the need for manual intervention.
-
-NetScaler AutoScaling is designed to seamlessly launch or terminate VMs
-based on user-defined conditions. Conditions for triggering a scaleup or
-scaledown action can vary from a simple use case like monitoring the CPU
-usage of a server to a complex use case of monitoring a combination of
-server's responsiveness and its CPU usage. For example, you can
-configure AutoScaling to launch an additional VM whenever CPU usage
-exceeds 80 percent for 15 minutes, or to remove a VM whenever CPU usage
-is less than 20 percent for 30 minutes.
-
-CloudStack uses the NetScaler load balancer to monitor all aspects of a
-system's health and work in unison with CloudStack to initiate scale-up
-or scale-down actions.
-
-.. note:: AutoScale is supported on NetScaler Release 10 Build 74.4006.e and beyond.
-
-Prerequisites
-^^^^^^^^^^^^^
-
-Before you configure an AutoScale rule, consider the following:
-
--  
-
-   Ensure that the necessary template is prepared before configuring
-   AutoScale. When a VM is deployed by using a template and when it
-   comes up, the application should be up and running.
-
-   .. note:: 
-      If the application is not running, the NetScaler device considers the 
-      VM as ineffective and continues provisioning the VMs unconditionally
-      until the resource limit is exhausted.
-
--  
-
-   Deploy the templates you prepared. Ensure that the applications come
-   up on the first boot and is ready to take the traffic. Observe the
-   time requires to deploy the template. Consider this time when you
-   specify the quiet time while configuring AutoScale.
-
--  
-
-   The AutoScale feature supports the SNMP counters that can be used to
-   define conditions for taking scale up or scale down actions. To
-   monitor the SNMP-based counter, ensure that the SNMP agent is
-   installed in the template used for creating the AutoScale VMs, and
-   the SNMP operations work with the configured SNMP community and port
-   by using standard SNMP managers. For example, see `"Configuring SNMP Community String on a RHEL
-   Server" <#configuring-snmp-community-string-on-a-rhel-server>`_ to configure SNMP on a RHEL
-   machine.
-
--  
-
-   Ensure that the endpointe.url parameter present in the Global
-   Settings is set to the Management Server API URL. For example,
-   ``http://10.102.102.22:8080/client/api``. In a multi-node Management
-   Server deployment, use the virtual IP address configured in the load
-   balancer for the management server's cluster. Additionally, ensure
-   that the NetScaler device has access to this IP address to provide
-   AutoScale support.
-
-   If you update the endpointe.url, disable the AutoScale functionality
-   of the load balancer rules in the system, then enable them back to
-   reflect the changes. For more information see :ref:`update-autoscale`.
-
--  
-
-   If the API Key and Secret Key are regenerated for an AutoScale user,
-   ensure that the AutoScale functionality of the load balancers that
-   the user participates in are disabled and then enabled to reflect the
-   configuration changes in the NetScaler.
-
--  
-
-   In an advanced Zone, ensure that at least one VM should be present
-   before configuring a load balancer rule with AutoScale. Having one VM
-   in the network ensures that the network is in implemented state for
-   configuring AutoScale.
-
-Configuration
-^^^^^^^^^^^^^
-
-Specify the following:
-
-|autoscaleateconfig.png|
-
--  
-
-   **Template**: A template consists of a base OS image and application.
-   A template is used to provision the new instance of an application on
-   a scaleup action. When a VM is deployed from a template, the VM can
-   start taking the traffic from the load balancer without any admin
-   intervention. For example, if the VM is deployed for a Web service,
-   it should have the Web server running, the database connected, and so
-   on.
-
--  
-
-   **Compute offering**: A predefined set of virtual hardware
-   attributes, including CPU speed, number of CPUs, and RAM size, that
-   the user can select when creating a new virtual machine instance.
-   Choose one of the compute offerings to be used while provisioning a
-   VM instance as part of scaleup action.
-
--  
-
-   **Min Instance**: The minimum number of active VM instances that is
-   assigned to a load balancing rule. The active VM instances are the
-   application instances that are up and serving the traffic, and are
-   being load balanced. This parameter ensures that a load balancing
-   rule has at least the configured number of active VM instances are
-   available to serve the traffic.
-
-   .. note:: 
-      If an application, such as SAP, running on a VM instance is down for
-      some reason, the VM is then not counted as part of Min Instance
-      parameter, and the AutoScale feature initiates a scaleup action if
-      the number of active VM instances is below the configured value.
-      Similarly, when an application instance comes up from its earlier
-      down state, this application instance is counted as part of the
-      active instance count and the AutoScale process initiates a scaledown
-      action when the active instance count breaches the Max instance
-      value.
-
--  
-
-   **Max Instance**: Maximum number of active VM instances that **should
-   be assigned to**\ a load balancing rule. This parameter defines the
-   upper limit of active VM instances that can be assigned to a load
-   balancing rule.
-
-   Specifying a large value for the maximum instance parameter might
-   result in provisioning large number of VM instances, which in turn
-   leads to a single load balancing rule exhausting the VM instances
-   limit specified at the account or domain level.
-
-   .. note:: 
-      If an application, such as SAP, running on a VM instance is down for
-      some reason, the VM is not counted as part of Max Instance parameter.
-      So there may be scenarios where the number of VMs provisioned for a
-      scaleup action might be more than the configured Max Instance value.
-      Once the application instances in the VMs are up from an earlier down
-      state, the AutoScale feature starts aligning to the configured Max
-      Instance value.
-
-Specify the following scale-up and scale-down policies:
-
--  
-
-   **Duration**: The duration, in seconds, for which the conditions you
-   specify must be true to trigger a scaleup action. The conditions
-   defined should hold true for the entire duration you specify for an
-   AutoScale action to be invoked.
-
--  
-
-   **Counter**: The performance counters expose the state of the
-   monitored instances. By default, CloudStack offers four performance
-   counters: Three SNMP counters and one NetScaler counter. The SNMP
-   counters are Linux User CPU, Linux System CPU, and Linux CPU Idle.
-   The NetScaler counter is ResponseTime. The root administrator can add
-   additional counters into CloudStack by using the CloudStack API.
-
--  
-
-   **Operator**: The following five relational operators are supported
-   in AutoScale feature: Greater than, Less than, Less than or equal to,
-   Greater than or equal to, and Equal to.
-
--  
-
-   **Threshold**: Threshold value to be used for the counter. Once the
-   counter defined above breaches the threshold value, the AutoScale
-   feature initiates a scaleup or scaledown action.
-
--  
-
-   **Add**: Click Add to add the condition.
-
-Additionally, if you want to configure the advanced settings, click Show
-advanced settings, and specify the following:
-
--  
-
-   **Polling interval**: Frequency in which the conditions, combination
-   of counter, operator and threshold, are to be evaluated before taking
-   a scale up or down action. The default polling interval is 30
-   seconds.
-
--  
-
-   **Quiet Time**: This is the cool down period after an AutoScale
-   action is initiated. The time includes the time taken to complete
-   provisioning a VM instance from its template and the time taken by an
-   application to be ready to serve traffic. This quiet time allows the
-   fleet to come up to a stable state before any action can take place.
-   The default is 300 seconds.
-
--  
-
-   **Destroy VM Grace Period**: The duration in seconds, after a
-   scaledown action is initiated, to wait before the VM is destroyed as
-   part of scaledown action. This is to ensure graceful close of any
-   pending sessions or transactions being served by the VM marked for
-   destroy. The default is 120 seconds.
-
--  
-
-   **Security Groups**: Security groups provide a way to isolate traffic
-   to the VM instances. A security group is a group of VMs that filter
-   their incoming and outgoing traffic according to a set of rules,
-   called ingress and egress rules. These rules filter network traffic
-   according to the IP address that is attempting to communicate with
-   the VM.
-
--  
-
-   **Disk Offerings**: A predefined set of disk size for primary data
-   storage.
-
--  
-
-   **SNMP Community**: The SNMP community string to be used by the
-   NetScaler device to query the configured counter value from the
-   provisioned VM instances. Default is public.
-
--  
-
-   **SNMP Port**: The port number on which the SNMP agent that run on
-   the provisioned VMs is listening. Default port is 161.
-
--  
-
-   **User**: This is the user that the NetScaler device use to invoke
-   scaleup and scaledown API calls to the cloud. If no option is
-   specified, the user who configures AutoScaling is applied. Specify
-   another user name to override.
-
--  
-
-   **Apply**: Click Apply to create the AutoScale configuration.
-
-Disabling and Enabling an AutoScale Configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you want to perform any maintenance operation on the AutoScale VM
-instances, disable the AutoScale configuration. When the AutoScale
-configuration is disabled, no scaleup or scaledown action is performed.
-You can use this downtime for the maintenance activities. To disable the
-AutoScale configuration, click the Disable AutoScale |EnableDisable.png| button.
-
-The button toggles between enable and disable, depending on whether
-AutoScale is currently enabled or not. After the maintenance operations
-are done, you can enable the AutoScale configuration back. To enable,
-open the AutoScale configuration page again, then click the Enable
-AutoScale |EnableDisable.png| button.
-
-.. _update-autoscale:
-
-Updating an AutoScale Configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can update the various parameters and add or delete the conditions
-in a scaleup or scaledown rule. Before you update an AutoScale
-configuration, ensure that you disable the AutoScale load balancer rule
-by clicking the Disable AutoScale button.
-
-After you modify the required AutoScale parameters, click Apply. To
-apply the new AutoScale policies, open the AutoScale configuration page
-again, then click the Enable AutoScale button.
-
-Runtime Considerations
-^^^^^^^^^^^^^^^^^^^^^^
-
--  
-
-   An administrator should not assign a VM to a load balancing rule
-   which is configured for AutoScale.
-
--  
-
-   Before a VM provisioning is completed if NetScaler is shutdown or
-   restarted, the provisioned VM cannot be a part of the load balancing
-   rule though the intent was to assign it to a load balancing rule. To
-   workaround, rename the AutoScale provisioned VMs based on the rule
-   name or ID so at any point of time the VMs can be reconciled to its
-   load balancing rule.
-
--  
-
-   Making API calls outside the context of AutoScale, such as destroyVM,
-   on an autoscaled VM leaves the load balancing configuration in an
-   inconsistent state. Though VM is destroyed from the load balancer
-   rule, NetScaler continues to show the VM as a service assigned to a
-   rule.
-
-Global Server Load Balancing Support
-------------------------------------
-
-CloudStack supports Global Server Load Balancing (GSLB) functionalities
-to provide business continuity, and enable seamless resource movement
-within a CloudStack environment. CloudStack achieve this by extending
-its functionality of integrating with NetScaler Application Delivery
-Controller (ADC), which also provides various GSLB capabilities, such as
-disaster recovery and load balancing. The DNS redirection technique is
-used to achieve GSLB in CloudStack.
-
-In order to support this functionality, region level services and
-service provider are introduced. A new service 'GSLB' is introduced as a
-region level service. The GSLB service provider is introduced that will
-provider the GSLB service. Currently, NetScaler is the supported GSLB
-provider in CloudStack. GSLB functionality works in an Active-Active
-data center environment.
-
-About Global Server Load Balancing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Global Server Load Balancing (GSLB) is an extension of load balancing
-functionality, which is highly efficient in avoiding downtime. Based on
-the nature of deployment, GSLB represents a set of technologies that is
-used for various purposes, such as load sharing, disaster recovery,
-performance, and legal obligations. With GSLB, workloads can be
-distributed across multiple data centers situated at geographically
-separated locations. GSLB can also provide an alternate location for
-accessing a resource in the event of a failure, or to provide a means of
-shifting traffic easily to simplify maintenance, or both.
-
-Components of GSLB
-^^^^^^^^^^^^^^^^^^
-
-A typical GSLB environment is comprised of the following components:
-
--  
-
-   **GSLB Site**: In CloudStack terminology, GSLB sites are represented
-   by zones that are mapped to data centers, each of which has various
-   network appliances. Each GSLB site is managed by a NetScaler
-   appliance that is local to that site. Each of these appliances treats
-   its own site as the local site and all other sites, managed by other
-   appliances, as remote sites. It is the central entity in a GSLB
-   deployment, and is represented by a name and an IP address.
-
--  
-
-   **GSLB Services**: A GSLB service is typically represented by a load
-   balancing or content switching virtual server. In a GSLB environment,
-   you can have a local as well as remote GSLB services. A local GSLB
-   service represents a local load balancing or content switching
-   virtual server. A remote GSLB service is the one configured at one of
-   the other sites in the GSLB setup. At each site in the GSLB setup,
-   you can create one local GSLB service and any number of remote GSLB
-   services.
-
--  
-
-   **GSLB Virtual Servers**: A GSLB virtual server refers to one or more
-   GSLB services and balances traffic between traffic across the VMs in
-   multiple zones by using the CloudStack functionality. It evaluates
-   the configured GSLB methods or algorithms to select a GSLB service to
-   which to send the client requests. One or more virtual servers from
-   different zones are bound to the GSLB virtual server. GSLB virtual
-   server does not have a public IP associated with it, instead it will
-   have a FQDN DNS name.
-
--  
-
-   **Load Balancing or Content Switching Virtual Servers**: According to
-   Citrix NetScaler terminology, a load balancing or content switching
-   virtual server represents one or many servers on the local network.
-   Clients send their requests to the load balancing or content
-   switching virtual server's virtual IP (VIP) address, and the virtual
-   server balances the load across the local servers. After a GSLB
-   virtual server selects a GSLB service representing either a local or
-   a remote load balancing or content switching virtual server, the
-   client sends the request to that virtual server's VIP address.
-
--  
-
-   **DNS VIPs**: DNS virtual IP represents a load balancing DNS virtual
-   server on the GSLB service provider. The DNS requests for domains for
-   which the GSLB service provider is authoritative can be sent to a DNS
-   VIP.
-
--  
-
-   **Authoritative DNS**: ADNS (Authoritative Domain Name Server) is a
-   service that provides actual answer to DNS queries, such as web site
-   IP address. In a GSLB environment, an ADNS service responds only to
-   DNS requests for domains for which the GSLB service provider is
-   authoritative. When an ADNS service is configured, the service
-   provider owns that IP address and advertises it. When you create an
-   ADNS service, the NetScaler responds to DNS queries on the configured
-   ADNS service IP and port.
-
-How Does GSLB Works in CloudStack?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Global server load balancing is used to manage the traffic flow to a web
-site hosted on two separate zones that ideally are in different
-geographic locations. The following is an illustration of how GLSB
-functionality is provided in CloudStack: An organization, xyztelco, has
-set up a public cloud that spans two zones, Zone-1 and Zone-2, across
-geographically separated data centers that are managed by CloudStack.
-Tenant-A of the cloud launches a highly available solution by using
-xyztelco cloud. For that purpose, they launch two instances each in both
-the zones: VM1 and VM2 in Zone-1 and VM5

<TRUNCATED>

[16/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
new file mode 100644
index 0000000..1433054
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
@@ -0,0 +1,499 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# aguncn <ag...@163.com>, 2014
+# 语法盐 <um...@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-26 14:32+0000\n"
+"Last-Translator: 语法盐 <um...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# e8bd92e93dac45f788464ab1963b20e7
+#: ../../troubleshooting.rst:17
+msgid "TroubleShooting"
+msgstr "故障排查"
+
+# 55d6cf3cc73d4ef5a617636942890a97
+#: ../../troubleshooting.rst:20
+msgid "Working with Server Logs"
+msgstr "使用服务器日志"
+
+# 493b26a59c724cb0b4753cf2de7729c6
+#: ../../troubleshooting.rst:22
+msgid ""
+"The CloudStack Management Server logs all web site, middle tier, and "
+"database activities for diagnostics purposes in "
+"`/var/log/cloudstack/management/`. The CloudStack logs a variety of error "
+"messages. We recommend this command to find the problematic output in the "
+"Management Server log:."
+msgstr "为了方便诊断系统,CloudStack 管理服务器在目录/var/log/cloud/management/下记录了所有网站、中间层和数据库的活动。CloudStack 会记录各种出错信息。我们推荐使用下述命令从管理服务器日志中寻找有问题的输出日志:"
+
+# e9110df374044f87990151358476d4c4
+#: ../../troubleshooting.rst:29
+msgid ""
+"When copying and pasting a command, be sure the command has pasted as a "
+"single line before executing. Some document viewers may introduce unwanted "
+"line breaks in copied text."
+msgstr "当你在拷贝和粘贴这个命令时,请确保所有的命令都在同一行里。有的文档拷贝工具会将这个命令分割为多行。"
+
+# 0650dd8f9e3042b6a0023c284e9700af
+#: ../../troubleshooting.rst:37
+msgid ""
+"The CloudStack processes requests with a Job ID. If you find an error in the"
+" logs and you are interested in debugging the issue you can grep for this "
+"job ID in the management server log. For example, suppose that you find the "
+"following ERROR message:"
+msgstr "CloudStack处理请求时会生成一个任务ID。如果您发现了日志中的某个错误,然后想调试该问题,您可以在管理服务器日志中grep这个任务ID。例如,假设您发现了以下的ERROR信息:"
+
+# 8311990224b84dd0b3faf4084d527b4f
+#: ../../troubleshooting.rst:46
+msgid ""
+"Note that the job ID is 1076. You can track back the events relating to job "
+"1076 with the following grep:"
+msgstr "注意到任务ID是1076。你可以追踪返回事件的相近任务1076按照以下grep:"
+
+# e3ffc3e9a91f4bbd92acf9a582aa4f09
+#: ../../troubleshooting.rst:53
+msgid ""
+"The CloudStack Agent Server logs its activities in "
+"`/var/log/cloudstack/agent/`."
+msgstr "CloudStack代理服务器在 `/var/log/cloudstack/agent/`记录了它的活动。"
+
+# 2e3bac54e6a44e7a916a10b1a72ae7b8
+#: ../../troubleshooting.rst:57
+msgid "Data Loss on Exported Primary Storage"
+msgstr "在导出主存储时的数据丢失"
+
+# 17772f3eaf854986935381edba6a08f4
+# a36bc3bf835b43ceb89eb0502f49427f
+# 5b32c5e122f34a7390b04dc584d7d8b1
+# 8c990e9835c843e0ba8e6389024c9da7
+# c07d93b58e73413caee9927f2f377a4c
+# 0210bf5ba6124daab904e885ec47d2c3
+#: ../../troubleshooting.rst:60 ../../troubleshooting.rst:94
+#: ../../troubleshooting.rst:138 ../../troubleshooting.rst:158
+#: ../../troubleshooting.rst:178 ../../troubleshooting.rst:215
+msgid "Symptom"
+msgstr "症状"
+
+# b8c4b40af3fd4552bdc54740a5a0fd39
+#: ../../troubleshooting.rst:62
+msgid ""
+"Loss of existing data on primary storage which has been exposed as a Linux "
+"NFS server export on an iSCSI volume."
+msgstr "主存储的已有数据丢失。该主存储是用iSCSI卷导出的一个Linux NFS服务器输出。"
+
+# c0c2bc4870e74609a67d1aed2af2b411
+# 989912d8a32b45e8a4bd2c54b5a97647
+# 1b80c032e2184fad85a5b5d2321b104a
+# b3c2f63d649b4d4dbb78fe05f3e2f087
+# aa3a404aa32c48bbb850fca268ee4ac9
+# 57820682c7c44dc0b9429c160629a1eb
+#: ../../troubleshooting.rst:66 ../../troubleshooting.rst:100
+#: ../../troubleshooting.rst:143 ../../troubleshooting.rst:163
+#: ../../troubleshooting.rst:195 ../../troubleshooting.rst:221
+msgid "Cause"
+msgstr "原因"
+
+# ea41406a62e9453a82d56cf6ddeb6106
+#: ../../troubleshooting.rst:68
+msgid ""
+"It is possible that a client from outside the intended pool has mounted the "
+"storage. When this occurs, the LVM is wiped and all data in the volume is "
+"lost"
+msgstr "可能的原因是存储池之外的某个客户端挂载了该存储。如果发生了这种情况,LVM会被擦除,该卷上的所有数据都会丢失。"
+
+# f0ac12571f8b418ea67f8c179e9588d9
+# f84f95c1a8d549ed861a92e77654701f
+# 520bb677c65d4e4181f06db8804f56f0
+# 34a989bf06a745339a0202448dfa05be
+# a5d809d99a0f49cdbe7d4430121a264c
+# 2b638ad3018740ebb634edfd14737f06
+#: ../../troubleshooting.rst:73 ../../troubleshooting.rst:105
+#: ../../troubleshooting.rst:149 ../../troubleshooting.rst:170
+#: ../../troubleshooting.rst:204 ../../troubleshooting.rst:229
+msgid "Solution"
+msgstr "解决方案"
+
+# 4e51a9c86fae49d7a0d2e695914263a2
+#: ../../troubleshooting.rst:75
+msgid ""
+"When setting up LUN exports, restrict the range of IP addresses that are "
+"allowed access by specifying a subnet mask. For example:"
+msgstr "配置LUN输出时,通过指定子网掩码来限制可以访问存储的IP地址范围。例如:"
+
+# 568eeac2135a4012ab60259769577431
+#: ../../troubleshooting.rst:82
+msgid "Adjust the above command to suit your deployment needs."
+msgstr "根据你的部署需求,调整如上参数。"
+
+# d4fee5a097ac450381983de58d22c6e9
+#: ../../troubleshooting.rst:85
+msgid "More Information"
+msgstr "更多信息"
+
+# 415506db5609428e9f0558889286845c
+#: ../../troubleshooting.rst:87
+msgid ""
+"See the export procedure in the \"Secondary Storage\" section of the "
+"CloudStack Installation Guide"
+msgstr "请参考CloudStack安装指南的“辅助存储”章节中的导出过程。"
+
+# bc6b86b9b20744fa952c68c30ec06a25
+#: ../../troubleshooting.rst:91
+msgid "Recovering a Lost Virtual Router"
+msgstr "恢复丢失的虚拟路由器"
+
+# e1bedbd70a194eea9bcb6f65d3f50c4c
+#: ../../troubleshooting.rst:96
+msgid ""
+"A virtual router is running, but the host is disconnected. A virtual router "
+"no longer functions as expected."
+msgstr "虚拟路由器是运行着的,但主机失去连接。虚拟路由器不再按期望工作。"
+
+# 08893bf84e644b23a7e0c804ca534073
+#: ../../troubleshooting.rst:102
+msgid "The Virtual router is lost or down."
+msgstr "虚拟路由器丢失或宕机。"
+
+# deaff49a430e473684632d83aedc2d39
+#: ../../troubleshooting.rst:107
+msgid ""
+"If you are sure that a virtual router is down forever, or no longer "
+"functions as expected, destroy it. You must create one afresh while keeping "
+"the backup router up and running (it is assumed this is in a redundant "
+"router setup):"
+msgstr "如果您确定虚拟路由器宕机了,或不再正常工作,请销毁它。您必须再建一个新的,此时备份路由器应保持运行(假定在使用冗余路由器配置的情况下)。"
+
+# 263660e8d5c948cc90b7b071927c461c
+#: ../../troubleshooting.rst:114
+msgid ""
+"Force stop the router. Use the stopRouter API with forced=true parameter to "
+"do so."
+msgstr "强制停止虚拟路由器。请使用带参数forced=true的stopRouter API执行该步。"
+
+# a8c0f38a546c4ff7bee2db37d149b15c
+#: ../../troubleshooting.rst:119
+msgid ""
+"Before you continue with destroying this router, ensure that the backup "
+"router is running. Otherwise the network connection will be lost."
+msgstr "在销毁虚拟路由器之前,请确保备份路由器正常运行。否则用户的网络连接将中断。"
+
+# af2a90eee3694d938aa01933f42ba89b
+#: ../../troubleshooting.rst:125
+msgid "Destroy the router by using the destroyRouter API."
+msgstr "使用destroyRouter API销毁该虚拟路由器。"
+
+# 9089ab21bdab4b03b6f2dcc47cebf9bc
+#: ../../troubleshooting.rst:127
+msgid ""
+"Recreate the missing router by using the restartNetwork API with "
+"cleanup=false parameter. For more information about redundant router setup, "
+"see Creating a New Network Offering."
+msgstr "使用restartNetwork API(参数cleanup=false)重建丢失的虚拟路由器。关于冗余虚拟路由器的配置,请参考创建新的网络方案。"
+
+# a434f77186074258ad0e39e2ff0db759
+#: ../../troubleshooting.rst:131
+msgid ""
+"For more information about the API syntax, see the API Reference at "
+"`http://cloudstack.apache.org/docs/api/ "
+"<http://cloudstack.apache.org/docs/api/>`_."
+msgstr "关于更多的API语法信息,参见API参考`http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_。"
+
+# eae25ddc68984cdf8cb3f8f596561d2a
+#: ../../troubleshooting.rst:135
+msgid "Maintenance mode not working on vCenter"
+msgstr "维护模式没在vCenter中生效"
+
+# b72eae733c17444ba5a514ecb6b09fa5
+#: ../../troubleshooting.rst:140
+msgid ""
+"Host was placed in maintenance mode, but still appears live in vCenter."
+msgstr "主机已经置为维护模式,但在vCenter中还是活动的。"
+
+# fbf7e8fb0dd64ce1a2017a533e13295e
+#: ../../troubleshooting.rst:145
+msgid ""
+"The CloudStack administrator UI was used to place the host in scheduled "
+"maintenance mode. This mode is separate from vCenter's maintenance mode."
+msgstr "CloudStack管理员用户界面使用日程中的主机维护模式。该模式与vCenter的维护模式无关。"
+
+# 7ab1f606082f4ed2a25670e6c57fc031
+#: ../../troubleshooting.rst:151
+msgid "Use vCenter to place the host in maintenance mode."
+msgstr "请使用vCenter将主机置为维护模式。"
+
+# 1311ca0126c0430a9dd150a744645cdc
+#: ../../troubleshooting.rst:155
+msgid "Unable to deploy VMs from uploaded vSphere template"
+msgstr "无法从上传的vSphere模板部署虚拟机"
+
+# 025f901918574e87add36be30ea7798f
+#: ../../troubleshooting.rst:160
+msgid "When attempting to create a VM, the VM will not deploy."
+msgstr "当试图创建一个虚拟机,虚拟机将无法部署。"
+
+# 07f8edc978564e228b5b8b83d7435203
+#: ../../troubleshooting.rst:165
+msgid ""
+"If the template was created by uploading an OVA file that was created using "
+"vSphere Client, it is possible the OVA contained an ISO image. If it does, "
+"the deployment of VMs from the template will fail."
+msgstr "如果模板通过上传OVA文件创建,而OVA文件是使用vSphere Client创建的,可能OVA中包含ISO镜像。如果是的话,从模板部署虚拟机将失败。"
+
+# e0782e40719a4fcaa6ceb63e014b5b83
+#: ../../troubleshooting.rst:172
+msgid "Remove the ISO and re-upload the template."
+msgstr "移除ISO并重新上传模板。"
+
+# 35ac51f5ddaf48a793878e40c33977b9
+#: ../../troubleshooting.rst:175
+msgid "Unable to power on virtual machine on VMware"
+msgstr "无法启动VMware的虚机"
+
+# 42400d62c2e14b4d9ad3abb86261cc42
+#: ../../troubleshooting.rst:180
+msgid "Virtual machine does not power on. You might see errors like:"
+msgstr "虚机不能启动。可能出现以下错误:"
+
+# 87c7076aa51441eda4d24256adff07b5
+#: ../../troubleshooting.rst:184
+msgid "Unable to open Swap File"
+msgstr "不能打开交换文件"
+
+# 0cf604246d19441aba6cae448684bbf4
+#: ../../troubleshooting.rst:188
+msgid "Unable to access a file since it is locked"
+msgstr "不能访问文件,因为文件被锁定"
+
+# d18757cf00914c3ca874b46461d59d4a
+#: ../../troubleshooting.rst:192
+msgid "Unable to access Virtual machine configuration"
+msgstr "不能访问虚机配置"
+
+# 86aaef84a5ce401ba596471a5d992fa7
+#: ../../troubleshooting.rst:197
+msgid ""
+"A known issue on VMware machines. ESX hosts lock certain critical virtual "
+"machine files and file systems to prevent concurrent changes. Sometimes the "
+"files are not unlocked when the virtual machine is powered off. When a "
+"virtual machine attempts to power on, it can not access these critical "
+"files, and the virtual machine is unable to power on."
+msgstr "这是VMware机器的已知问题。为防止并发修改,ESX主机会锁定特定的关键虚机文件和文件系统。有时,虚机关机时没有解锁这些文件。当虚机再次开机时,由于不能访问这些关键文件,虚机就不能启动。"
+
+# 2a6626575cfa4e8d9051adef52800493
+#: ../../troubleshooting.rst:206
+msgid "See the following:"
+msgstr "参见:"
+
+# 5f72ef4ab29d49aabf6254dadff2157f
+#: ../../troubleshooting.rst:208
+msgid ""
+"`VMware Knowledge Base Article "
+"<http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=10051/>`_"
+msgstr "`VMware Knowledge Base Article <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=10051/>`_"
+
+# c0e9e61553884ca791e3221a8b15478b
+#: ../../troubleshooting.rst:212
+msgid "Load balancer rules fail after changing network offering"
+msgstr "改变网络方案后负载均衡规则失效"
+
+# 54be70ae479746b099f16a975e6b313e
+#: ../../troubleshooting.rst:217
+msgid ""
+"After changing the network offering on a network, load balancer rules stop "
+"working."
+msgstr "修改网络的网络方案后,负载均衡规则不再生效。"
+
+# 8859286ab9d946d5afc087a41d70f300
+#: ../../troubleshooting.rst:223
+msgid ""
+"Load balancing rules were created while using a network service offering "
+"that includes an external load balancer device such as NetScaler, and later "
+"the network service offering changed to one that uses the CloudStack virtual"
+" router."
+msgstr "负载均衡规则创建时使用的是包含外部负载均衡器,例如NetScaler的网络方案,后来改为使用CloudStack虚拟路由器的网络方案。"
+
+# c745ba81f8c64e42ad0d937ae17224cd
+#: ../../troubleshooting.rst:231
+msgid ""
+"Create a firewall rule on the virtual router for each of your existing load "
+"balancing rules so that they continue to function."
+msgstr "针对每条已有的负载均衡规则,在虚拟路由器上创建相同的防火墙规则,以便规则继续生效。"
+
+# 59274eeb4f9c42eab20167cb78fcfcec
+#: ../../troubleshooting.rst:235
+msgid "Troubleshooting Internet Traffic"
+msgstr "故障排查网络传输"
+
+# 8b0eac2ff7a14b528639484afb576723
+#: ../../troubleshooting.rst:237
+msgid ""
+"Below are a few troubleshooting steps to check whats going wrong with your "
+"network..."
+msgstr "在下列故障排查步骤中检验你网络中出现的故障..."
+
+# f27e96f760da43158895e31cefe0d354
+#: ../../troubleshooting.rst:241
+msgid "Trouble Shooting Steps"
+msgstr "故障排查步骤"
+
+# 5b3da7b6d48a45ccaab81ec2fefb9b72
+#: ../../troubleshooting.rst:243
+msgid ""
+"The switches have to be configured correctly to pass VLAN traffic. You can "
+"verify if VLAN traffic is working by bringing up a tagged interface on the "
+"hosts and pinging between them as below..."
+msgstr "交换机上可以完成正确的配置VLAN通信。你可以辨别主机上的VLAN是否通讯通过提出标记接口,并在上述两个VLAN中使用ping命令。"
+
+# ebc26236b36141e2ad5ea9414f0eefc4
+#: ../../troubleshooting.rst:247
+msgid "On *host1 (kvm1)*"
+msgstr "在*host1 (kvm1)*上"
+
+# 1466a71fb13c4e8d9d6885ac3c9a46ea
+#: ../../troubleshooting.rst:255
+msgid "On *host2 (kvm2)*"
+msgstr "在*host2 (kvm2)*上"
+
+# e3a67b52cabd4480b54de5ad3c79f6b5
+#: ../../troubleshooting.rst:263
+msgid ""
+"If the pings dont work, run *tcpdump(8)* all over the place to check who is "
+"gobbling up the packets. Ultimately, if the switches are not configured "
+"correctly, CloudStack networking wont work so fix the physical networking "
+"issues before you proceed to the next steps"
+msgstr "如果ping不通,运行 *tcpdump(8)*在所有VLAN上检查丢失的数据包。最终,如果交换机配置失败,CloudStack网络将无法工作,所以在处理下一部前要确定物理网络设备的问题。"
+
+# ce37e4e95d564397b90ff5aef4baa80d
+#: ../../troubleshooting.rst:268
+msgid ""
+"Ensure `Traffic Labels <http://cloudstack.apache.org/docs/en-"
+"US/Apache_CloudStack/4.2.0/html/Installation_Guide/about-physical-"
+"networks.html>`_ are set for the Zone."
+msgstr "确保 `流量标签 <http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.2.0/html/Installation_Guide/about-physical-networks.html>`_ 已经设置在域中。 "
+
+# 6be4c1c298e3442c8353ba69a623d6d9
+#: ../../troubleshooting.rst:270
+msgid ""
+"Traffic labels need to be set for all hypervisors including XenServer, KVM "
+"and VMware types. You can configure traffic labels when you creating a new "
+"zone from the *Add Zone Wizard*."
+msgstr "流量标签需要在包括XenServer,KVM和VMwarel在内的所有类型的hypervisors设置。当你从*Add Zone Wizard*创建一个域时,你可以配置流量标签。"
+
+# f1555452ac5a4341a628cf84d907af13
+#: ../../troubleshooting.rst:276
+msgid ""
+"On an existing zone, you can modify the traffic labels by going to "
+"*Infrastructure, Zones, Physical Network* tab."
+msgstr "在一个已经存在的域总,你可以通过*Add Zone Wizard*修改流量标签。"
+
+# 344079c7f4e54f748b8d4b63b1be58d4
+#: ../../troubleshooting.rst:281
+msgid "List labels using *CloudMonkey*"
+msgstr "列出正在使用的*CloudMonkey*"
+
+# 5426cbca012c4e0ba7d7afa01f49719e
+#: ../../troubleshooting.rst:313
+msgid ""
+"KVM traffic labels require to be named as *\"cloudbr0\"*, *\"cloudbr2\"*, "
+"*\"cloudbrN\"* etc and the corresponding bridge must exist on the KVM hosts."
+" If you create labels/bridges with any other names, CloudStack (atleast "
+"earlier versions did) seems to ignore them. CloudStack does not create the "
+"physical bridges on the KVM hosts, you need to create them **before** before"
+" adding the host to Cloudstack."
+msgstr "KVM流量标签要求被命名为*\"cloudbr0\"*, *\"cloudbr2\"*, *\"cloudbrN\"* 等而且响应桥必须在KVM主机上。如果你以其他名字命名标记/桥,CloudStack(至少是较早版本)将会忽略它。CloudStack不能再KVM主机上创建物理桥,你需要在向CloudStackt添加主机前 **before**创建它们。"
+
+# 4892fd19e0e14fc39b02e7c7dddb8f2b
+#: ../../troubleshooting.rst:332
+msgid ""
+"The Virtual Router, SSVM, CPVM *public* interface would be bridged to a "
+"physical interface on the host. In the example below, *cloudbr0* is the "
+"public interface and CloudStack has correctly created the virtual interfaces"
+" bridge. This virtual interface to physical interface mapping is done "
+"automatically by CloudStack using the traffic label settings for the Zone. "
+"If you have provided correct settings and still dont have a working working "
+"Internet, check the switching layer before you debug any further. You can "
+"verify traffic using tcpdump on the virtual, physical and bridge interfaces."
+msgstr "虚拟路由,SSVM,CPVM *public*接口将被桥接到主机的物理接口上。在下例中, *cloudbr0*是公共接口,CloudStack将创建虚拟接口桥。这个虚拟接口到物理接口映射式CloudStack用设置在域中的流量标签自动设置的。如果你提供争取的设置,但仍不能在网络上工作,在下一步调试前检查下交换层的设备。你可以在虚拟,物理和桥设备上使用tcpdump证实流量。"
+
+# a87950c34d404d9ba5426109cc68a1cc
+#: ../../troubleshooting.rst:364
+msgid ""
+"Pre-create labels on the XenServer Hosts. Similar to KVM bridge setup, "
+"traffic labels must also be pre-created on the XenServer hosts before adding"
+" them to CloudStack."
+msgstr "在XenServer上预先创建标签。类似于KVM桥启动,流量标签必须在加入CloudStack的XenServer主机上提前创建。"
+
+# 59c18293d72e465580db2a7b77faebcc
+#: ../../troubleshooting.rst:377
+msgid ""
+"The Internet would be accessible from both the SSVM and CPVM instances by "
+"default. Their public IPs will also be directly pingable from the Internet. "
+"Please note that these test would work only if your switches and traffic "
+"labels are configured correctly for your environment. If your SSVM/CPVM cant"
+" reach the Internet, its very unlikely that the Virtual Router (VR) can also"
+" the reach the Internet suggesting that its either a switching issue or "
+"incorrectly assigned traffic labels. Fix the SSVM/CPVM issues before you "
+"debug VR issues."
+msgstr "网络将会从SSVM和CPVM实例上默认获取。它们的公共IP也将会直接由网络ping通。请注意一下这些测试仅在交换机或者流量标签已被成功配置在你的环境中实现。如果你的  SSVM/CPVM可以连接到Internet, 它非常不同于虚拟路由器(VR)也可以连接到Internet,建议可能是交换时的问题或者是错误分配了流量标签。确定SSVM/CPVM的问题前请先调试VR问题。"
+
+# c4cfab36727849f1a4ca325b9a43eaf9
+#: ../../troubleshooting.rst:409
+msgid ""
+"The Virtual Router (VR) should also be able to reach the Internet without "
+"having any Egress rules. The Egress rules only control forwarded traffic and"
+" not traffic that originates on the VR itself."
+msgstr "除非有些Egress规则,Virtual Router(VR)也是不能到达Internet。Egress规则仅控制VR自身的通讯与否。"
+
+# f7afcd661a50477fb5a663ebab387610
+#: ../../troubleshooting.rst:424
+msgid ""
+"However, the Virtual Router's (VR) Source NAT Public IP address **WONT** be "
+"reachable until appropriate Ingress rules are in place. You can add "
+"*Ingress* rules under *Network, Guest Network, IP Address, Firewall* setting"
+" page."
+msgstr "尽管如此,Virtual Router(VR) Source NAT Pulic IP地址除非有近似的Ingress规则在此,要么**WONT** 达到。你可以添加 *Ingress* rules under *Network, Guest Network, IP Address, Firewall* 设置页。"
+
+# ad40b8f845bf4c679b118fa88838fc44
+#: ../../troubleshooting.rst:431
+msgid ""
+"The VM Instances by default wont be able to access the Internet. Add Egress "
+"rules to permit traffic."
+msgstr "默认的VM Instances不能够连接Internet。添加Egress规则后可允许连接。"
+
+# 8f93a9ea7cec42038a0511d2d00b1b9c
+#: ../../troubleshooting.rst:436
+msgid ""
+"Some users have reported that flushing IPTables rules (or changing routes) "
+"on the SSVM, CPVM or the Virtual Router makes the Internet work. This is not"
+" expected behaviour and suggests that your networking settings are "
+"incorrect. No IPtables/route changes are required on the SSVM, CPVM or the "
+"VR. Go back and double check all your settings."
+msgstr "一些用户报告在SSVM,CPVM或者是Vir Router刷新IPTables规则(或改变路由)可以使Internet工作。这不是系统期望的行为并建议这样的网络设置是错误的。SSVM,CPVM或者是VR上没有要求IPtables/route改变。回去重新检查你所有的设置吧。"
+
+# 5b0ed7e9c0584d40aa39fb35184e6122
+#: ../../troubleshooting.rst:443
+msgid ""
+"In a vast majority of the cases, the problem has turned out to be at the "
+"switching layer where the L3 switches were configured incorrectly."
+msgstr "在海量的实例中,问题会出现在交换层,原因是L3的配置错误."
+
+# 264a011e35404961978190f2eebf50e0
+#: ../../troubleshooting.rst:446
+msgid ""
+"This section was contibuted by Shanker Balan and was originally published on"
+" `Shapeblue's blog <http://shankerbalan.net/blog/internet-not-working-on-"
+"cloudstack-vms/>`_"
+msgstr "这些内容有Shanker Balan贡献,其原文发布在`Shapeblue'博客中<http://shankerbalan.net/blog/internet-not-working-on-cloudstack-vms/>`_"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/tuning.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/tuning.po b/source/locale/zh_CN/LC_MESSAGES/tuning.po
new file mode 100644
index 0000000..427a067
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/tuning.po
@@ -0,0 +1,166 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 06:32+0000\n"
+"Last-Translator: darrentang <da...@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# a09f44bbf5fe4885aa5f5856bae80ea4
+#: ../../tuning.rst:18
+msgid "Tuning"
+msgstr "调优"
+
+# eb683307decf4141bcb683821c79ee03
+#: ../../tuning.rst:20
+msgid ""
+"This section provides tips on how to improve the performance of your cloud."
+msgstr "本节提示如何提高云性能。"
+
+# 0ae5216b7aa04aed8e4ba37ced396c59
+#: ../../tuning.rst:24
+msgid "Performance Monitoring"
+msgstr "性能监控"
+
+# 4b6618cc525444739c5aec508caf360f
+#: ../../tuning.rst:26
+msgid ""
+"Host and guest performance monitoring is available to end users and "
+"administrators. This allows the user to monitor their utilization of "
+"resources and determine when it is appropriate to choose a more powerful "
+"service offering or larger disk."
+msgstr "终端用户和管理员都可以对主机和虚拟机进行性能监控。这允许用户监控他们的资源利用情况并决定在适当的时候选择更强大的服务方案和更大的磁盘。"
+
+# 276e9fb4d3d343ff908423a78692e732
+#: ../../tuning.rst:32
+msgid "Increase Management Server Maximum Memory"
+msgstr "增加管理服务器到最大内存"
+
+# 411d58758d4c45029bda78e8e3a11012
+#: ../../tuning.rst:34
+msgid ""
+"If the Management Server is subject to high demand, the default maximum JVM "
+"memory allocation can be insufficient. To increase the memory:"
+msgstr "如果管理服务器用于高需求,默认JVM的最大内存分配可能不足。增加内存:"
+
+# d48e389d98ec45acb7f98d594f33935d
+#: ../../tuning.rst:39
+msgid "Edit the Tomcat configuration file:"
+msgstr "编辑Tomcat配置文件:"
+
+# 279ab9737d40423aa83a711cc6156296
+#: ../../tuning.rst:47
+msgid "Change the command-line parameter -XmxNNNm to a higher value of N."
+msgstr "改变命令行参数 -XmxNNNm中的N为更高的值。"
+
+# 4a5af47c21964e2f9365ab8534002b04
+#: ../../tuning.rst:49
+msgid ""
+"For example, if the current value is -Xmx128m, change it to -Xmx1024m or "
+"higher."
+msgstr "例如,如果当前值为 -Xmx128m,则改为 -Xmx1024m或更高。"
+
+# 0b7931e36ac34cd8a33dc0c4a60e549e
+#: ../../tuning.rst:54
+msgid "To put the new setting into effect, restart the Management Server."
+msgstr "将新的设置生效,重启管理服务。"
+
+# 922da07d183b4c1fb87754cee9ee711c
+#: ../../tuning.rst:60
+msgid ""
+"For more information about memory issues, see \"FAQ: Memory\" at `Tomcat "
+"Wiki. <http://wiki.apache.org/tomcat/FAQ/Memory>`_"
+msgstr "欲了解更多管理内存问题的详细信息,请参阅\"FAQ:内存\" 在 `Tomcat Wiki. <http://wiki.apache.org/tomcat/FAQ/Memory>`_"
+
+# 2abdd3204b2647e7b0d236deba7e6dc7
+#: ../../tuning.rst:64
+msgid "Set Database Buffer Pool Size"
+msgstr "设置数据库缓冲池大小"
+
+# 3dc24e56555f45a3a78f54a9c01167cb
+#: ../../tuning.rst:66
+msgid ""
+"It is important to provide enough memory space for the MySQL database to "
+"cache data and indexes:"
+msgstr "为MySQL数据库提供足够的内存空间来缓存数据和索引是很重要的:"
+
+# 1ad70fcf154640e0bd9f10edc5194af6
+#: ../../tuning.rst:71
+msgid "Edit the MySQL configuration file:"
+msgstr "编辑MySQL配置文件:"
+
+# 98a251615df34d0ebe59198a671cfb7a
+#: ../../tuning.rst:79
+msgid ""
+"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."
+msgstr "在 [mysqld]部分的datadir下面插入如下行。使用适合您情况的值。如果MySQL和管理服务器在同一台服务器上面我们建议设置缓冲池为内存的40%,如果MySQL为专用的服务器我们建议设置为内存的70%。下面的示例假设一台专用的服务器的内存为1024M。"
+
+# f4b16571708a45d6bdccae5a0c4eea4f
+#: ../../tuning.rst:92
+msgid "Restart the MySQL service."
+msgstr "重启MySQL服务."
+
+# e96855539cae48449d32a81ed8982be7
+#: ../../tuning.rst:98
+msgid ""
+"For more information about the buffer pool, see \"The InnoDB Buffer Pool\" "
+"at `MySQL Reference Manual <http://dev.mysql.com/doc/refman/5.5/en/innodb-"
+"buffer-pool.html>`_."
+msgstr "欲了解更多关于缓冲池的信息,请参阅\"InnoDB缓冲池\" `MySQL参考手册<http://dev.mysql.com/doc/refman/5.5/en/innodb-buffer-pool.html>`_."
+
+# 5bde2eb730ae44e1ac63a015a63a84ef
+#: ../../tuning.rst:103
+msgid "Set and Monitor Total VM Limits per Host"
+msgstr "设置和监控每个主机的总VM数限制"
+
+# 4d031105d275433294098273f33fe211
+#: ../../tuning.rst:105
+msgid ""
+"The CloudStack administrator should monitor the total number of VM instances"
+" in each cluster, and disable allocation to the cluster if the total is "
+"approaching the maximum that the hypervisor can handle. Be sure to leave a "
+"safety margin to allow for the possibility of one or more hosts failing, "
+"which would increase the VM load on the other hosts as the VMs are "
+"automatically redeployed. Consult the documentation for your chosen "
+"hypervisor to find the maximum permitted number of VMs per host, then use "
+"CloudStack global configuration settings to set this as the default limit. "
+"Monitor the VM activity in each cluster at all times. Keep the total number "
+"of VMs below a safe level that allows for the occasional host failure. For "
+"example, if there are N hosts in the cluster, and you want to allow for one "
+"host in the cluster to be down at any given time, the total number of VM "
+"instances you can permit in the cluster is at most (N-1) \\* (per-host-"
+"limit). Once a cluster reaches this number of VMs, use the CloudStack UI to "
+"disable allocation of more VMs to the cluster."
+msgstr "管理员应该监视每个集群中的虚拟机实例的总数,如果总量快达到hypervisor允许的最大虚拟机数量时,不再向此群集分配虚拟机。并且,要注意为主机预留一定的计算能力,以防止群集中有主机发生故障,因为发生故障的主机上的虚拟机需要重新部署在这些预留主机上。请咨询您所选择hypervisor的文档,了解此hypervisor能支持的最大虚拟机数量,并将此数值设置在CloudStack的全局设置里。监控每个群集里虚拟机的活跃程序,并将活跃虚拟机保持在一个安全线内。这样,CloudStack就能允许偶尔的主机故障。举个示例:如果集群里有N个主机,而你只能让其中任一主机的停机时间不超过特定时间。那么,你能在此集群部署的最多虚拟主机数量值为:(N-1) \\* (每主机最大虚拟量数量限值)。一旦群集中的虚拟机达到此数量,必须在CloudStack的用户界面中禁止向
 此群集分配新的虚拟机。"
+
+# e32b5f442e7246fb98e590d27b87fbb5
+#: ../../tuning.rst:123
+msgid "Configure XenServer dom0 Memory"
+msgstr "配置XenServer dom0的内存"
+
+# 6614a82a183a4312bdbccca333889df7
+#: ../../tuning.rst:125
+msgid ""
+"Configure the XenServer dom0 settings to allocate more memory to dom0. This "
+"can enable XenServer to handle larger numbers of virtual machines. We "
+"recommend 2940 MB of RAM for XenServer dom0. For instructions on how to do "
+"this, see `Citrix Knowledgebase Article "
+"<http://support.citrix.com/article/CTX126531>`_.The article refers to "
+"XenServer 5.6, but the same information applies to XenServer 6"
+msgstr "配置XenServer为dom0分配更多的内存,可使XenServer处理更多的虚拟机。我们推荐为dom0设置的内存数值为2940 MB。至于如何操作,可以参阅如下URL: `Citrix 知识库文章 <http://support.citrix.com/article/CTX126531>`_.。这篇文章同时适用于XenServer 5.6和6.0版本。"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/ui.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/ui.po b/source/locale/zh_CN/LC_MESSAGES/ui.po
new file mode 100644
index 0000000..4bd975a
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/ui.po
@@ -0,0 +1,457 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# darrentang <da...@gmail.com>, 2014
+# renoshen <sh...@sinosig.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-26 04:42+0000\n"
+"Last-Translator: renoshen <sh...@sinosig.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 824f2fb7a40e400c817793505bf85705
+#: ../../ui.rst:17
+msgid "User Interface"
+msgstr "用户界面"
+
+# 9930e90c431f4e6b83a5464220c2f363
+#: ../../ui.rst:20
+msgid "Log In to the UI"
+msgstr "登陆到用户界面"
+
+# 66dab55143a94a97bf69d0a14b01ee02
+#: ../../ui.rst:22
+msgid ""
+"CloudStack provides a web-based UI that can be used by both administrators "
+"and end users. The appropriate version of the UI is displayed depending on "
+"the credentials used to log in. The UI is available in popular browsers "
+"including IE7, IE8, IE9, Firefox 3.5+, Firefox 4, Safari 4, and Safari 5. "
+"The URL is: (substitute your own management server IP address)"
+msgstr "CloudStack提供一个基于web的UI,管理员和终端用户能够使用这个界面。用户界面版本依赖于登陆时使用的凭证不同而不同。用户界面是适用于大多数流行的浏览器包括IE7,IE8,IE9,Firefox3.5+,Firefox4,Safari4,和Safari5。URL是:(用你自己的管理控制服务器IP地址代替)"
+
+# 1f150301d3b24a0c9ef17e3907c6f7bd
+#: ../../ui.rst:33
+msgid ""
+"On a fresh Management Server installation, a guided tour splash screen "
+"appears. On later visits, you’ll see a login screen where you specify the "
+"following to proceed to your Dashboard:"
+msgstr "如果管理服务器是全新的安装,。那么会出现一个安装向导。在稍后的访问中,,你将看到一个登录界面,,你需要通过用户名和密码登入来查看你的仪表盘."
+
+# 75ef5c6d747743f6b305a6985cc9317c
+#: ../../ui.rst:37
+msgid ""
+"Username -> The user ID of your account. The default username is admin."
+msgstr "用户名 -> 你账号的用户ID。默认用户名是admin。"
+
+# d50078a4174245929b7bed1d18dee41b
+#: ../../ui.rst:39
+msgid ""
+"Password -> The password associated with the user ID. The password for the "
+"default username is password."
+msgstr "密码 -> 用户ID对应的密码。默认用户名的密码是password。"
+
+# ed8d4b1b0749488a8eddc7c967b431a0
+#: ../../ui.rst:42
+msgid "Domain -> If you are a root user, leave this field blank."
+msgstr "域 -> 如果你是root用户,此处留空即可。"
+
+# 7f94ded7b94e493191cad1f8aa619d8c
+#: ../../ui.rst:44
+msgid ""
+"If you are a user in the sub-domains, enter the full path to the domain, "
+"excluding the root domain."
+msgstr "如果你是一个子域用户,在域中输入完全路径,不包括根域。"
+
+# 2fe701c5f506417b9ab5d9eb89b7282e
+#: ../../ui.rst:47
+msgid ""
+"For example, suppose multiple levels are created under the root domain, such"
+" as Comp1/hr. The users in the Comp1 domain should enter Comp1 in the Domain"
+" field, whereas the users in the Comp1/sales domain should enter "
+"Comp1/sales."
+msgstr "例如,假设在根域下建立了多个层级,像Comp1/hr,在Comp1域的用户在域字段处应该输入Comp1,在Comp1/sales域的用户应该输入Comp1/sales。"
+
+# b6a9dbd7c01b41f29187e7bbca753c06
+#: ../../ui.rst:52
+msgid ""
+"For more guidance about the choices that appear when you log in to this UI, "
+"see Logging In as the Root Administrator."
+msgstr "更多关于当你登录这个界面时选项的指导,参照作为根管理员登录。"
+
+# 48d00dd7bd68418190cd46bb293473d6
+#: ../../ui.rst:56
+msgid "End User's UI Overview"
+msgstr "最终用户界面概览"
+
+# 7ff28690d249411096a5af0c0ddfa6a9
+#: ../../ui.rst:58
+msgid ""
+"The CloudStack UI helps users of cloud infrastructure to view and use their "
+"cloud resources, including virtual machines, templates and ISOs, data "
+"volumes and snapshots, guest networks, and IP addresses. If the user is a "
+"member or administrator of one or more CloudStack projects, the UI can "
+"provide a project-oriented view."
+msgstr "CloudStack用户界面帮助云基础设施的用户查看和使用他们的云资源,包括虚拟机、模板和ISO、数据卷和快照、宾客网络,以及IP 地址。如果用户是一个或多个CloudStack项目的成员或管理员,用户界面能提供一个面向项目的视图。"
+
+# b9f32da1cc284a77a0170d30360c2295
+#: ../../ui.rst:65
+msgid "Root Administrator's UI Overview"
+msgstr "根管理员界面的概述"
+
+# de7c88e845554ec786a629a84f587490
+#: ../../ui.rst:67
+msgid ""
+"The CloudStack UI helps the CloudStack administrator provision, view, and "
+"manage the cloud infrastructure, domains, user accounts, projects, and "
+"configuration settings. The first time you start the UI after a fresh "
+"Management Server installation, you can choose to follow a guided tour to "
+"provision your cloud infrastructure. On subsequent logins, the dashboard of "
+"the logged-in user appears. The various links in this screen and the "
+"navigation bar on the left provide access to a variety of administrative "
+"functions. The root administrator can also use the UI to perform all the "
+"same tasks that are present in the end-user’s UI."
+msgstr "CloudStack界面帮助CloudStack管理员配置、查看和管理云的基础设施、用户域、账号、项目和配置。当一个全新的管理服务器安装完成后,在第一次启动界面的时候,可以选择根随引导步骤配置云的基础设施。当再次登录时,会显示当前登录用户的仪表板。在这个页面有很多的连接,可以通过左边的导航栏访问各种管理功能。根管理员也可以使用界面像最终用户一样来执行所有的功能。 "
+
+# cec8e56a3f3c4003b9b5cb32786f06c1
+#: ../../ui.rst:78
+msgid "Logging In as the Root Administrator"
+msgstr "作为根管理员登录"
+
+# bba4bc7659854a22a7f9755411002452
+#: ../../ui.rst:80
+msgid ""
+"After the Management Server software is installed and running, you can run "
+"the CloudStack user interface. This UI is there to help you provision, view,"
+" and manage your cloud infrastructure."
+msgstr "在管理服务器软件安装并且运行后, 你就可以运行CloudStack的用户界面.了。在这里通过UI,可以供给、查看并管理你的云基础架构。"
+
+# 9da61f92327340a882b5300469950b1d
+# dfefb71a2c3a4f5ba43d40560f9b829f
+#: ../../ui.rst:86 ../../ui.rst:155
+msgid ""
+"Open your favorite Web browser and go to this URL. Substitute the IP address"
+" of your own Management Server:"
+msgstr "打开你自己喜欢的浏览器并访问这个URL。请把IP地址替换成你自己的管理服务器的IP。"
+
+# c848c16d0204458d89b15421d959a14c
+#: ../../ui.rst:93
+msgid ""
+"After logging into a fresh Management Server installation, a guided tour "
+"splash screen appears. On later visits, you’ll be taken directly into the "
+"Dashboard."
+msgstr "初次登录管理服务器时,会出现一个向导启动画面。后续访问时,您会直接进入控制面板。"
+
+# 9dc9abbeec84440ab29d157ce21b2021
+#: ../../ui.rst:99
+msgid "If you see the first-time splash screen, choose one of the following."
+msgstr "如果你看到第一次的向导屏幕, 可以选择下面步骤之一进行。"
+
+# 4c0c71f3a1684669a2f9d69e77f2b70c
+#: ../../ui.rst:103
+msgid ""
+"**Continue with basic setup.** Choose this if you're just trying CloudStack,"
+" and you want a guided walkthrough of the simplest possible configuration so"
+" that you can get started right away. We'll help you set up a cloud with the"
+" following features: a single machine that runs CloudStack software and uses"
+" NFS to provide storage; a single machine running VMs under the XenServer or"
+" KVM hypervisor; and a shared public network."
+msgstr "**继续执行基本安装。**如果你仅仅是想体验CloudStack,请选择这个,并且这样你可以马上开始跟着向导进行简单的配置。我们将帮助你建立一个有以下功能的云:一个运行CloudStack软件的机器和使用NFS协议的存储;一个运行VMs的XenServer或KVM hypervisor的服务器;一个共享的公有网络。"
+
+# 0e0058e02be4491a9d8b2b762a2bce2c
+#: ../../ui.rst:111
+msgid ""
+"The prompts in this guided tour should give you all the information you "
+"need, but if you want just a bit more detail, you can follow along in the "
+"Trial Installation Guide."
+msgstr "安装向导的提示会给你需要的所有信息。但如果你需要更多的详细信息,你可以按照试用安装向导进行。"
+
+# 531d687fea424084bf40162d887f1157
+#: ../../ui.rst:117
+msgid ""
+"**I have used CloudStack before.** Choose this if you have already gone "
+"through a design phase and planned a more sophisticated deployment, or you "
+"are ready to start scaling up a trial cloud that you set up earlier with the"
+" basic setup screens. In the Administrator UI, you can start using the more "
+"powerful features of CloudStack, such as advanced VLAN networking, high "
+"availability, additional network elements such as load balancers and "
+"firewalls, and support for multiple hypervisors including Citrix XenServer, "
+"KVM, and VMware vSphere."
+msgstr "**我之前用过CloudStack。** 如果您已经完成设计阶段,计划部署一个复杂CloudStack云,或是准备对用基础安装向导搭建的试验云进行扩展,请选择此项。在管理员UI中,您可以使用CloudStack中更强大的功能,例如高级VLAN网络、高可用、负载均衡器和防火墙等额外网络设备,以及支持Citrix XenServer、KVM、VMware vSphere等多种虚拟化平台。"
+
+# a9ade2077b0b4da09c1f74ee47fbf1df
+#: ../../ui.rst:127
+msgid "The root administrator Dashboard appears."
+msgstr "根管理员的仪表盘显示出来。"
+
+# 6d272187a4224eee883e147c2bd70841
+#: ../../ui.rst:131
+msgid ""
+"You should set a new root administrator password. If you chose basic setup, "
+"you’ll be prompted to create a new password right away. If you chose "
+"experienced user, use the steps in :ref:`changing-root-password`."
+msgstr "你应该为根管理员设置一个新的密码。如果你选择基础设置。将会提示你立即创建一个新的密码。如果你选择有经验的用户,请选择:ref:`changing-root-password`里的步骤。"
+
+# ce25a9e2a2e5427ba0b0979423dee209
+#: ../../ui.rst:137
+msgid ""
+"You are logging in as the root administrator. This account manages the "
+"CloudStack deployment, including physical infrastructure. The root "
+"administrator can modify configuration settings to change basic "
+"functionality, create or delete user accounts, and take many actions that "
+"should be performed only by an authorized person. Please change the default "
+"password to a new, unique password."
+msgstr "使用根管理员登录。这个账号管理CloudStack的部署,包括物理架构。根管理员可以通过更改配置来变更基本的功能,创建或删除用户账号,以及其它许多只有被授权的用户执行的操作。请更改默认的密码,确保其唯一性和安全性。"
+
+# 245d29fc03c0406eb25debd7beae06df
+#: ../../ui.rst:142
+msgid "Changing the Root Password"
+msgstr "更改Root密码"
+
+# e7c7d3abe5564cc1a37b80c78666c4f0
+#: ../../ui.rst:144
+msgid ""
+"During installation and ongoing cloud administration, you will need to log "
+"in to the UI as the root administrator. The root administrator account "
+"manages the CloudStack deployment, including physical infrastructure. The "
+"root administrator can modify configuration settings to change basic "
+"functionality, create or delete user accounts, and take many actions that "
+"should be performed only by an authorized person. When first installing "
+"CloudStack, be sure to change the default password to a new, unique value."
+msgstr "在云的安装及后续管理过程中,您需要用根管理员登录UI。根管理员账号管理着CloudStack的部署以及物理设施。根管理员可以修改系统配置,改变基本功能,创建和删除用户账号,以及其他仅限于已授权人员执行的操作。在初始安CloudStack时,请务必修改默认密码为新的较独特的密码。"
+
+# 6043d1e39c2a48e4b854e3578f22ec8c
+#: ../../ui.rst:164
+msgid ""
+"Log in to the UI using the current root user ID and password. The default is"
+" admin, password."
+msgstr "使用当前root用户的ID和口令登录UI。缺省为admin,pawword。"
+
+# cd0b86751e6349b0b87a2b0b90f2aa0f
+#: ../../ui.rst:169
+msgid "Click Accounts."
+msgstr "点击帐户。"
+
+# 026a6a1bd5f249e5ba1083e8c008bff0
+#: ../../ui.rst:173
+msgid "Click the admin account name."
+msgstr "点击管理员帐号名。"
+
+# d409c268bfec40fdaafc542ed7e5f9a8
+#: ../../ui.rst:177
+msgid "Click View Users."
+msgstr "点击查看用户。"
+
+# aaa72f38d16f48b483ed186fa00197c1
+#: ../../ui.rst:181
+msgid "Click the admin user name."
+msgstr "点击管理员用户名。"
+
+# 028079ae04324fb6b57f66f799f63c62
+#: ../../ui.rst:185
+msgid "Click the Change Password button. |change-password.png|"
+msgstr "点击更改密码按钮。 |change-password.png|"
+
+# ac75f53f86c345ff8363e0493a554c7e
+#: ../../ui.rst:189
+msgid "Type the new password, and click OK."
+msgstr "输入新密码,然后点击确认。"
+
+# 247f04e8fcf944c4b5dae33d5904fc7e
+#: ../../ui.rst:192
+msgid "Using SSH Keys for Authentication"
+msgstr "未验证使用SSH秘钥"
+
+# 17729e6e0703435c8d7cdae57ea0158e
+#: ../../ui.rst:194
+msgid ""
+"In addition to the username and password authentication, CloudStack supports"
+" using SSH keys to log in to the cloud infrastructure for additional "
+"security. You can use the createSSHKeyPair API to generate the SSH keys."
+msgstr "除了用户名和密码验证之外,出于额外的安全性考虑,CloudStack还支持使用SSH秘钥来登录到云架构。你可以使用createSSHKeyPair API来生成SSH秘钥。"
+
+# 60474970e0924ca8881ca58a0f2aaf1c
+#: ../../ui.rst:199
+msgid ""
+"Because each cloud user has their own SSH key, one cloud user cannot log in "
+"to another cloud user's instances unless they share their SSH key files. "
+"Using a single SSH key pair, you can manage multiple instances."
+msgstr "因为每个云用户都有他们自己的SSH秘钥,一个云用户不能登录到另一个云用户的实例中,除非他们共享了他们的SSH key文件。使用一个SSH秘钥对,你可以管理多个实例。"
+
+# d04ab78757e648db9a36b21757d95eb2
+#: ../../ui.rst:204
+msgid "Creating an Instance Template that Supports SSH Keys"
+msgstr "创建一个支持SSH秘钥的实例模板"
+
+# 7c8b494ef99a4f8b91c6a2ae002c4924
+#: ../../ui.rst:206
+msgid "Create an instance template that supports SSH Keys."
+msgstr "创建一个支持SSH秘钥的实例模板。"
+
+# 4912a213c00d429780087b2cfe97da53
+#: ../../ui.rst:210
+msgid "Create a new instance by using the template provided by cloudstack."
+msgstr "使用CloudStack提供的模板创建一个新的实例。"
+
+# a6a64feeebfc45e093188be0b11f249c
+#: ../../ui.rst:212
+msgid "For more information on creating a new instance, see"
+msgstr "关于创建新实例的更多信息,请参阅"
+
+# d9301346ec2b4466bbcb41b41e4fca67
+#: ../../ui.rst:216
+msgid ""
+"Download the cloudstack script from `The SSH Key Gen Script "
+"<http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`_"
+" to the instance you have created."
+msgstr "从 `The SSH Key Gen Script <http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`_ 下载CloudStack脚本到你已经创建的实例中。"
+
+# 35616f7818954a1f944b86f8c1647662
+#: ../../ui.rst:224
+msgid "Copy the file to /etc/init.d."
+msgstr "复制这个脚本到 /etc/init.d。"
+
+# 9cd32ae2ba0048f7b0defa4c05704fe4
+#: ../../ui.rst:232
+msgid "Give the necessary permissions on the script:"
+msgstr "给这个脚本必要的权限:"
+
+# a3cdb8470165420e9cf800130e0c9558
+#: ../../ui.rst:240
+msgid "Run the script while starting up the operating system:"
+msgstr "当系统启动的时候运行脚本:"
+
+# d72d733121264975825dda05eb82afa6
+#: ../../ui.rst:248
+msgid "Stop the instance."
+msgstr "停止实例。"
+
+# a4e2c66c696d4a828deb3db3bb32b233
+#: ../../ui.rst:251
+msgid "Creating the SSH Keypair"
+msgstr "创建SSH秘钥对"
+
+# eda0dab882fb4b638b95e4b9037d81d5
+#: ../../ui.rst:253
+msgid ""
+"You must make a call to the createSSHKeyPair api method. You can either use "
+"the CloudStack Python API library or the curl commands to make the call to "
+"the cloudstack api."
+msgstr "你必须给createSSHKeyPair api方法做一个调用。你可以使用CloudStack  Python API 库或curl 命令给CloudStack API做调用。"
+
+# e7eb58ee1cc84b6c840951ef582865f5
+#: ../../ui.rst:257
+msgid ""
+"For example, make a call from the cloudstack server to create a SSH keypair "
+"called \"keypair-doc\" for the admin account in the root domain:"
+msgstr "比如,从CloudStack服务器为根域中的管理员帐户做调用来创建一个SSH秘钥对 ,名称为 \"keypair-doc\" :"
+
+# 20b8836d5e81433da0a0f2282cce73ec
+#: ../../ui.rst:261
+msgid ""
+"Ensure that you adjust these values to meet your needs. If you are making "
+"the API call from a different server, your URL/PORT will be different, and "
+"you will need to use the API keys."
+msgstr "确认你调整这些值是你所需要的。如果你从不同的服务器上做API调用,你的 URL/PORT 也是不同的,并且你必须使用API 秘钥。"
+
+# dd16dc8df12049cc8028328a49770426
+#: ../../ui.rst:265
+msgid "Run the following curl command:"
+msgstr "运行如下curl命令:"
+
+# 798b044a5a404bd2941a9401c694f194
+#: ../../ui.rst:271
+msgid "The output is something similar to what is given below:"
+msgstr "输出的内容与下面所示的类似:"
+
+# a17314d9ae5f4ea784ffd1b69cd6cd2a
+#: ../../ui.rst:291
+msgid "Copy the key data into a file. The file looks like this:"
+msgstr "复制秘钥的数据到一个文件。这个文件类似于:"
+
+# f0d5785a5fad443a97a2b93c0f250eb4
+#: ../../ui.rst:310
+msgid "Save the file."
+msgstr "保存文件。"
+
+# 3c61b221b8a44556a48855acb7af4081
+#: ../../ui.rst:313
+msgid "Creating an Instance"
+msgstr "创建实例"
+
+# 845a398aabe44a5e897e410247bd5050
+#: ../../ui.rst:315
+msgid ""
+"After you save the SSH keypair file, you must create an instance by using "
+"the template that you created at `Section 5.2.1, “ Creating an Instance "
+"Template that Supports SSH Keys” <#create-ssh-template>`__. Ensure that you "
+"use the same SSH key name that you created at `Section 5.2.2, “Creating the "
+"SSH Keypair” <#create-ssh-keypair>`__."
+msgstr "在你保存了SSH秘钥对文件之后,你必须使用你在`章节 5.2.1, “ 创建支持SSH秘钥的实例模板” <#create-ssh-template>`__中创建的模来板创建一个实例。确保你使用与你在`章节 5.2.2, “创建秘钥对” <#create-ssh-keypair>`__中创建的同样的SSH秘钥名称。"
+
+# ca39f1c10c0b4ec5a8e4eb9fd95332a8
+#: ../../ui.rst:323
+msgid ""
+"You cannot create the instance by using the GUI at this time and associate "
+"the instance with the newly created SSH keypair."
+msgstr "这时候你不能通过使用 GUI来创建实例,要使用新创建的SSH秘钥对来关联实例。"
+
+# 1ba0532c6e384ad6946a13e520f2d0cb
+#: ../../ui.rst:325
+msgid "A sample curl command to create a new instance is:"
+msgstr "使用简单的curl命令创建新的实例:"
+
+# aeece32098de4a77970e86a23ee7503c
+#: ../../ui.rst:331
+msgid ""
+"Substitute the template, service offering and security group IDs (if you are"
+" using the security group feature) that are in your cloud environment."
+msgstr "在你的云环境中,服务方案和安全组IDs(如果你使用安全组功能)可以替代模板。"
+
+# 5acfe9f470754268bf12beafb1da8590
+#: ../../ui.rst:336
+msgid "Logging In Using the SSH Keypair"
+msgstr "使用SSH秘钥对登录"
+
+# ecbc54c997a6494591311348d6c7cf10
+#: ../../ui.rst:338
+msgid ""
+"To test your SSH key generation is successful, check whether you can log in "
+"to the cloud setup."
+msgstr "测试你的SSH秘钥的生成是否成功,需要检查是否能够登录到云中。"
+
+# f728e066bd8042eb9f636f25a36855df
+#: ../../ui.rst:341
+msgid "For example, from a Linux OS, run:"
+msgstr "举个例子,在LinuxOS中,运行:"
+
+# ada257a069dc4790a47c1f4742f1e348
+#: ../../ui.rst:347
+msgid ""
+"The -i parameter tells the ssh client to use a ssh key found at ~/.ssh"
+"/keypair-doc."
+msgstr "参数-i是通知ssh客户端使用一个在~/.ssh/keypair-doc中找到的ssh秘钥。"
+
+# b5c198f3ab0344df9eaf41527b550991
+#: ../../ui.rst:351
+msgid "Resetting SSH Keys"
+msgstr "重置SSH密钥"
+
+# 459aabf9f16142f2a857a89ccd498c4a
+#: ../../ui.rst:353
+msgid ""
+"With the API command resetSSHKeyForVirtualMachine, a user can set or reset "
+"the SSH keypair assigned to a virtual machine. A lost or compromised SSH "
+"keypair can be changed, and the user can access the VM by using the new "
+"keypair. Just create or register a new keypair, then call "
+"resetSSHKeyForVirtualMachine."
+msgstr "通过API命令resetSSHKeyForVirtualMachine,用户可以设置或者重设分配给虚拟机的SSH秘钥对。可以更改丢失或被盗用的SSH密钥对,并且用户可以使用新的秘钥对来访问VM。只要创建或注册新的密钥对然后调用resetSSHKeyForVirtualMachine。"


[26/40] git commit: Fix formatting issues in README

Posted by ra...@apache.org.
Fix formatting issues in README


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/19e54c22
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/19e54c22
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/19e54c22

Branch: refs/heads/4.4
Commit: 19e54c228eac857ee6322170ce95714255b66cb1
Parents: fff40fc
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Jun 30 11:10:51 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Jun 30 11:10:51 2014 +0200

----------------------------------------------------------------------
 README.rst | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/19e54c22/README.rst
----------------------------------------------------------------------
diff --git a/README.rst b/README.rst
index 227a6c8..a866fbb 100644
--- a/README.rst
+++ b/README.rst
@@ -30,31 +30,37 @@ Translation
 Clean the build
 
 ::
+
    make clean
 
 Generate the .pot files
 
 ::
+
    make gettext
 
 Generate the .tx/config files with:
 
 ::
+
    sphinx-intl update-txconfig-resources --pot-dir source/locale/pot --transifex-project-name apache-cloudstack-administration-rtd --locale-dir source/locale
 
 Push the .pot files to transifex with:
 
 ::
+
    tx push -s
 
 Download the translated strings, for example Japanese (ja):
 
 ::
+
    tx pull -l ja
 
 Build the translated docs:
 
 ::
+
    sphinx-intl build --locale-dir source/locale
    make -e SPHINXOPTS="-D language='ja'" html
 


[37/40] git commit: moved ldap.firstname.attribute to the correct section.

Posted by ra...@apache.org.
moved ldap.firstname.attribute to the correct section.

Signed-off-by: Rajani Karuturi <ra...@gmail.com>

closes #17


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

Branch: refs/heads/4.4
Commit: 3356677127398157ab265a98f08c1cf89b406bea
Parents: d92feaf
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Wed Aug 27 10:00:36 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Wed Aug 27 10:06:15 2014 +0530

----------------------------------------------------------------------
 source/accounts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/33566771/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index 06a1660..83d7329 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -218,6 +218,9 @@ default values are for openldap)
 -  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
    Default value for AD and openldap is **givenname**.
 
+-  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
+   Default value for AD and openldap is **sn**.
+
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
    Default value is **SAMAccountName** for AD and **uid** for openldap.
 
@@ -232,9 +235,6 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~~~~~~~~~
 
--  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
-   Default value for AD and openldap is **sn**.
-
 -  ``ldap.truststore``, ``ldap.truststore.password``:	truststore, password
    to use for LDAP SSL.
  


[39/40] git commit: ignoring .po and .mo files during merge

Posted by ra...@apache.org.
ignoring .po and .mo files during merge


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/5d59a37d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/5d59a37d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/5d59a37d

Branch: refs/heads/4.4
Commit: 5d59a37d0d2ca0f6ee6d5193fcdf4bb8a42e5e43
Parents: fe5b65d
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Wed Sep 10 12:02:31 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Wed Sep 10 12:02:31 2014 +0530

----------------------------------------------------------------------
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5d59a37d/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a4cfe93
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.po merge=ours
+*.mo merge=ours


[02/40] git commit: Update templates.rst: This closes #10

Posted by ra...@apache.org.
Update templates.rst: This closes #10

The right command is dpkg-reconfigure and not dpkg-reconfig.

Signed-off-by: Sebastien Goasguen <ru...@gmail.com>


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

Branch: refs/heads/4.4
Commit: a49d204cf217b5f5d78c816b30e3de33f587a1d3
Parents: ba544d2
Author: w00binda <ro...@gmail.com>
Authored: Thu May 15 17:58:24 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Fri May 16 22:08:56 2014 +0200

----------------------------------------------------------------------
 source/templates.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a49d204c/source/templates.rst
----------------------------------------------------------------------
diff --git a/source/templates.rst b/source/templates.rst
index 5480279..c4d33b2 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -485,7 +485,8 @@ templating.
                 echo $hostname > /etc/hostname
                 hostname $hostname
                 # Recreate SSH2
-                dpkg-reconfig openssh-server
+                export DEBIAN_FRONTEND=noninteractive
+                dpkg-reconfigure openssh-server
             fi
             ### End of Script ###
             


[13/40] git commit: Fix conf.py for localization setup

Posted by ra...@apache.org.
Fix conf.py for localization setup


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

Branch: refs/heads/4.4
Commit: a209573e23085f013d41dec87d4147c05983f56c
Parents: 68c20df
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Tue May 27 10:56:03 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Tue May 27 10:56:03 2014 +0200

----------------------------------------------------------------------
 source/conf.py | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a209573e/source/conf.py
----------------------------------------------------------------------
diff --git a/source/conf.py b/source/conf.py
index d8ef428..517956a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -35,6 +35,10 @@ extensions = []
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
+# Localization
+locale_dirs = ['./locale/']
+gettext_compact = False
+
 # The suffix of source filenames.
 source_suffix = '.rst'
 


[20/40] Add po files for zh_CN

Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
----------------------------------------------------------------------
diff --git a/source/locale/zh_CN/LC_MESSAGES/service_offerings.po b/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
new file mode 100644
index 0000000..c64d6a6
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
@@ -0,0 +1,1080 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
+# 
+# Translators:
+# typuc <ty...@163.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 02:21+0000\n"
+"Last-Translator: typuc <ty...@163.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 620304e9ac5340aea4af6b894b131b3a
+#: ../../service_offerings.rst:18
+msgid "Service Offerings"
+msgstr "服务方案"
+
+# 748817ca8ea841e7bb071e3fd4e9b1b8
+#: ../../service_offerings.rst:20
+msgid ""
+"In addition to the physical and logical infrastructure of your cloud and the"
+" CloudStack software and servers, you also need a layer of user services so "
+"that people can actually make use of the cloud. This means not just a user "
+"UI, but a set of options and resources that users can choose from, such as "
+"templates for creating virtual machines, disk storage, and more. If you are "
+"running a commercial service, you will be keeping track of what services and"
+" resources users are consuming and charging them for that usage. Even if you"
+" do not charge anything for people to use your cloud – say, if the users are"
+" strictly internal to your organization, or just friends who are sharing "
+"your cloud – you can still keep track of what services they use and how much"
+" of them."
+msgstr "除了云中的物理和逻辑基础设施以及 CloudStack 软件和服务器,你还需要一个用户服务层以便让人们能够真正利用云。这不仅仅意味这一个用户界面,而是一组用户可选择的选项和资源,如通过模版创建虚拟机,磁盘存储等等。如果您正在运行一个商业服务,您将可以跟踪服务和用户资源的使用以及使用计费情况。即使你不对使用云的人收费,-比如说,用户是你的内部组织,或只是你的朋友共享你的云 - 你仍然可以跟踪他们所使用的服务以及有多少人。"
+
+# 89ec6965888c4194969da68934867e8f
+#: ../../service_offerings.rst:33
+msgid "Service Offerings, Disk Offerings, Network Offerings, and Templates"
+msgstr "服务方案,磁盘方案,网络方案和模版"
+
+# 39b9fb81cc4a452f932a9becc1c08318
+#: ../../service_offerings.rst:35
+msgid ""
+"A user creating a new instance can make a variety of choices about its "
+"characteristics and capabilities. CloudStack provides several ways to "
+"present users with choices when creating a new instance:"
+msgstr "用户可以根据不同的功能和特性来创建新的实例,CloudStack提供了几种方法供用户选择以便创建一个新的实例:"
+
+# a080b00346eb4c6191b4a6b1b6ede2bd
+#: ../../service_offerings.rst:39
+msgid ""
+"Service Offerings, defined by the CloudStack administrator, provide a choice"
+" of CPU speed, number of CPUs, RAM size, tags on the root disk, and other "
+"choices. See Creating a New Compute Offering."
+msgstr "服务方案,由CloudStack管理员定义,提供了多种选项供选择:CPU速率,CPU核数,内存大小,根磁盘标签等。可参阅创建新的计算方案。"
+
+# 87390738e5c6421e8cb6428fd0efd434
+#: ../../service_offerings.rst:43
+msgid ""
+"Disk Offerings, defined by the CloudStack administrator, provide a choice of"
+" disk size and IOPS (Quality of Service) for primary data storage. See "
+"Creating a New Disk Offering."
+msgstr "磁盘方案,由CloudStack管理员定义,针对主数据存储提供磁盘大小和IOPS(QOS)等选项供选择。可参阅创建新的磁盘方案。"
+
+# 3416adb53bd2464c93a0a7de7341aa8c
+#: ../../service_offerings.rst:47
+msgid ""
+"Network Offerings, defined by the CloudStack administrator, describe the "
+"feature set that is available to end users from the virtual router or "
+"external networking devices on a given guest network. See Network Offerings."
+msgstr "网络方案,由 CloudStack 管理员定义,约定来宾网络中虚拟路由器或外部网络设备提供给终端用户可用的功能描述集。"
+
+# 7be016c225ca4b45a449e6d718fbba3e
+#: ../../service_offerings.rst:52
+msgid ""
+"Templates, defined by the CloudStack administrator or by any CloudStack "
+"user, are the base OS images that the user can choose from when creating a "
+"new instance. For example, CloudStack includes CentOS as a template. See "
+"Working with Templates."
+msgstr "模版,由CloudStack管理员或其他CloudStack用户定义,用户创建新的实例时可选择的基本操作系统镜像。例如,CloudStack中包含的CentOS模版。可参阅使用模版。"
+
+# b8d86f3b37c14661a8fb085d021643ec
+#: ../../service_offerings.rst:57
+msgid ""
+"In addition to these choices that are provided for users, there is another "
+"type of service offering which is available only to the CloudStack root "
+"administrator, and is used for configuring virtual infrastructure resources."
+" For more information, see Upgrading a Virtual Router with System Service "
+"Offerings."
+msgstr "除了给用户提供了这些选择,还有另一种类型的服务方案只提供给CloudStack管理员,用于配置虚拟基础设施资源。欲了解更多信息,请参阅使用系统服务方案升级虚拟路由器。"
+
+# 497f38bfe2d6443581220156e1f029b9
+#: ../../service_offerings.rst:65
+msgid "Compute and Disk Service Offerings"
+msgstr "计算和磁盘服务方案"
+
+# 52085dbbc1004cecb8896d5a71beb122
+#: ../../service_offerings.rst:67
+msgid ""
+"A service offering is a set of virtual hardware features such as CPU core "
+"count and speed, memory, and disk size. The CloudStack administrator can set"
+" up various offerings, and then end users choose from the available "
+"offerings when they create a new VM. Based on the user’s selected offering, "
+"CloudStack emits usage records that can be integrated with billing systems."
+msgstr "一个服务方案是一个虚拟硬件特征集合,比如 CPU 核心数量和速度,内存,已经磁盘大小。 CloudStack 管理员可以建立各种方案,接着终端用户在建立一个新虚拟机时就可以选择可用方案。基于用户的选择方案, CloudStack 可以发送整合在计费系统中的使用记录。"
+
+# e38d63cf2be54e2b854d33212b89738c
+#: ../../service_offerings.rst:74
+msgid ""
+"Some characteristics of service offerings must be defined by the CloudStack "
+"administrator, and others can be left undefined so that the end-user can "
+"enter their own desired values. This is useful to reduce the number of "
+"offerings the CloudStack administrator has to define. Instead of defining a "
+"compute offering for every imaginable combination of values that a user "
+"might want, the administrator can define offerings that provide some "
+"flexibility to the users and can serve as the basis for several different VM"
+" configurations."
+msgstr "CloudStack 管理员必须定义一些服务方案的特征,同时留下一些未定义的,让终端用户输入自己需要的值。这个对于降低 CloudStack  管理员定义的方案的数量很有用处。代替为每个用户定义一个他们想要可能组合值的计算方案,管理员可以为用户定义灵活的计算方案,并作为基本的若干不同虚拟机配置。"
+
+# 16bb1eb6b41446fdb147162d0a814206
+#: ../../service_offerings.rst:83
+msgid "A service offering includes the following elements:"
+msgstr "一个服务方案包含以下元素:"
+
+# 01489605f3244de5a1bc81aaee6061b3
+#: ../../service_offerings.rst:85
+msgid "CPU, memory, and network resource guarantees"
+msgstr "必备的CPU,内存和网络资源"
+
+# 51db366a8906424ba9cf812f9b60f1e1
+#: ../../service_offerings.rst:87
+msgid "How resources are metered"
+msgstr "如何计算资源"
+
+# f4426a9028b1477f993491f7ff9fc44e
+#: ../../service_offerings.rst:89
+msgid "How the resource usage is charged"
+msgstr "使用资源如何收费"
+
+# f860e43721b4403fb342200627b03959
+#: ../../service_offerings.rst:91
+msgid "How often the charges are generated"
+msgstr "产生了多少费用"
+
+# aac0beacd1da46ccb20c4e122f600e27
+#: ../../service_offerings.rst:93
+msgid ""
+"For example, one service offering might allow users to create a virtual "
+"machine instance that is equivalent to a 1 GHz Intel® Core™ 2 CPU, with 1 GB"
+" memory at $0.20/hour, with network traffic metered at $0.10/GB."
+msgstr "比如,一个服务方案允许用户创建一个虚拟机实例,这个实例等于: 1 GHz Intel® Core™ 2 CPU,  $0.20/hour 的 1G 内存,   $0.10/GB. 的网络流量。"
+
+# 52f140ea4d8e46949f2b4cdfc784692e
+#: ../../service_offerings.rst:97
+msgid ""
+"CloudStack separates service offerings into compute offerings and disk "
+"offerings. The compute service offering specifies:"
+msgstr "CloudStack 把服务方案分割为计算方案和磁盘放哪。计算方案指定:"
+
+# d71c4438b2304531a7495334a9bb16c6
+#: ../../service_offerings.rst:100
+msgid ""
+"Guest CPU (optional). If not defined by the CloudStack administrator, users "
+"can pick the CPU attributes."
+msgstr "来宾 CPU(可选)。如果 CloudStack 管理员未定义,用户可选择 CPU 特性。"
+
+# d4687e525e464fe089849edce3fa9ee7
+#: ../../service_offerings.rst:103
+msgid ""
+"Guest RAM (optional). If not defined by the CloudStack administrator, users "
+"can pick the RAM."
+msgstr "来宾 RAM ( 可选)。如果 CloudStack 管理员未定义,用户可选择 RAM。"
+
+# ea0f8a077efa4283a9a5f0ff3095ee22
+#: ../../service_offerings.rst:106
+msgid "Guest Networking type (virtual or direct)"
+msgstr "来宾网络类型(虚拟或者直连)"
+
+# e6556b198b654f48b943af09419b9f29
+#: ../../service_offerings.rst:108
+msgid "Tags on the root disk"
+msgstr "根磁盘标签"
+
+# d229f1617ef24ed3bae77ae2c5d40eb9
+#: ../../service_offerings.rst:110
+msgid "The disk offering specifies:"
+msgstr "磁盘方案特指:"
+
+# 4c096d14455c4ec5b7da89386faf0f40
+#: ../../service_offerings.rst:112
+msgid ""
+"Disk size (optional). If not defined by the CloudStack administrator, users "
+"can pick the disk size."
+msgstr "磁盘大小 (可选)。如果 CloudStack 管理员未定义,用户可选择磁盘大小。"
+
+# fcf2e32b5ebf4d188141ab3ce3ed2482
+#: ../../service_offerings.rst:115
+msgid "Tags on the data disk"
+msgstr "数据磁盘标签"
+
+# 9c8a3805fea1490e9fdaef4a62835949
+#: ../../service_offerings.rst:118
+msgid "Custom Compute Offering"
+msgstr "自定义计算方案"
+
+# 17da79d9fde24ffc8d17738158295566
+#: ../../service_offerings.rst:120
+msgid ""
+"CloudStack provides you the flexibility to specify the desired values for "
+"the number of CPU, CPU speed, and memory while deploying a VM. As an admin, "
+"you create a Compute Offering by marking it as custom, and the users will be"
+" able to customize this dynamic Compute Offering by specifying the memory, "
+"and CPU at the time of VM creation or upgrade. Custom Compute Offering is "
+"same as the normal Compute Offering except that the values of the dynamic "
+"parameters will be set to zeros in the given set of templates. Use this "
+"offering to deploy VM by specifying custom values for the dynamic "
+"parameters. Memory, CPU and number of CPUs are considered as dynamic "
+"parameters."
+msgstr " 部署虚拟机时,CloudStack 为你灵活地提供指定的 CPU 数量,CPU 速度和内存需要的值。作为管理员,你通过标记为自定义创建一个新的计算方案,并且用户将能够在虚拟机创建和更新时动态的定制计算方案的内存和 CPU 。自定义计算方案和普通的计算方案一样,除了在模板中配置为0的动态参数。使用该方案通过为动态参数指定自定义值来部署虚拟机。内存,CPU 和 CPU 数量被认为是动态参数。"
+
+# cb0c0fa6f2ec454a909c47774e4e8d17
+#: ../../service_offerings.rst:131
+msgid ""
+"Dynamic Compute Offerings can be used in following cases: deploying a VM, "
+"changing the compute offering of a stopped VM and running VMs, which is "
+"nothing but scaling up. To support this feature a new field, Custom, has "
+"been added to the Create Compute Offering page. If the Custom field is "
+"checked, the user will be able to create a custom Compute Offering by "
+"filling in the desired values for number of CPU, CPU speed, and memory. See "
+"? for more information on this."
+msgstr "动态计算方案可以在下列情况下使用:部署虚拟机,改变停止状态虚拟机和运行中的虚拟机的计算方案,单独扩容。为了支持此功能的新字段,自定义,已经被添加到创建计算方案页面。如果自定义字段被选中,用户将可以通过填写所需 CPU ,CPU 速度和内存数量的值来创建自定义计方案。看到了吗?有关它的更多信息。"
+
+# 84585460d12c44bfa2209bbabfbf3a6e
+#: ../../service_offerings.rst:139
+msgid "*Recording Usage Events for Dynamically Assigned Resources*."
+msgstr "* 记录动态分配资源使用事件 * "
+
+# 33a7e765f65f4e30b4730aafc92986bc
+#: ../../service_offerings.rst:141
+msgid ""
+"To support this feature, usage events has been enhanced to register events "
+"for dynamically assigned resources. Usage events are registered when a VM is"
+" created from a custom compute offering, and upon changing the compute "
+"offering of a stopped or running VM. The values of the parameters, such as "
+"CPU, speed, RAM are recorded."
+msgstr "为了支持该功能,使用事件已经被增强到动态分配资源注册事件中。当从一个自定义计算方案创建一个虚拟机时,使用事件被注册,并紧接更改处于停止状态或者运行状态虚拟机的计算方案。如 CPU ,速度,RAM 这些参数的值被记录下来。"
+
+# d7cf1519f2914b6f8c539df8a1003af2
+#: ../../service_offerings.rst:149
+msgid "Creating a New Compute Offering"
+msgstr "创建一个新的计算方案"
+
+# aa23150497984322bfaee6cf77ad1266
+#: ../../service_offerings.rst:151
+msgid "To create a new compute offering:"
+msgstr "为了创建一个新的计算方案"
+
+# 4e886343524d4af088e739543d88b5df
+# 5968195946ff437aa8ebae46521a3b11
+# becf5f59558d4bd8abef46be798ea016
+#: ../../service_offerings.rst:155 ../../service_offerings.rst:327
+#: ../../service_offerings.rst:455
+msgid "Log in with admin privileges to the CloudStack UI."
+msgstr "以管理员权限登录CloudStack用户界面。"
+
+# 1b95a518f09246a0ba57402df48b11d5
+# d27cedf8009e4d10aee385860508093c
+# 6fe6e438fb09452bafd97b6d8cbe5822
+#: ../../service_offerings.rst:159 ../../service_offerings.rst:331
+#: ../../service_offerings.rst:459
+msgid "In the left navigation bar, click Service Offerings."
+msgstr "在左侧导航栏中,点击 服务方案。"
+
+# c9a07ce801384c9eaa0c811234f294f0
+#: ../../service_offerings.rst:163
+msgid "In Select Offering, choose Compute Offering."
+msgstr "选择方案中,选择计算方案"
+
+# 6e407e41db2344bdbef4d63aa97d99b6
+#: ../../service_offerings.rst:167
+msgid "Click Add Compute Offering."
+msgstr "点击 添加计算方案"
+
+# c03b1abf28ba497cbceb0722695fc1e5
+# f8eb24e0c3724766a8e8ce117c942e11
+# 4f350ef9c2844d3ba73ee61009bb09d1
+#: ../../service_offerings.rst:171 ../../service_offerings.rst:343
+#: ../../service_offerings.rst:471
+msgid "In the dialog, make the following choices:"
+msgstr "在对话框中,选择如下操作:"
+
+# f5bb8c0e56614ef59a5ce2a33a867bdd
+#: ../../service_offerings.rst:175
+msgid "**Name**: Any desired name for the service offering."
+msgstr "** 名称 **: 服务方案所需的名称。"
+
+# eff6335236d048f6afbe4657d434339c
+#: ../../service_offerings.rst:179
+msgid ""
+"**Description**: A short description of the offering that can be displayed "
+"to users"
+msgstr "** 描述 ** :显示给用户的简短方案描述。"
+
+# 1e4bb660557a451e9c5779d3aa0a33b5
+#: ../../service_offerings.rst:184
+msgid ""
+"**Storage type**: The type of disk that should be allocated. Local allocates"
+" from storage attached directly to the host where the system VM is running. "
+"Shared allocates from storage accessible via NFS."
+msgstr "** 存储类型 *:磁盘类型应该被分配。系统VM 运行时所在主机挂载的存储作为本地分配。通过 NFS 可访问的存储作为 共享分配。"
+
+# 4a5d3fc37ad547ce855aedcf994f4686
+#: ../../service_offerings.rst:191
+msgid ""
+"**Custom**: Custom compute offerings can be used in following cases: "
+"deploying a VM, changing the compute offering of a stopped VM and running "
+"VMs, which is nothing but scaling up."
+msgstr "** 自定义 ** :自定义计算方案使用在以下场景:部署虚拟机,改变停止状态和运行中虚拟机的计算方案,仅仅为了扩大规模。"
+
+# c7af5e8d271849d3ad37e04e01d0cb09
+#: ../../service_offerings.rst:195
+msgid ""
+"If the Custom field is checked, the end-user must fill in the desired values"
+" for number of CPU, CPU speed, and RAM Memory when using a custom compute "
+"offering. When you check this box, those three input fields are hidden in "
+"the dialog box."
+msgstr "如果自定义字段被选中,最终用户必须为CPU,CPU速度和RAM存储器的数量所需的值使用自定义计算产品时填写。当您选中该复选框,这三个输入字段隐藏在该对话框。"
+
+# 991116818ea64024b0590766bd14d349
+#: ../../service_offerings.rst:202
+msgid ""
+"**# of CPU cores**: The number of cores which should be allocated to a "
+"system VM with this offering. If Custom is checked, this field does not "
+"appear."
+msgstr "**# of CPU cores**:  在该方案中分配核心数量给系统 VM , 如果选择自定义,该区域不会出现。"
+
+# 88f0912f030742c8b5ea52db1852f9e4
+#: ../../service_offerings.rst:208
+msgid ""
+"**CPU (in MHz)**: The CPU speed of the cores that the system VM is "
+"allocated. For example, “2000” would provide for a 2 GHz clock. If Custom is"
+" checked, this field does not appear."
+msgstr "** CPU (in MHz) **: 分配给系统 VM 的 CPU 核心速度。比如 “ 2000 ” 将提供 2 GHz 时钟频率。如果选择订制,该区域不会出现"
+
+# 73983dcad95048e6962a24da88337a0f
+#: ../../service_offerings.rst:214
+msgid ""
+"**Memory (in MB)**: The amount of memory in megabytes that the system VM "
+"should be allocated. For example, “2048” would provide for a 2 GB RAM "
+"allocation. If Custom is checked, this field does not appear."
+msgstr "** Memory (in MB) **:  分配给系统 VM 的内存M数。比如,, “ 2048 ” 应该提供 2 G  RAM。如果选择订制,该区域不会出现。"
+
+# 49dbd9d864764c3bb376c6d8be3bece9
+#: ../../service_offerings.rst:221
+msgid "**Network Rate**: Allowed data transfer rate in MB per second."
+msgstr "**网络速度**: 允许的数据传输速度(MB/秒)。"
+
+# 4795fdfeed274d4e8285f07a6f79765e
+#: ../../service_offerings.rst:225
+msgid "**Disk Read Rate**: Allowed disk read rate in bits per second."
+msgstr "** 磁盘读取速率 ** :磁盘每秒允许读取的bit数"
+
+# d6c47d486cb24fa5b357988fc94cf0b2
+#: ../../service_offerings.rst:229
+msgid "**Disk Write Rate**: Allowed disk write rate in bits per second."
+msgstr "** 磁盘写入速率 **: 磁盘每秒允许写入的bit数。"
+
+# 55076ab2ffc14cc0a8c900e458e4a399
+#: ../../service_offerings.rst:233
+msgid ""
+"**Disk Read Rate**: Allowed disk read rate in IOPS (input/output operations "
+"per second)."
+msgstr "** 磁盘读取速率 ** : IPOS (每秒的输入/输出操作 )中运行磁盘读取的速率"
+
+# 4d2fddd5f68d460185407974f5fa7c24
+#: ../../service_offerings.rst:238
+msgid ""
+"**Disk Write Rate**: Allowed disk write rate in IOPS (input/output "
+"operations per second)."
+msgstr "** 磁盘写入速率 ** : IPOS (每秒的输入/输出操作 )中运行磁盘写入的速率"
+
+# 5aa78ccd32374d3ca982b045ba9017a6
+#: ../../service_offerings.rst:243
+msgid ""
+"**Offer HA**: If yes, the administrator can choose to have the system VM be "
+"monitored and as highly available as possible."
+msgstr "** HA 方案 ** : 如果必要,管理员可以选择监控系统 VM 和尽可能采用高可用。"
+
+# 165a9bce37684d13b4148ff372af93ac
+#: ../../service_offerings.rst:248
+msgid ""
+"**Storage Tags**: The tags that should be associated with the primary "
+"storage used by the system VM."
+msgstr "** 存储标签 ** :这个标签应该和系统 VM 使用的主存储相关联。"
+
+# 62a32c62b6214915a1be3170d977ff82
+#: ../../service_offerings.rst:253
+msgid "**Host Tags**: (Optional) Any tags that you use to organize your hosts"
+msgstr "** 主机标签 ** :(可选)用于组织你的主机的任何标签。"
+
+# 3f87e25c978045b4ad15f9f50a50ff29
+#: ../../service_offerings.rst:258
+msgid ""
+"**CPU cap**: Whether to limit the level of CPU usage even if spare capacity "
+"is available."
+msgstr "** CPU 容量 ** : 是否限制CPU使用率的水平,即使备用容量仍可用。"
+
+# 5fed37e2d47f4527a0aeabf1b92e7139
+#: ../../service_offerings.rst:263
+msgid ""
+"**Public**: Indicate whether the service offering should be available all "
+"domains or only some domains. Choose Yes to make it available to all "
+"domains. Choose No to limit the scope to a subdomain; CloudStack will then "
+"prompt for the subdomain's name."
+msgstr "** 公共 ** : 指明系统方案是对所有域或者部分域是否可用。 选择 Yes 则所有域可用。选择 No 则限制一定范围的域可用; CloudStack 会给出一个字域名字提示。"
+
+# 0f0c33d4cb044afb966204f19fd40896
+#: ../../service_offerings.rst:270
+msgid ""
+"**isVolatile**: If checked, VMs created from this service offering will have"
+" their root disks reset upon reboot. This is useful for secure environments "
+"that need a fresh start on every boot and for desktops that should not "
+"retain state."
+msgstr "** 隔离 ** : 如果选中,从这个服务方案创建的虚拟机重启复位后都会有自己的根磁盘。这对于需要通过重启获得全新开始和无需保持桌面状态的安全环境中非常有用。"
+
+# bf91571008434f83ae42a626145b3114
+#: ../../service_offerings.rst:277
+msgid ""
+"**Deployment Planner**: Choose the technique that you would like CloudStack "
+"to use when deploying VMs based on this service offering."
+msgstr "** 部署方案 ** :当部署基于这个服务方案的虚拟机时,你会让 CloudStack 选择使用这个技术。"
+
+# c29bc8d4409c4cbf867d8cfb948d557f
+#: ../../service_offerings.rst:281
+msgid ""
+"First Fit places new VMs on the first host that is found having sufficient "
+"capacity to support the VM's requirements."
+msgstr "首先,存放新虚拟机的第一台主机必须有足够的容量来满足虚拟机的要求。"
+
+# 44ea64956b5c4f038e044c9ef887cee0
+#: ../../service_offerings.rst:284
+msgid ""
+"User Dispersing makes the best effort to evenly distribute VMs belonging to "
+"the same account on different clusters or pods."
+msgstr " 用户分散尽最大努力均匀分配同一个账户的虚拟机在不同的集群或者提供点。"
+
+# e4a54060c1ac4d8599b69999244f81b7
+#: ../../service_offerings.rst:287
+msgid ""
+"User Concentrated prefers to deploy VMs belonging to the same account within"
+" a single pod."
+msgstr "用户更倾向于集中部署同一帐户内的虚拟机在单一提供点."
+
+# 46470c04363245eb8f5a3bb22cc5c6ff
+#: ../../service_offerings.rst:290
+msgid ""
+"Implicit Dedication will deploy VMs on private infrastructure that is "
+"dedicated to a specific domain or account. If you choose this planner, then "
+"you must also pick a value for Planner Mode. See `“Dedicating Resources to "
+"Accounts and Domains” <accounts.html#dedicating-resources-to-accounts-and-"
+"domains>`_."
+msgstr "默认将虚拟机部署在特定域或账户的专属基础设施中。如果你选择,那么你必须为规划者参考 `“ 为账号和域指定资源 ”  <accounts.html#dedicating-resources-to-accounts-and-domains>`_."
+
+# cfd2799cef4f4539a84f5af69e7b703d
+#: ../../service_offerings.rst:296
+msgid ""
+"Bare Metal is used with bare metal hosts. See Bare Metal Installation in the"
+" Installation Guide."
+msgstr "裸机协同全裸机使用。参考安装向导中的全裸机安装。"
+
+# 251146ce0d03439e90d1c4af3f26121d
+#: ../../service_offerings.rst:301
+msgid ""
+"**Planner Mode**: Used when ImplicitDedicationPlanner is selected in the "
+"previous field. The planner mode determines how VMs will be deployed on "
+"private infrastructure that is dedicated to a single domain or account."
+msgstr "** 方案模式 ** :当在之前场景中默认指定方案被选中时使用。方案模式决定了在分享的单独域或账户的私有基础架构中部署多少虚拟机。"
+
+# 971de015210e4c48b8bbb69d41e7c9bb
+#: ../../service_offerings.rst:306
+msgid ""
+"Strict: A host will not be shared across multiple accounts. For example, "
+"strict implicit dedication is useful for deployment of certain types of "
+"applications, such as desktops, where no host can be shared between "
+"different accounts without violating the desktop software's terms of "
+"license."
+msgstr "严禁:一个主机禁止通过多个账号共享。例如,严格默认指定对于部署的某些应用是有用处的,例如,在无隔离桌面软件授权主机上不能在不同账号间进行桌面共享。"
+
+# bc0ad33164c54b72a4e427acfb9789f6
+#: ../../service_offerings.rst:312
+msgid ""
+"Preferred: The VM will be deployed in dedicated infrastructure if possible. "
+"Otherwise, the VM can be deployed in shared infrastructure."
+msgstr "优先:VM 尽可能的部署在专属基础架构。否则部署在共享基础架构。"
+
+# 069722e5040444d5a99c36f0eb592a7b
+# a4fcc407968549d78264a3e08d0caf2f
+# 79e8caf7d7524e89b160a24e84853cc8
+#: ../../service_offerings.rst:318 ../../service_offerings.rst:414
+#: ../../service_offerings.rst:542
+msgid "Click Add."
+msgstr "点击 添加"
+
+# 053a8f5b0d2b4df1a06751fc5fe86eae
+#: ../../service_offerings.rst:321
+msgid "Creating a New Disk Offering"
+msgstr "创建一个新的磁盘方案"
+
+# fc92b6817cc4485b9235164c1d7d8be5
+#: ../../service_offerings.rst:323
+msgid "To create a new disk offering:"
+msgstr "为了创建一个新的磁盘方案"
+
+# b124a0ea44e647a08b56eeee27020518
+#: ../../service_offerings.rst:335
+msgid "In Select Offering, choose Disk Offering."
+msgstr "在选择方案中,选择  磁盘方案"
+
+# d84bcd6ae3b940a0bd9b95f2c1415bfd
+#: ../../service_offerings.rst:339
+msgid "Click Add Disk Offering."
+msgstr "点击 添加磁盘方案"
+
+# d5b09789f4cc4f109f9288ca121710e6
+#: ../../service_offerings.rst:347
+msgid "Name. Any desired name for the disk offering."
+msgstr "名字"
+
+# 9aaa706a1a5243a6803b1417fbdbfdbb
+# 65350cb3cb09468ea7484bd505f8ed6e
+#: ../../service_offerings.rst:351 ../../service_offerings.rst:479
+msgid ""
+"Description. A short description of the offering that can be displayed to "
+"users"
+msgstr "描述。显示给用户的方案简短描述。"
+
+# 44aac5b446314cb386205e75784d0b48
+#: ../../service_offerings.rst:356
+msgid ""
+"Custom Disk Size. If checked, the user can set their own disk size. If not "
+"checked, the root administrator must define a value in Disk Size."
+msgstr "订制磁盘大小。如果选中,用户可以设置自己磁盘大小。如果没选中,管理员必须定义这个磁盘大小的值。"
+
+# 438e1190c56f4d4383bdf95683e8d2cb
+#: ../../service_offerings.rst:362
+msgid ""
+"Disk Size. Appears only if Custom Disk Size is not selected. Define the "
+"volume size in GB."
+msgstr "磁盘大小。只有 订制磁盘大小 未被选择才会显示。按照GB定义卷大小。"
+
+# 1c08af488d444558abd3043bf83faf45
+#: ../../service_offerings.rst:367
+msgid ""
+"QoS Type. Three options: Empty (no Quality of Service), hypervisor (rate "
+"limiting enforced on the hypervisor side), and storage (guaranteed minimum "
+"and maximum IOPS enforced on the storage side). If leveraging QoS, make sure"
+" that the hypervisor or storage system supports this feature."
+msgstr "QoS 类型。三种可选:空 ( 无服务质量), hypervisor (在 hypervisor侧强制速率限制),存储 (在存储侧保证最小和最大 IOPS)。如需使用 QoS ,确保 hypervisor 或存储系统支持此功能。"
+
+# 2861b3c7902b44419d44cf577eab14dc
+#: ../../service_offerings.rst:375
+msgid ""
+"Custom IOPS. If checked, the user can set their own IOPS. If not checked, "
+"the root administrator can define values. If the root admin does not set "
+"values when using storage QoS, default values are used (the defauls can be "
+"overridden if the proper parameters are passed into CloudStack when creating"
+" the primary storage in question)."
+msgstr "订制 IOPS 。 如选中,用户可以设置自己的 IOPS。如未被选中,root 管理员则能够定义该值。如果使用存储 QoS时,root 管理员没有设置该值,则采用默认值(如果创建主存储时考虑到对应的参数被传递到 CloudStack 中,则默认值将被覆盖)"
+
+# bb20ef54f93f49e9ac31ed2fefb219ad
+#: ../../service_offerings.rst:384
+msgid ""
+"Min IOPS. Appears only if storage QoS is to be used. Set a guaranteed "
+"minimum number of IOPS to be enforced on the storage side."
+msgstr "最小  IOPS 。只有使用存储 QoS 才会出现。在存储侧进行保障最小 IOPS 数量。"
+
+# d4b184d984de4df4b1196b900abaf1df
+#: ../../service_offerings.rst:390
+msgid ""
+"Max IOPS. Appears only if storage QoS is to be used. Set a maximum number of"
+" IOPS to be enforced on the storage side (the system may go above this limit"
+" in certain circumstances for short intervals)."
+msgstr "最大 IOPS 。 使用了存储 QoS才会显示。IPOS 最大数量将在存储侧被强制设置(系统可以在短时间内超过这个限制)"
+
+# 0460331aded04f488a2dbd97cd010333
+#: ../../service_offerings.rst:396
+msgid ""
+"(Optional)Storage Tags. The tags that should be associated with the primary "
+"storage for this disk. Tags are a comma separated list of attributes of the "
+"storage. For example \"ssd,blue\". Tags are also added on Primary Storage. "
+"CloudStack matches tags on a disk offering to tags on the storage. If a tag "
+"is present on a disk offering that tag (or tags) must also be present on "
+"Primary Storage for the volume to be provisioned. If no such primary storage"
+" exists, allocation from the disk offering will fail.."
+msgstr "(可选)存储标签.这个标签应与这个磁盘的主存储相关联。标签以逗号分隔存储的属性列表。比如 \"ssd,blue\". 标签被添加在主存储上。CloudStack 通过标记匹配磁盘方案到主存储。 如果一个标签出(或多个标签)现在磁盘方案里, 那这个标签也必须出现在将要分配这个卷的主存储上。如果这样的主存储不存在, 从这个磁盘方案中进行分配将失败。"
+
+# aaf4ad498bec466486f07c12fa2b9680
+# a5ded01d13be462b911b0f572ae883a0
+#: ../../service_offerings.rst:407 ../../service_offerings.rst:535
+msgid ""
+"Public. Indicate whether the service offering should be available all "
+"domains or only some domains. Choose Yes to make it available to all "
+"domains. Choose No to limit the scope to a subdomain; CloudStack will then "
+"prompt for the subdomain's name."
+msgstr "** 公共 ** : 指明系统方案是对所有域或者部分域是否可用。 选择 Yes 则所有域可用。选择 No 则限制一定范围的域可用; CloudStack 会给出一个子域名字提示。"
+
+# 081432e45d6443ec8f74a2bec8f4d865
+#: ../../service_offerings.rst:417
+msgid "Modifying or Deleting a Service Offering"
+msgstr "修改或删除一个服务方案"
+
+# 04957538fcac40cda4cae6e23226b84d
+#: ../../service_offerings.rst:419
+msgid ""
+"Service offerings cannot be changed once created. This applies to both "
+"compute offerings and disk offerings."
+msgstr "服务方案一旦被创建则不能被修改。这个特性同样适用于计算方案和磁盘方案。"
+
+# 7c46df7dc12140539bfd46d99a2043a2
+#: ../../service_offerings.rst:422
+msgid ""
+"A service offering can be deleted. If it is no longer in use, it is deleted "
+"immediately and permanently. If the service offering is still in use, it "
+"will remain in the database until all the virtual machines referencing it "
+"have been deleted. After deletion by the administrator, a service offering "
+"will not be available to end users that are creating new instances."
+msgstr "系统服务方案可以被删除。它不再处于使用中,它可以被立即永久删除。如果服务方案处于使用中,它会留在数据库中,直到所有引用它的虚拟机被删除。管理员删除后,管理员创建新的虚拟机时这个服务方案将不可用。"
+
+# d4e978b689ae43d396b3948586c8fe51
+#: ../../service_offerings.rst:430
+msgid "System Service Offerings"
+msgstr "系统服务方案"
+
+# 81dcd14983c44b3db493d1295cd1c324
+#: ../../service_offerings.rst:432
+msgid ""
+"System service offerings provide a choice of CPU speed, number of CPUs, "
+"tags, and RAM size, just as other service offerings do. But rather than "
+"being used for virtual machine instances and exposed to users, system "
+"service offerings are used to change the default properties of virtual "
+"routers, console proxies, and other system VMs. System service offerings are"
+" visible only to the CloudStack root administrator. CloudStack provides "
+"default system service offerings. The CloudStack root administrator can "
+"create additional custom system service offerings."
+msgstr "系统服务方案提供CPU速度,CPU数量,标签和RAM大小的选择,就像其他服务方案那样。但不被用于虚拟机实例和暴露给用户,系统服务方案是用来改变虚拟路由器,console 代理,和其他系统的虚拟机的默认属性。系统服务方案只对 CloudStack中 root 管理员是可见的。CloudStack 提供默认的系统管理方案。CloudStack 中 root 管理员可以创建其他自定义系统服务方案。"
+
+# 4e12b4c9239643c28f670ed1616b20e0
+#: ../../service_offerings.rst:441
+msgid ""
+"When CloudStack creates a virtual router for a guest network, it uses "
+"default settings which are defined in the system service offering associated"
+" with the network offering. You can upgrade the capabilities of the virtual "
+"router by applying a new network offering that contains a different system "
+"service offering. All virtual routers in that network will begin using the "
+"settings from the new service offering."
+msgstr "当 CloudStack 中创建一个虚拟路由器的来宾网络,它使用系统服务方案中的默认设置和网络方案进行关联。你可以通过应用包含不同的系统服务方案的网络方案升级的虚拟路由器的功能。该网络中的所有虚拟路由器将使用来自新服务方案的设置。"
+
+# 3730bbecb4f94765aab86ec88a82187c
+#: ../../service_offerings.rst:449
+msgid "Creating a New System Service Offering"
+msgstr "创建一个新的系统服务方案"
+
+# d631a080073a4cb6acbb274c4ed773dc
+#: ../../service_offerings.rst:451
+msgid "To create a system service offering:"
+msgstr "为了创建一个系统服务方案:"
+
+# 3fd1bbef80f24c399cfe374469107744
+#: ../../service_offerings.rst:463
+msgid "In Select Offering, choose System Offering."
+msgstr "在选择方案中,选择 系统方案"
+
+# 7d7196c8eaea429384aa3171b8fb0857
+#: ../../service_offerings.rst:467
+msgid "Click Add System Service Offering."
+msgstr "点击 添加系统服务方案"
+
+# b8ac0675d6c94d75b4169623ca12cb7e
+#: ../../service_offerings.rst:475
+msgid "Name. Any desired name for the system offering."
+msgstr "名称。系统方案任意名称。"
+
+# 1d8d081c6f3a448b8c4b8856ae75211b
+#: ../../service_offerings.rst:484
+msgid ""
+"System VM Type. Select the type of system virtual machine that this offering"
+" is intended to support."
+msgstr "系统 VM 类型。选中方案支持的系统虚拟机的类型。"
+
+# 784381566bea439caa03dbe7d8cbe864
+#: ../../service_offerings.rst:489
+msgid ""
+"Storage type. The type of disk that should be allocated. Local allocates "
+"from storage attached directly to the host where the system VM is running. "
+"Shared allocates from storage accessible via NFS."
+msgstr "存储类型。应该指明磁盘类型。运行中的虚拟机所在主机关联的存储采用本地分配。通过 NFS 可访问存储共享分配。"
+
+# b6b544adf6234b0187f4b984c60b0d7f
+#: ../../service_offerings.rst:496
+msgid ""
+"# of CPU cores. The number of cores which should be allocated to a system VM"
+" with this offering"
+msgstr "# CPU 核心。方案中提供给系统 VM 可分配的核心数量。"
+
+# d84bb45103ba4d42a5294e82673f95bb
+#: ../../service_offerings.rst:501
+msgid ""
+"CPU (in MHz). The CPU speed of the cores that the system VM is allocated. "
+"For example, \"2000\" would provide for a 2 GHz clock."
+msgstr "CPU ( MHz )。 分配给系统 VM CPU 核心频率。例如,” 2000 “ 将提供一个2 GHz 时钟。"
+
+# f08747fb0de447389835eaa94f6d5503
+#: ../../service_offerings.rst:506
+msgid ""
+"Memory (in MB). The amount of memory in megabytes that the system VM should "
+"be allocated. For example, \"2048\" would provide for a 2 GB RAM allocation."
+msgstr "内存 ( MB )。系统 VM 应该总计分配兆字节内存。例如,” 2048 “ 应该分配 2GB RAM."
+
+# 543ccf9e89094bb8a3885601a683c7bf
+#: ../../service_offerings.rst:512
+msgid "Network Rate. Allowed data transfer rate in MB per second."
+msgstr "网络速率。每秒允许传输多少 MB 数据。"
+
+# 7f09cb9a722544e7a23f713f939cfb88
+#: ../../service_offerings.rst:516
+msgid ""
+"Offer HA. If yes, the administrator can choose to have the system VM be "
+"monitored and as highly available as possible."
+msgstr "提供HA。如果提供,管理员可以为监控系统 VM 并且提供必要的高可用。"
+
+# 2702400504534a74b319b416af939d43
+#: ../../service_offerings.rst:521
+msgid ""
+"Storage Tags. The tags that should be associated with the primary storage "
+"used by the system VM."
+msgstr "存储标签。它应该和系统 VM 使用的主存储相关联。"
+
+# b7d909be7e1b4a3184babd8801653369
+#: ../../service_offerings.rst:526
+msgid "Host Tags. (Optional) Any tags that you use to organize your hosts"
+msgstr "主机标签。 ( 可选 )你可以选择任何标签用于规范你的主机。"
+
+# 2617004b14634e419e19c06d3d654906
+#: ../../service_offerings.rst:530
+msgid ""
+"CPU cap. Whether to limit the level of CPU usage even if spare capacity is "
+"available."
+msgstr "CPU 容量。是否限制 CPU 使用水平不管是否还有可用的空闲容量。"
+
+# c7c9cb00c4da4943846c26420cf4df0f
+#: ../../service_offerings.rst:545
+msgid "Network Throttling"
+msgstr "网络限速"
+
+# f1830dc574e340b2b66af0a7a65e80b7
+#: ../../service_offerings.rst:547
+msgid ""
+"Network throttling is the process of controlling the network access and "
+"bandwidth usage based on certain rules. CloudStack controls this behaviour "
+"of the guest networks in the cloud by using the network rate parameter. This"
+" parameter is defined as the default data transfer rate in Mbps (Megabits "
+"Per Second) allowed in a guest network. It defines the upper limits for "
+"network utilization. If the current utilization is below the allowed upper "
+"limits, access is granted, else revoked."
+msgstr "网络限速是基于明确规则来控制网络访问和带宽使用率的一个进程。 CloudStack 中通过网络速率参数来控制来宾网络在云中的行为。这个参数定义一个来宾网络允许的默认数据传输速率为 Mbps (兆比特每秒)。它定义了网络利用上限。如果目前的使用率低于允许的上限,则允许访问,否则拒绝。"
+
+# f1daa5866fcc45728acad7d74e2f8a33
+#: ../../service_offerings.rst:555
+msgid ""
+"You can throttle the network bandwidth either to control the usage above a "
+"certain limit for some accounts, or to control network congestion in a large"
+" cloud environment. The network rate for your cloud can be configured on the"
+" following:"
+msgstr "你可以在大型云环境中通过限制一些账户明确的使用率或拥塞控制来节省网络带宽。以下是可以在你的云中进行配置的网络速率:"
+
+# 25d479438aef42238d2d59ca69a45c2e
+#: ../../service_offerings.rst:562
+msgid "Network Offering"
+msgstr "网络方案"
+
+# 8aa95eec28104620848f96ef583794e1
+#: ../../service_offerings.rst:566
+msgid "Service Offering"
+msgstr "服务方案"
+
+# 967aa7efbc474657ab2c56b2f2cfe89d
+#: ../../service_offerings.rst:570
+msgid "Global parameter"
+msgstr "全局参数"
+
+# 0b9b8573e9374141b8494c8977757b76
+#: ../../service_offerings.rst:572
+msgid ""
+"If network rate is set to NULL in service offering, the value provided in "
+"the vm.network.throttling.rate global parameter is applied. If the value is "
+"set to NULL for network offering, the value provided in the "
+"network.throttling.rate global parameter is considered."
+msgstr "服务方案中如果网络速率设置为 NULL , vm.network.throttling.rate 值作为全局参数被应用。网络方案中如果这个值设置为 NULL 。network.throttling.rate 值被看做全局参数。"
+
+# 103b96ec5d704a988165c554da186ff0
+#: ../../service_offerings.rst:577
+msgid ""
+"For the default public, storage, and management networks, network rate is "
+"set to 0. This implies that the public, storage, and management networks "
+"will have unlimited bandwidth by default. For default guest networks, "
+"network rate is set to NULL. In this case, network rate is defaulted to the "
+"global parameter value."
+msgstr "对于默认的公共,存储和管理网络,网络速度被设置为0,这意味着,公共,存储和管理网络默认不被限制带宽。对于默认来宾网络,网络速率设置为 NULL 。在这种情况下,网络速率被默认为全局参数值。"
+
+# fc7b8c60b2c6410fafc10af96b2028eb
+#: ../../service_offerings.rst:583
+msgid ""
+"The following table gives you an overview of how network rate is applied on "
+"different types of networks in CloudStack."
+msgstr "你可以在大型云环境中通过限制一些账户明确的使用率或拥塞控制来节省网络带宽。以下是可以在你的云中进行配置的网络速率:"
+
+# 4b720fa08a67466f8c4be7b61b5006d7
+#: ../../service_offerings.rst:587
+msgid "Networks"
+msgstr "网络"
+
+# 5c196b4f7f9343949e714444a81662ca
+#: ../../service_offerings.rst:587
+msgid "Network Rate Is Taken from"
+msgstr "网络速率起源"
+
+# 8a75f76704c6494188994beb853c358c
+#: ../../service_offerings.rst:589
+msgid "Guest network of Virtual Router"
+msgstr "来宾网络虚拟路由器"
+
+# da1096a96e734078acf210be8b8d8ffa
+# 4f9c2c9e08d94ef19098590eacd942b1
+#: ../../service_offerings.rst:589 ../../service_offerings.rst:590
+msgid "Guest Network Offering"
+msgstr "来宾网络方案"
+
+# e18323526a374696b62b18aedd3198fa
+#: ../../service_offerings.rst:590
+msgid "Public network of Virtual Router"
+msgstr "公网网络虚拟路由器"
+
+# 7f04af96ba48492981b6640e3c6bfc7e
+#: ../../service_offerings.rst:591
+msgid "Storage network of Secondary Storage VM"
+msgstr "辅助存储 VM 的存储网络"
+
+# d8b79a9ca30648fdb2644a4c08822aa2
+# bd6341e090f442968d71738bcb538137
+# d470046fa29b40249f53f1289089a15c
+# 883e08fa95c44faa9a4efb3d59b3192e
+# 9e97d44a94694a7fb7f28c7bb59a676d
+# 8498073f7c214108a8c1991f002a96e5
+# bd551bcdaefd4caaac78bd7448f65e29
+# 7febd7a246114388850b925808d3d834
+#: ../../service_offerings.rst:591 ../../service_offerings.rst:592
+#: ../../service_offerings.rst:593 ../../service_offerings.rst:594
+#: ../../service_offerings.rst:595 ../../service_offerings.rst:596
+#: ../../service_offerings.rst:597 ../../service_offerings.rst:598
+msgid "System Network Offering"
+msgstr "系统网络方案"
+
+# 132a5d89b2cf4543a74909dd2674a9ec
+#: ../../service_offerings.rst:592
+msgid "Management network of Secondary Storage VM"
+msgstr "辅助存储 VM 的管理网络"
+
+# f2b0b9fcf39c4902979d572868e85a78
+#: ../../service_offerings.rst:593
+msgid "Storage network of Console Proxy VM"
+msgstr "Console 代理 VM 的存储网络"
+
+# 92e7a0a5af7a47bda3fbba4cef6ad20d
+#: ../../service_offerings.rst:594
+msgid "Management network of Console Proxy VM"
+msgstr "Console 代理 VM 的管理玩了过"
+
+# c4659347051f4759ab6b9ab75295ae0c
+#: ../../service_offerings.rst:595
+msgid "Storage network of Virtual Router"
+msgstr "虚拟路由器的存储网络"
+
+# 6413da0a4c90484d887d39fef63d14c1
+#: ../../service_offerings.rst:596
+msgid "Management network of Virtual Router"
+msgstr "虚拟路由器的管理网络"
+
+# 11957148748943c68ddf5c23079e89e9
+#: ../../service_offerings.rst:597
+msgid "Public network of Secondary Storage VM"
+msgstr "辅助存储 VM 的公共网络"
+
+# 589807908d6a463db2ec68c966dbf5d7
+#: ../../service_offerings.rst:598
+msgid "Public network of Console Proxy VM"
+msgstr "Console 代理 VM 的公共玩了过"
+
+# 89fb7e1afb4543c88835a3ca994303ac
+#: ../../service_offerings.rst:599
+msgid "Default network of a guest VM"
+msgstr "Console 代理 VM 的默认网络"
+
+# cdbf4eb58e834d4392be25038d928473
+#: ../../service_offerings.rst:599
+msgid "Compute Offering"
+msgstr "计算方案"
+
+# a94d5ee824fc4df19725d593f54d08e1
+#: ../../service_offerings.rst:600
+msgid "Additional networks of a guest VM"
+msgstr "来宾 VM 的附加网络"
+
+# bf973633a40042d38a533aa9deecb6c3
+#: ../../service_offerings.rst:600
+msgid "Corresponding Network Offerings"
+msgstr "对应的网络方案"
+
+# 5cfd6ae1e9b64e74841a67f4cd70d485
+#: ../../service_offerings.rst:604
+msgid ""
+"A guest VM must have a default network, and can also have many additional "
+"networks. Depending on various parameters, such as the host and virtual "
+"switch used, you can observe a difference in the network rate in your cloud."
+" For example, on a VMware host the actual network rate varies based on where"
+" they are configured (compute offering, network offering, or both); the "
+"network type (shared or isolated); and traffic direction (ingress or "
+"egress)."
+msgstr "一个来宾虚拟机必须有一个默认网络,也可拥有多个附加网。根据各种参数,如主机和虚拟交换机使用,你可以观察到在云网络中的不同速率。例如,在 VMware 主机的实际网络速率依赖于其他配置( 计算方案,网络方案,或两者兼有 );网络类型( 共享或隔离 )和流量方向( 入口或出口 )。"
+
+# 92aac7a6df8c4b349ebaed61a6f31c67
+#: ../../service_offerings.rst:612
+msgid ""
+"The network rate set for a network offering used by a particular network in "
+"CloudStack is used for the traffic shaping policy of a port group, for "
+"example: port group A, for that network: a particular subnet or VLAN on the "
+"actual network. The virtual routers for that network connects to the port "
+"group A, and by default instances in that network connects to this port "
+"group. However, if an instance is deployed with a compute offering with the "
+"network rate set, and if this rate is used for the traffic shaping policy of"
+" another port group for the network, for example port group B, then "
+"instances using this compute offering are connected to the port group B, "
+"instead of connecting to port group A."
+msgstr "CloudStack 中特定网络使用网络方案的网络速率设置将应用到端口组的流量整形策略中。例如:端口组 A , 网络 : 现实网络的特定子网或 VLAN 。网络通过虚拟路由器连接端口组 A ,同时网络中默认实例也连接该端口组。尽管如此,如果通过设置了网络速率的计算方案部署虚拟机,并且如果这个网络速率通过流量整形策略应用到其他端口组。例如端口组 B , 使用该计算方案的实例连接到端口组 B 将 替换到端口组 A 的连接。"
+
+# f5c03fa32d6e4f2983c7ff66b192d60f
+#: ../../service_offerings.rst:623
+msgid ""
+"The traffic shaping policy on standard port groups in VMware only applies to"
+" the egress traffic, and the net effect depends on the type of network used "
+"in CloudStack. In shared networks, ingress traffic is unlimited for "
+"CloudStack, and egress traffic is limited to the rate that applies to the "
+"port group used by the instance if any. If the compute offering has a "
+"network rate configured, this rate applies to the egress traffic, otherwise "
+"the network rate set for the network offering applies. For isolated "
+"networks, the network rate set for the network offering, if any, effectively"
+" applies to the ingress traffic. This is mainly because the network rate set"
+" for the network offering applies to the egress traffic from the virtual "
+"router to the instance. The egress traffic is limited by the rate that "
+"applies to the port group used by the instance if any, similar to shared "
+"networks."
+msgstr "VMWARE中基于标准端口组流量整形策略只被应用于出口流量,并且网络效果依赖于 CloudStack 中使用的网络类型。共享网络中,不限制 CloudStack 入口流量,同时限制出口流量到任何实例应用到端口组的速率。如果计算方案配置了网络速率,速率应用到出口流量,否则应用网络方案的网络速率设置。对于隔离网络,网络方案设置网络速率,如果明确了范围,会对入口流量产生影响。这个主要是因为网络方案的网络速率设置应用在虚拟路由器到实例之间的出口流量上。在一定范围内,实例通过端口组速率限制出口流量,这个和共享网络类似。"
+
+# 5286b20c07fa446383e5bbb52b2c92aa
+#: ../../service_offerings.rst:637
+msgid "For example:"
+msgstr "例如:"
+
+# 766974c020ba48f4a25970cb60cf548a
+#: ../../service_offerings.rst:639
+msgid "Network rate of network offering = 10 Mbps"
+msgstr "网络方案网络速率 = 10 Mbps"
+
+# 39893a3149b64f5bb830da2ca8a40712
+#: ../../service_offerings.rst:641
+msgid "Network rate of compute offering = 200 Mbps"
+msgstr "计算方案网络速率 = 200 Mbps"
+
+# e2476b49fd764870928ced7642f8f07e
+#: ../../service_offerings.rst:643
+msgid ""
+"In shared networks, ingress traffic will not be limited for CloudStack, "
+"while egress traffic will be limited to 200 Mbps. In an isolated network, "
+"ingress traffic will be limited to 10 Mbps and egress to 200 Mbps."
+msgstr "共享网络中。CloudStack 这种进入流量不进行限制,同时出口流量限制为 200 Mbps。隔离网络入口流量限制为 10 Mbps,同时出口流量限制到 200 Mbps"
+
+# abc1ac0645fb48f486870aa8d4c2bab0
+#: ../../service_offerings.rst:649
+msgid "Changing the Default System Offering for System VMs"
+msgstr "修改系统 VM 的默系统方案"
+
+# 8ad19cf6c98047c7949c49cb480775b8
+#: ../../service_offerings.rst:651
+msgid ""
+"You can manually change the system offering for a particular System VM. "
+"Additionally, as a CloudStack administrator, you can also change the default"
+" system offering used for System VMs."
+msgstr "你可认为的修改一个特殊系统 VM 的系统方案。此外,作为一个 CloudStack 管理员,你也可以改变系统 VM 使用的默认系统方案。"
+
+# 18c5c2c31180461ab2bdc0018e43b820
+#: ../../service_offerings.rst:657
+msgid "Create a new system offering."
+msgstr "创建一个新的系统方案"
+
+# b3000d9d38c446e38588053ec16f04a6
+#: ../../service_offerings.rst:659
+msgid "For more information, see Creating a New System Service Offering."
+msgstr "获取更多信息,查看 创建一个新的系统服务方案"
+
+# c26c502d859341c8b5809d65fbdaab32
+#: ../../service_offerings.rst:663
+msgid "Back up the database:"
+msgstr "备份数据库:"
+
+# b55e76b346d8402987a5664cce1e6fdd
+#: ../../service_offerings.rst:671
+msgid "Open an MySQL prompt:"
+msgstr "打开一个 MySQL 提示:"
+
+# d2f05e5d35634eed8868a9643ea6f36c
+#: ../../service_offerings.rst:679
+msgid "Run the following queries on the cloud database."
+msgstr "在 cloud 数据库运行以下查询。"
+
+# 5e641aaf3ad74318a5f050a9a72d1033
+#: ../../service_offerings.rst:683
+msgid ""
+"In the disk\\_offering table, identify the original default offering and the"
+" new offering you want to use by default."
+msgstr "在磁盘 \\_offering 表,验证原始默认方案和你想默认使用的新方案。"
+
+# 6521f0ec28f6435f9801c6c5738b998c
+#: ../../service_offerings.rst:686
+msgid "Take a note of the ID of the new offering."
+msgstr "记录新方案的 ID"
+
+# 497b62e6320840929935a243e49b3a24
+#: ../../service_offerings.rst:694
+msgid ""
+"For the original default offering, set the value of unique\\_name to NULL."
+msgstr "对于原始默认方案,设置 \\_name 唯一值为 NULL"
+
+# d7dff9df26b440bfadf8ae86dc592858
+#: ../../service_offerings.rst:701
+msgid "Ensure that you use the correct value for the ID."
+msgstr "确保你使用正确的 ID 值"
+
+# 31d41d6cf1f041ec8805016e12293a5a
+#: ../../service_offerings.rst:705
+msgid ""
+"For the new offering that you want to use by default, set the value of "
+"unique\\_name as follows:"
+msgstr "对于你想使用默认值的新方案,参照以下进行唯一 \\_name 值设置:"
+
+# 5af2c257aaeb4d888548b5499fee43df
+#: ../../service_offerings.rst:708
+msgid ""
+"For the default Console Proxy VM (CPVM) offering,set unique\\_name to 'Cloud"
+".com-ConsoleProxy'. For the default Secondary Storage VM (SSVM) offering, "
+"set unique\\_name to 'Cloud.com-SecondaryStorage'. For example:"
+msgstr "对于默认控制台代理虚拟机 ( CPVM )方案, 设置唯一 \\_name 为 ' Cloud.com-ConsoleProxy '。对于默认辅助存储虚拟机 ( SSVM  ) 方案,  设置唯一 \\_name 为 ' Cloud.com-SecondaryStorage '。例如:"
+
+# 2e93eab165104e88bd96e7ac3ded117a
+#: ../../service_offerings.rst:719
+msgid ""
+"Restart CloudStack Management Server. Restarting is required because the "
+"default offerings are loaded into the memory at startup."
+msgstr "重启 CloudStack  管理器服务器。因为默认方案启动时被加载到内存,要求重启。"
+
+# 7f3d5522d0144163a56bb61490306a87
+#: ../../service_offerings.rst:728
+msgid ""
+"Destroy the existing CPVM or SSVM offerings and wait for them to be "
+"recreated. The new CPVM or SSVM are configured with the new offering."
+msgstr "销毁存在的 CPVM 或 SSVM 方案,并等待它们重建。 通过新的系统方案配置新的 CPVM 或 SSVM。"