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 2013/06/04 08:10:03 UTC
git commit: updated refs/heads/master to 13eaa9a
Updated Branches:
refs/heads/master cc2091078 -> 13eaa9a5b
CLOUDSTACK-847
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13eaa9a5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13eaa9a5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13eaa9a5
Branch: refs/heads/master
Commit: 13eaa9a5b82037c84ceefa448e3fc7e69b2becf3
Parents: cc20910
Author: Radhika PC <ra...@citrix.com>
Authored: Tue Jun 4 11:28:23 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Tue Jun 4 11:32:23 2013 +0530
----------------------------------------------------------------------
docs/en-US/guest-ip-ranges.xml | 2 +-
docs/en-US/multiple-ip-range.xml | 41 +++++++++++++++++++++++++++++++++
docs/en-US/networks.xml | 1 +
3 files changed, 43 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13eaa9a5/docs/en-US/guest-ip-ranges.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/guest-ip-ranges.xml b/docs/en-US/guest-ip-ranges.xml
index b3ebd76..ffaa01a 100644
--- a/docs/en-US/guest-ip-ranges.xml
+++ b/docs/en-US/guest-ip-ranges.xml
@@ -28,5 +28,5 @@
their guest network and their clients.</para>
<para>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.</para>
+ one IP range at a time. For more information, see <xref linkend="multiple-ip-ranges"/>.</para>
</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13eaa9a5/docs/en-US/multiple-ip-range.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/multiple-ip-range.xml b/docs/en-US/multiple-ip-range.xml
new file mode 100644
index 0000000..487668d
--- /dev/null
+++ b/docs/en-US/multiple-ip-range.xml
@@ -0,0 +1,41 @@
+<?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="multiple-ip-range">
+ <title>About Multiple IP Ranges</title>
+ <note>
+ <para>The feature can only be implemented on IPv4 addresses.</para>
+ </note>
+ <para>&PRODUCT; provides you with the flexibility to add guest IP ranges from different subnets in
+ Basic zones and security groups-enabled Advanced zones. What it implies in the case of security
+ groups-enabled Advanced zones is 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 during IP address exhaustion. To support this feature, the capability of
+ <code>createVlanIpRange</code> API is extended to add IP ranges also from a different
+ subnet.</para>
+ <para>As an admin, you should manually configure the gateway of the new subnet before adding the
+ IP range. &PRODUCT; supports only one gateway for a subnet; overlapping subnets are not
+ currently supported.</para>
+ <para>Use the <code>deleteVlanRange</code> 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, &PRODUCT; acquires a new IP from the same subnet. If no IP is available in
+ the subnet, the remove operation fails.</para>
+ <para>This feature is supported on KVM, xenServer, and VMware hypervisors.</para>
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13eaa9a5/docs/en-US/networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networks.xml b/docs/en-US/networks.xml
index 8a7405a..b557088 100644
--- a/docs/en-US/networks.xml
+++ b/docs/en-US/networks.xml
@@ -33,6 +33,7 @@
<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="multiple-ip-nic.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="multiple-ip-range.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"/>