cherry pick error fixed

This commit is contained in:
radhikap 2013-08-30 11:25:43 +05:30
parent 3cca6502a1
commit 7a8a3ca26b
5 changed files with 101 additions and 47 deletions

View File

@ -221,6 +221,28 @@ under the License.
check policies in the cloud. You can override this value for an individual health check
policy.</para>
</section>
<section id="rbd-primary-storage">
<title>Snaphotting, backups, cloning and System VMs for RBD Primary Storage</title>
<note>
<para>These new RBD features require at least librbd 0.61.7 (Cuttlefish) and libvirt
0.9.14 on the KVM hypervisors.</para>
</note>
<para>With this release &PRODUCT; will leverage the features of RBD format 2. This allows
snapshotting and backing up those snapshots.</para>
<para>Backups of snapshots to Secondary Storage are full copies of the RBD snapshot, they
are not RBD diffs. This because when restoring a backup of a snapshot it is not mandatory
that this backup is deployed on RBD again, it could also be a NFS Primary Storage.</para>
<para>Another key feature of RBD format 2 is cloning and with this release templates will be
copied to Primary Storage once and using the cloning mechanism new disks will be cloned
from this parent template. This saves space and decreases deployment time for Instances
dramatically.</para>
<para>Before this release a NFS Primary Storage was still required for running the System
VMs from. The reason behind this was a so called 'patch disk' which was generated by the
hypervisor which contained metadata for the System VM. The scripts generating this disk
didn't support RBD and thus System VMs had to be deployed from NFS. With 4.2 instead of
the patch disk a VirtIO serial console is used to pass meta information to System VMs.
This enabled the deployment of System VMs on RBD Primary Storage.</para>
</section>
</section>
<section id="issues-fixed-4.2">
<title>Issues Fixed in 4.2.0</title>
@ -386,6 +408,14 @@ under the License.
</row>
</thead>
<tbody>
<row>
<entry><para><ulink url="https://issues.apache.org/jira/browse/CLOUDSTACK-2709"
>CLOUDSTACK-2709</ulink></para></entry>
<entry>
<para>VM Migration across VMware clusters which are added with different switches
(Standard Swith,Vmware DVS, Cisco Nexus 1000v) is not supported..</para>
</entry>
</row>
<row>
<entry><para><ulink url="https://issues.apache.org/jira/browse/CLOUDSTACK-4207"
>CLOUDSTACK-4207</ulink></para></entry>
@ -1268,7 +1298,6 @@ service cloudstack-agent start
<para><command># apt-get update</command></para>
<para><command># apt-get upgrade cloud-*</command></para>
</listitem>
<listitem>
<para>Edit <filename>/etc/cloudstack/agent/agent.properties</filename> to change the
resource parameter from

View File

@ -20,34 +20,49 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-->
<section id="change-network-offering-on-guest-network">
<title>Changing the Network Offering on a Guest Network</title>
<para>A user or administrator can change the network offering that is associated with an existing guest network.</para>
<itemizedlist>
<listitem><para>Log in to the &PRODUCT; UI as an administrator or end user. </para></listitem>
<listitem><para>If you are changing from a network offering that uses the &PRODUCT; virtual router to one
that uses external devices as network service providers, you must first stop all the
VMs on the network.
<phrase condition="install">See "Stopping and Starting Virtual Machines" in the Administrator's Guide.</phrase>
<phrase condition="admin">See <xref linkend="stopping-and-starting-vms"/>.</phrase></para></listitem>
<listitem><para>In the left navigation, choose Network.</para></listitem>
<listitem><para>Click the name of the network you want to modify.</para></listitem>
<listitem><para>In the Details tab, click Edit.<inlinemediaobject>
<imageobject>
<imagedata fileref="./images/edit-icon.png"/>
</imageobject>
<textobject>
<phrase>EditButton.png: button to edit a network</phrase>
</textobject>
</inlinemediaobject></para></listitem>
<listitem><para>In Network Offering, choose the new network offering, then click Apply.</para></listitem>
<listitem><para>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. Choose No
to proceed with the change.</para></listitem>
<listitem><para>Wait for the update to complete. Dont try to restart VMs until the network change is
complete.</para></listitem>
<listitem><para>If you stopped any VMs, restart them.</para></listitem>
</itemizedlist>
</section>
<title>Changing the Network Offering on a Guest Network</title>
<para>A user or administrator can change the network offering that is associated with an existing
guest network.</para>
<orderedlist>
<listitem>
<para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
</listitem>
<listitem>
<para>If you are changing from a network offering that uses the &PRODUCT; virtual router to
one that uses external devices as network service providers, you must first stop all the VMs
on the network. See <xref linkend="stopping-and-starting-vms"/>.</para>
</listitem>
<listitem>
<para>In the left navigation, choose Network.</para>
</listitem>
<listitem>
<para>Click the name of the network you want to modify.</para>
</listitem>
<listitem>
<para>In the Details tab, click Edit.<inlinemediaobject>
<imageobject>
<imagedata fileref="./images/edit-icon.png"/>
</imageobject>
<textobject>
<phrase>EditButton.png: button to edit a network</phrase>
</textobject>
</inlinemediaobject></para>
</listitem>
<listitem>
<para>In Network Offering, choose the new network offering, then click Apply.</para>
<para>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.</para>
<para>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.</para>
</listitem>
<listitem>
<para>Wait for the update to complete. Dont try to restart VMs until the network change is
complete.</para>
</listitem>
<listitem>
<para>If you stopped any VMs, restart them.</para>
</listitem>
</orderedlist>
</section>

