Updated Branches: refs/heads/master 14a60c766 -> 5725bbf04
Patch from Joe Brockmeier: Add license headers to n-named files, fix DTDs, etc. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5725bbf0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5725bbf0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5725bbf0 Branch: refs/heads/master Commit: 5725bbf044d882fc30b8ddaaf86610b00a8aad29 Parents: 14a60c7 Author: Chip Childers <[email protected]> Authored: Fri Aug 10 09:10:36 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Fri Aug 10 09:14:51 2012 -0400 ---------------------------------------------------------------------- .../en-US/network-offering-usage-record-format.xml | 27 +++++++++++- docs/en-US/network-offerings.xml | 21 +++++++++- docs/en-US/network-service-providers.xml | 22 +++++++++- docs/en-US/network-usage-record-format.xml | 27 +++++++++++- docs/en-US/networking-in-a-pod.xml | 24 ++++++++++- docs/en-US/networking-in-a-zone.xml | 24 ++++++++++- docs/en-US/networking-overview.xml | 24 ++++++++++- docs/en-US/networking_overview.xml | 28 ++++++++++++- docs/en-US/nfs-shares-on-management-server.xml | 32 +++++++-------- docs/en-US/nfs-shares-on-separate-server.xml | 26 +++++++++++- 10 files changed, 219 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/network-offering-usage-record-format.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/network-offering-usage-record-format.xml b/docs/en-US/network-offering-usage-record-format.xml index 8535544..5dfc361 100644 --- a/docs/en-US/network-offering-usage-record-format.xml +++ b/docs/en-US/network-offering-usage-record-format.xml @@ -1,3 +1,27 @@ +<?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="network-offering-usage-record-format"> <title>Network Offering Usage Record Format</title> <itemizedlist> @@ -16,5 +40,4 @@ <listitem><para>virtualMachineId â The ID of the virtual machine</para></listitem> <listitem><para>startdate, enddate â The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem> </itemizedlist> - </section> - +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/network-offerings.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/network-offerings.xml b/docs/en-US/network-offerings.xml index 87af7eb..ccfb93c 100644 --- a/docs/en-US/network-offerings.xml +++ b/docs/en-US/network-offerings.xml @@ -1,8 +1,27 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ +<!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="network-offerings"> <title>Network Offerings</title> <note><para>For the most up-to-date list of supported network services, see the CloudPlatform UI or call listNetworkServices.</para></note> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/network-service-providers.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/network-service-providers.xml b/docs/en-US/network-service-providers.xml index 2c711ca..af57097 100644 --- a/docs/en-US/network-service-providers.xml +++ b/docs/en-US/network-service-providers.xml @@ -1,8 +1,27 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ +<!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="network-service-providers"> <title>Network Service Providers</title> <note><para>For the most up-to-date list of supported network service providers, see the CloudPlatform UI or call listNetworkServiceProviders.</para></note> @@ -13,5 +32,4 @@ <title>Supported Network Service Providers</title> <para>CloudPlatform ships with an internal list of the supported service providers, and you can choose from this list when creating a network offering.</para> </formalpara> - </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/network-usage-record-format.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/network-usage-record-format.xml b/docs/en-US/network-usage-record-format.xml index fbcc883..742f26b 100644 --- a/docs/en-US/network-usage-record-format.xml +++ b/docs/en-US/network-usage-record-format.xml @@ -1,3 +1,27 @@ +<?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="network-usage-record-format"> <title>Network Usage Record Format</title> <para>For network usage (bytes sent/received), the following fields exist in a usage record.</para> @@ -13,5 +37,4 @@ <listitem><para>type â Device type (domain router, external load balancer, etc.)</para></listitem> <listitem><para>startdate, enddate â The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem> </itemizedlist> - </section> - +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/networking-in-a-pod.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/networking-in-a-pod.xml b/docs/en-US/networking-in-a-pod.xml index 3928715..1033b15 100644 --- a/docs/en-US/networking-in-a-pod.xml +++ b/docs/en-US/networking-in-a-pod.xml @@ -1,8 +1,27 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ +<!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="networking-in-a-pod"> <title>Networking in a Pod</title> <para>Figure 2 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.</para> @@ -19,5 +38,4 @@ <listitem><para>Hosts are also connected to one or more networks carrying guest traffic.</para></listitem> </itemizedlist> <para>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.</para> - - </section> +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/networking-in-a-zone.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/networking-in-a-zone.xml b/docs/en-US/networking-in-a-zone.xml index e5450bc..6f4e92a 100644 --- a/docs/en-US/networking-in-a-zone.xml +++ b/docs/en-US/networking-in-a-zone.xml @@ -1,8 +1,27 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ +<!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="networking-in-a-zone"> <title>Networking in a Zone</title> <para>Figure 3 illustrates the network setup within a single zone.</para> @@ -14,5 +33,4 @@ </mediaobject> <para>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.</para> <para>Each zone has its own set of public IP addresses. Public IP addresses from different zones do not overlap.</para> - - </section> +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/networking-overview.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/networking-overview.xml b/docs/en-US/networking-overview.xml index bff714f..6f244df 100644 --- a/docs/en-US/networking-overview.xml +++ b/docs/en-US/networking-overview.xml @@ -1,8 +1,27 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ +<!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="networking-overview"> <title>Networking Overview</title> <para> @@ -13,5 +32,4 @@ <listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem> </itemizedlist> <para>For more details, see Network Setup.</para> - </section> - +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/networking_overview.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/networking_overview.xml b/docs/en-US/networking_overview.xml index 1080ed7..f00094c 100644 --- a/docs/en-US/networking_overview.xml +++ b/docs/en-US/networking_overview.xml @@ -1,4 +1,28 @@ - <section id="networking_overview"> +<?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="networking_overview"> <title>Networking Overview</title> <para> CloudStack offers two types of networking scenario: @@ -8,5 +32,5 @@ <listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem> </itemizedlist> <para>For more details, see Network Setup.</para> - </section> +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/nfs-shares-on-management-server.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/nfs-shares-on-management-server.xml b/docs/en-US/nfs-shares-on-management-server.xml index dcddc47..f1c0f42 100644 --- a/docs/en-US/nfs-shares-on-management-server.xml +++ b/docs/en-US/nfs-shares-on-management-server.xml @@ -1,13 +1,11 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ +<!DOCTYPE chapter 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; ]> <section id="nfs-shares-on-management-server"> <title>Using the Management Server As the NFS Server</title> - <para>This section tells how to set up NFS shares for primary and secondary storage on the same node with the Management Server. - This is more typical of a trial installation, but is technically possible in a larger deployment. - It is assumed that you will have less than 16TB of storage on the host.</para> + <para>This section tells how to set up NFS shares for primary and secondary storage on the same node with the Management Server. This is more typical of a trial installation, but is technically possible in a larger deployment. It is assumed that you will have less than 16TB of storage on the host.</para> <para>The exact commands for the following steps may vary depending on your operating system version.</para> <orderedlist> <listitem><para>On the Management Server host, create two directories that you will use for primary and secondary storage. For example:</para> @@ -38,19 +36,19 @@ STATD_OUTGOING_PORT=2020 </listitem> <listitem><para>Edit the /etc/sysconfig/iptables file.</para> <programlisting># vi /etc/sysconfig/iptables</programlisting> - <para>Add the following lines at the beginning of the INPUT chain:</para> + <para>Add the following lines at the beginning of the INPUT chain where <NETWORK> is the network that you'll be using:</para> <programlisting> --A INPUT -m state --state NEW -p udp --dport 111 -j ACCEPT --A INPUT -m state --state NEW -p tcp --dport 111 -j ACCEPT --A INPUT -m state --state NEW -p tcp --dport 2049 -j ACCEPT --A INPUT -m state --state NEW -p tcp --dport 32803 -j ACCEPT --A INPUT -m state --state NEW -p udp --dport 32769 -j ACCEPT --A INPUT -m state --state NEW -p tcp --dport 892 -j ACCEPT --A INPUT -m state --state NEW -p udp --dport 892 -j ACCEPT --A INPUT -m state --state NEW -p tcp --dport 875 -j ACCEPT --A INPUT -m state --state NEW -p udp --dport 875 -j ACCEPT --A INPUT -m state --state NEW -p tcp --dport 662 -j ACCEPT --A INPUT -m state --state NEW -p udp --dport 662 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 111 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 111 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 2049 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 32803 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 32769 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 892 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 892 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 875 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 875 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 662 -j ACCEPT +-A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 662 -j ACCEPT </programlisting> </listitem> <listitem><para>Run the following commands:</para> @@ -92,4 +90,4 @@ STATD_OUTGOING_PORT=2020 </orderedlist> </listitem> </orderedlist> -</section> \ No newline at end of file +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5725bbf0/docs/en-US/nfs-shares-on-separate-server.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/nfs-shares-on-separate-server.xml b/docs/en-US/nfs-shares-on-separate-server.xml index 7d70d8c..e2a7b39 100644 --- a/docs/en-US/nfs-shares-on-separate-server.xml +++ b/docs/en-US/nfs-shares-on-separate-server.xml @@ -1,3 +1,27 @@ +<?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="nfs-shares-on-separate-server"> <title>Using a Separate NFS Server</title> <para>This section tells how to set up NFS shares for secondary and (optionally) primary storage on an NFS server running on a separate node from the Management Server.</para> @@ -25,4 +49,4 @@ <programlisting># mount -t nfs nfsservername:/nfs/share/secondary /mnt/secondary</programlisting> </listitem> </orderedlist> -</section> \ No newline at end of file +</section>
