Revert "cloudstack-850" This reverts commit 320ab0a968ab56faba930c3eb9843ae129e9e2d5.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a8b5440b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a8b5440b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a8b5440b Branch: refs/heads/gslb-wip Commit: a8b5440bf4c9638383e52c701b59ed9d68391893 Parents: 320ab0a Author: Radhika PC <radhika.puthiyet...@citrix.com> Authored: Thu Mar 7 16:37:30 2013 +0530 Committer: Radhika PC <radhika.puthiyet...@citrix.com> Committed: Thu Mar 7 16:37:30 2013 +0530 ---------------------------------------------------------------------- docs/en-US/advanced-zone-guest-ip-addresses.xml | 11 +- docs/en-US/networks.xml | 3 - docs/en-US/reserved-ip-addresses-non-csvms.xml | 163 ------------------ 3 files changed, 4 insertions(+), 173 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a8b5440b/docs/en-US/advanced-zone-guest-ip-addresses.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/advanced-zone-guest-ip-addresses.xml b/docs/en-US/advanced-zone-guest-ip-addresses.xml index 269ec59..fbc6144 100644 --- a/docs/en-US/advanced-zone-guest-ip-addresses.xml +++ b/docs/en-US/advanced-zone-guest-ip-addresses.xml @@ -11,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 @@ -20,11 +22,6 @@ under the License. --> <section id="advanced-zone-guest-ip-addresses"> - <title>Advanced Zone Guest IP Addresses</title> - <para>When advanced networking is used, the administrator can create additional networks for use - by the guests. These networks can span the zone and be available to all accounts, or they can be - scoped to a single account, in which case only the named account may create guests that attach - to these networks. The networks are defined by a VLAN ID, IP range, and gateway. The - administrator may provision thousands of these networks if desired. Additionally, a part of the - IP address space can also be reserved for non-&PRODUCT; VMs and servers.</para> + <title>Advanced Zone Guest IP Addresses</title> + <para>When advanced networking is used, the administrator can create additional networks for use by the guests. These networks can span the zone and be available to all accounts, or they can be scoped to a single account, in which case only the named account may create guests that attach to these networks. The networks are defined by a VLAN ID, IP range, and gateway. The administrator may provision thousands of these networks if desired.</para> </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a8b5440b/docs/en-US/networks.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/networks.xml b/docs/en-US/networks.xml index 4959583..8305769 100644 --- a/docs/en-US/networks.xml +++ b/docs/en-US/networks.xml @@ -31,12 +31,10 @@ <xi:include href="advanced-zone-physical-network-configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="using-multiple-guest-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="reserved-ip-addresses-non-csvms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="external-firewalls-and-load-balancers.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="load-balancer-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="firewall-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="guest-ip-ranges.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="acquire-new-ip-address.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="release-ip-address.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -45,7 +43,6 @@ <xi:include href="ip-load-balancing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="dns-dhcp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="elastic-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="inter-vlan-routing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="configure-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="persistent-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a8b5440b/docs/en-US/reserved-ip-addresses-non-csvms.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/reserved-ip-addresses-non-csvms.xml b/docs/en-US/reserved-ip-addresses-non-csvms.xml deleted file mode 100644 index 7d385ff..0000000 --- a/docs/en-US/reserved-ip-addresses-non-csvms.xml +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ -<!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 - 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. ---> -<section id="reserved-ip-addresses-non-csvms"> - <title>IP Reservation in Isolated Guest Networks</title> - <para>In Isolated guest networks, a part of the guest IP address space can be reserved for - non-&PRODUCT; 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-&PRODUCT; 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.</para> - <para>In an Advanced zone, an IP address range or a CIDR is assigned to a network when the network - is defined. The &PRODUCT; virtual router acts as the DHCP server and uses CIDR for assigning IP - addresses to the guest VMs. If you decide to reserve IP ranges for non-&PRODUCT; 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 &PRODUCT;. 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 &PRODUCT; to the same network and - assign them the Reserved IP addresses. &PRODUCT; guest VMs cannot acquire IPs from the Reserved - IP Range.</para> - <section id="ip-reserve-consider"> - <title>IP Reservation Considerations</title> - <para>Consider the following before you reserve an IP range for non-&PRODUCT; machines:</para> - <itemizedlist> - <listitem> - <para>IP Reservation can be applied only when the network is in Implemented state.</para> - </listitem> - <listitem> - <para>No IP Reservation is done by default.</para> - </listitem> - <listitem> - <para>Guest VM CIDR you specify must be a subset of the network CIDR.</para> - </listitem> - <listitem> - <para>Specify a valid Guest VM CIDR. IP Reservation is applied only if no active IPs exist - outside the Guest VM CIDR. </para> - <para>You cannot apply IP Reservation if any VM is alloted with an IP address that is - outside the Guest VM CIDR.</para> - </listitem> - <listitem> - <para>To reset an existing IP Reservation, specify the new value for the Guest VM CIDR in - the CIDR field.</para> - <para>For example, the following table describes three scenarios of guest network - creation:</para> - <informaltable> - <tgroup cols="5" align="left" colsep="1" rowsep="1"> - <colspec colnum="1" colname="c1" colwidth="33.0pt"/> - <colspec colnum="2" colname="c2" colwidth="84.75pt"/> - <colspec colnum="3" colname="c3" colwidth="97.5pt"/> - <colspec colnum="4" colname="c4" colwidth="129.0pt"/> - <colspec colnum="5" colname="c5" colwidth="336.0pt"/> - <thead> - <row> - <entry><para>Case</para></entry> - <entry><para> CIDR</para></entry> - <entry><para>Network CIDR</para></entry> - <entry><para>Reserved IP Range for Non-&PRODUCT; VMs</para></entry> - <entry><para>Description</para></entry> - </row> - </thead> - <tbody> - <row> - <entry><para>1</para></entry> - <entry><para>10.1.1.0/24</para></entry> - <entry><para>None</para></entry> - <entry><para>None</para></entry> - <entry><para>No IP Reservation.</para></entry> - </row> - <row> - <entry><para>2</para></entry> - <entry><para>10.1.1.0/26</para></entry> - <entry><para>10.1.1.0/24</para></entry> - <entry><para>10.1.1.64 to 10.1.1.254</para></entry> - <entry><para>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.</para></entry> - </row> - <row> - <entry><para>3</para></entry> - <entry><para>10.1.1.0/24</para></entry> - <entry><para>None</para></entry> - <entry><para>None</para></entry> - <entry><para>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. - </para></entry> - </row> - </tbody> - </tgroup> - </informaltable> - </listitem> - </itemizedlist> - </section> - <section id="ip-reserv-limition"> - <title>Limitations</title> - <itemizedlist> - <listitem> - <para>The IP Reservation is not supported if active IPs are found outside the Guest VM CIDR. - </para> - </listitem> - <listitem> - <para>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 reimplemented network.</para> - </listitem> - </itemizedlist> - </section> - <section id="best-practice-ipreserv"> - <title>Best Practices</title> - <para>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, conflict is - less likely to occur while applying reservation. </para> - </section> - <section id="reserve-ip"> - <title>Reserving an IP Range</title> - <orderedlist> - <listitem> - <para>Log in to the &PRODUCT; UI as an administrator or end user.</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>edit-icon.png: button to edit a network</phrase> - </textobject> - </inlinemediaobject></para> - <para>The CIDR field changes to editable one.</para> - </listitem> - <listitem> - <para>In CIDR, specify the Guest VM CIDR.</para> - </listitem> - <listitem> - <para>Click Apply.</para> - <para>Wait until the Network CIDR and the Reserved IP Range are displayed in the Details - page.</para> - </listitem> - </orderedlist> - </section> -</section>