View File

@ -23,15 +23,20 @@
-->
<section id="guest-traffic">
<title>Guest Traffic</title>
<para>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.</para>
<para>This figure illustrates a typical guest traffic setup:</para>
<mediaobject>
<imageobject>
<imagedata fileref="./images/guest-traffic-setup.png" />
</imageobject>
<textobject><phrase>Depicts a guest traffic setup.</phrase></textobject>
</mediaobject>
<para>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 has three network 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.</para>
<para>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.</para>
<para>See a typical guest traffic setup given below:</para>
<mediaobject>
<imageobject>
<imagedata fileref="./images/guest-traffic-setup.png" />
</imageobject>
<textobject><phrase>guest-traffic-setup.png: Depicts a guest traffic setup</phrase></textobject>
</mediaobject>
<para>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.</para>
<para>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.</para>
<para>Source NAT is automatically configured in the virtual router to forward outbound traffic for all guest VMs</para>
</section>

View File

@ -223,15 +223,15 @@
<listitem>
<para><emphasis role="bold">IP Range</emphasis>: A range of IP addresses that are
accessible from the Internet and are assigned to the guest VMs.</para>
<para>If one NIC is used, these IPs should be in the same CIDR in the case of
IPv6.</para>
<!--<para>If one NIC is used, these IPs should be in the same CIDR in the case of
IPv6.</para> -->
</listitem>
<listitem>
<!-- <listitem>
<para><emphasis role="bold">IPv6 CIDR</emphasis>: 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.</para>
</listitem>
</listitem> -->
<listitem>
<para><emphasis role="bold">Network Domain</emphasis>: A custom DNS suffix at the level
of a network. If you want to assign a special domain name to the guest VM network,

View File

@ -3,6 +3,7 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
<!-- 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
@ -10,7 +11,9 @@
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
@ -25,6 +28,10 @@
establishing a VPN connection to the virtual router of the account from a device in the
datacenter of the enterprise. Having this facility eliminates the need to establish VPN
connections to individual VMs.</para>
<para>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.</para>
<para>The supported endpoints on the remote datacenters are: </para>
<itemizedlist>
<listitem>
@ -39,6 +46,7 @@
that any Cisco or Juniper device running on the supported operating systems are able to
establish VPN connections.</para>
</note>
<para></para>
<para> To set up a Site-to-Site VPN connection, perform the following:</para>
<orderedlist>
<listitem>
@ -55,9 +63,6 @@
<para>Create VPN connection from the VPC VPN gateway to the customer VPN gateway.</para>
</listitem>
</orderedlist>
<note><para>Appropriate events are generated on the &PRODUCT; UI when status of a Site-to-Site VPN
connection changes from connected to disconnected, or vice versa. Currently no events are generated
when establishing a VPN connection fails or pending.</para></note>
<xi:include href="create-vpn-customer-gateway.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="create-vpn-gateway-for-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="create-vpn-connection-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>