Updated Branches: refs/heads/master 99fb423ee -> cf5c7bd88
fixing licenses for p doc files Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cf5c7bd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cf5c7bd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cf5c7bd8 Branch: refs/heads/master Commit: cf5c7bd88f0b9169e74e3c15b7f5d5324a1d1278 Parents: 99fb423 Author: Joe Brockmeier <[email protected]> Authored: Sat Aug 11 11:40:03 2012 -0700 Committer: John Kinsella <[email protected]> Committed: Sat Aug 11 11:40:03 2012 -0700 ---------------------------------------------------------------------- docs/en-US/per-domain-limits.xml | 27 ++++++++++-- docs/en-US/performance-monitoring.xml | 21 +++++++++- .../physical-network-configuration-settings.xml | 23 +++++++++- docs/en-US/pod-add.xml | 21 +++++++++- docs/en-US/port-forwarding.xml | 34 +++++++++++---- docs/en-US/prepare-nfs-shares.xml | 27 +++++++++-- docs/en-US/prepare-os.xml | 26 +++++++++++- docs/en-US/prepare-system-vm-template.xml | 23 +++++++++- docs/en-US/prepare_os.xml | 30 +++++++++++-- docs/en-US/primary-storage-add.xml | 23 +++++++++- .../en-US/primary-storage-outage-and-data-loss.xml | 21 +++++++++- docs/en-US/primary-storage.xml | 22 +++++++++- docs/en-US/private-public-template.xml | 22 +++++++++- docs/en-US/projects.xml | 30 ++++++++++--- docs/en-US/provisioning-auth-api.xml | 27 ++++++++++-- docs/en-US/provisioning-steps-overview.xml | 21 +++++++++- docs/en-US/provisioning-steps.xml | 23 +++++++++- docs/en-US/provisioning.xml | 2 +- 18 files changed, 373 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/per-domain-limits.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/per-domain-limits.xml b/docs/en-US/per-domain-limits.xml index af770a5..c20e84d 100644 --- a/docs/en-US/per-domain-limits.xml +++ b/docs/en-US/per-domain-limits.xml @@ -1,16 +1,35 @@ <?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="per-domain-limits"> <title>Per-Domain Limits</title> - <para>CloudPlatform 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 accounts in all subdomains of that domain. Limits set at the root domain level apply to the sum of resource usage by the accounts in all domains and sub-domains below that root domain.</para> + <para>&PRODUCT; 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 accounts in all subdomains of that domain. Limits set at the root domain level apply to the sum of resource usage by the accounts in all domains and sub-domains below that root domain.</para> <para>To set a domain limit:</para> <orderedlist> - <listitem><para>Log in to the CloudPlatform UI.</para></listitem> + <listitem><para>Log in to the &PRODUCT; UI.</para></listitem> <listitem><para>In the left navigation tree, click Domains.</para></listitem> - <listitem><para>3. 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.</para></listitem> + <listitem><para>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.</para></listitem> <listitem><para>Click the Edit button<inlinemediaobject> <imageobject> <imagedata fileref="./images/edit-icon.png" /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/performance-monitoring.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/performance-monitoring.xml b/docs/en-US/performance-monitoring.xml index d1c3fda..70efbf7 100644 --- a/docs/en-US/performance-monitoring.xml +++ b/docs/en-US/performance-monitoring.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="performance-monitoring"> <title>Performance Monitoring</title> <para>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.</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/physical-network-configuration-settings.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/physical-network-configuration-settings.xml b/docs/en-US/physical-network-configuration-settings.xml index e550984..a9eda9e 100644 --- a/docs/en-US/physical-network-configuration-settings.xml +++ b/docs/en-US/physical-network-configuration-settings.xml @@ -1,8 +1,27 @@ <?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; ]> + +<!-- 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="physical-network-configuration-settings"> <title>Configurable Characteristics of Physical Networks</title> <para>&PRODUCT; provides configuration settings you can use to set up a physical network in a zone, including:</para> @@ -10,7 +29,7 @@ <listitem><para>What type of network traffic it carries (guest, public, management, storage)</para></listitem> <listitem><para>VLANs</para></listitem> <listitem><para>Unique name that the hypervisor can use to find that particular network</para></listitem> - <listitem><para>Enabled or disabled. When a network is first set up, it is disabled â not in use yet. The administrator sets the physical network to enabled, and it begins to be used. The administrator can later disable the network again, which prevents any new virtual networks from being created on that physical network; the existing network traffic continues even though the state is disabled.</para></listitem> + <listitem><para>Enabled or disabled. When a network is first set up, it is disabled â not in use yet. The administrator sets the physical network to enabled, and it begins to be used. The administrator can later disable the network again, which prevents any new virtual networks from being created on that physical network; the existing network traffic continues even though the state is disabled.</para></listitem> <listitem><para>Speed</para></listitem> <listitem><para>Tags, so network offerings can be matched to physical networks</para></listitem> <listitem><para>Isolation method</para></listitem> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/pod-add.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/pod-add.xml b/docs/en-US/pod-add.xml index d6f018a..1c0a2ef 100644 --- a/docs/en-US/pod-add.xml +++ b/docs/en-US/pod-add.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 bookinfo 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="pod-add"> <title>Adding a Pod</title> <para>TODO</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/port-forwarding.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/port-forwarding.xml b/docs/en-US/port-forwarding.xml index 06beaf3..25b296d 100644 --- a/docs/en-US/port-forwarding.xml +++ b/docs/en-US/port-forwarding.xml @@ -1,11 +1,30 @@ <?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="port-forwarding"> <title>Port Forwarding</title> - <para>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.</para> + <para>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.</para> <para>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</para> <para>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.</para> <para>To set up port forwarding:</para> @@ -21,13 +40,10 @@ <listitem><para>In the Port Forwarding node of the diagram, click View All.</para></listitem> <listitem><para>Fill in the following:</para> <itemizedlist> - <listitem><para><emphasis role="bold">Public Port</emphasis>. The port to which public traffic will be - addressed on the IP address you acquired in the previous step.</para></listitem> - <listitem><para><emphasis role="bold">Private Port</emphasis>. The port on which the instance is listening for - forwarded public traffic.</para></listitem> - <listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use between the two - ports</para></listitem> + <listitem><para><emphasis role="bold">Public Port</emphasis>. The port to which public traffic will be addressed on the IP address you acquired in the previous step.</para></listitem> + <listitem><para><emphasis role="bold">Private Port</emphasis>. The port on which the instance is listening for forwarded public traffic.</para></listitem> + <listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use between the two ports.</para></listitem> </itemizedlist></listitem> - <listitem><para>Click Add</para></listitem> + <listitem><para>Click Add.</para></listitem> </orderedlist> </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/prepare-nfs-shares.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/prepare-nfs-shares.xml b/docs/en-US/prepare-nfs-shares.xml index b0b0e38..9c27d75 100644 --- a/docs/en-US/prepare-nfs-shares.xml +++ b/docs/en-US/prepare-nfs-shares.xml @@ -1,8 +1,27 @@ <?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; ]> + +<!-- 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="prepare-nfs-shares"> <title>Prepare NFS Shares</title> <para>&PRODUCT; needs a place to keep primary and secondary storage (see Cloud Infrastructure Overview). Both of these can be NFS shares. This section tells how to set up the NFS shares before adding the storage to &PRODUCT;.</para> @@ -13,9 +32,7 @@ <listitem><para>About Secondary Storage</para></listitem> </itemizedlist> <para>A production installation typically uses a separate NFS server. See <xref linkend="nfs-shares-on-separate-server"/>.</para> - <para>You can also use the Management Server node as the NFS server. This is more typical of a trial installation, but is technically possible in a larger deployment. - See <xref linkend="nfs-shares-on-management-server"/>. - </para> + <para>You can also use the Management Server node as the NFS server. This is more typical of a trial installation, but is technically possible in a larger deployment. See <xref linkend="nfs-shares-on-management-server"/>.</para> <xi:include href="nfs-shares-on-separate-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="nfs-shares-on-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -</section> \ No newline at end of file +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/prepare-os.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/prepare-os.xml b/docs/en-US/prepare-os.xml index 0e23315..03e6c55 100644 --- a/docs/en-US/prepare-os.xml +++ b/docs/en-US/prepare-os.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="prepare-os"> <title>Prepare the Operating System</title> <para> @@ -83,4 +107,4 @@ server 3.xenserver.pool.ntp.org </listitem> <listitem><para>Repeat all of these steps on every host where the Management Server will be installed.</para></listitem> </orderedlist> - </section> \ No newline at end of file + </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/prepare-system-vm-template.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/prepare-system-vm-template.xml b/docs/en-US/prepare-system-vm-template.xml index 060b892..3720074 100644 --- a/docs/en-US/prepare-system-vm-template.xml +++ b/docs/en-US/prepare-system-vm-template.xml @@ -1,8 +1,27 @@ <?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; ]> + +<!-- 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="prepare-system-vm-template"> <title>Prepare the System VM Template</title> <para>Secondary storage must be seeded with a template that is used for &PRODUCT; system VMs.</para> @@ -24,7 +43,7 @@ </listitem> </itemizedlist> </listitem> - <listitem><para>2. If you are using a separate NFS server, perform this step. If you are using the Management Server as the NFS server, you MUST NOT perform this step.</para> + <listitem><para>If you are using a separate NFS server, perform this step. If you are using the Management Server as the NFS server, you MUST NOT perform this step.</para> <para>When the script has finished, unmount secondary storage and remove the created directory.</para> <programlisting> # umount /mnt/secondary http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/prepare_os.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/prepare_os.xml b/docs/en-US/prepare_os.xml index 782a0b2..509da7a 100644 --- a/docs/en-US/prepare_os.xml +++ b/docs/en-US/prepare_os.xml @@ -1,8 +1,30 @@ +<?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="prepare_os"> <title>Prepare the Operating System</title> - <para> - The OS must be prepared to host the Management Server using the following steps. These steps must be performed on each Management Server node. - </para> + <para>The OS must be prepared to host the Management Server using the following steps. These steps must be performed on each Management Server node.</para> <orderedlist> <listitem><para>Log in to your OS as root.</para></listitem> <listitem><para>Check for a fully qualified hostname.</para> @@ -81,4 +103,4 @@ gpgcheck=0 </orderedlist> </listitem> </orderedlist> - </section> \ No newline at end of file + </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/primary-storage-add.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/primary-storage-add.xml b/docs/en-US/primary-storage-add.xml index f8b49a9..a4509e6 100644 --- a/docs/en-US/primary-storage-add.xml +++ b/docs/en-US/primary-storage-add.xml @@ -1,9 +1,28 @@ <?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="primary-storage-add"> <title>Adding Primary Storage</title> <para>TODO</para> -</section> \ No newline at end of file +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/primary-storage-outage-and-data-loss.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/primary-storage-outage-and-data-loss.xml b/docs/en-US/primary-storage-outage-and-data-loss.xml index 1e2e588..e68d1d9 100644 --- a/docs/en-US/primary-storage-outage-and-data-loss.xml +++ b/docs/en-US/primary-storage-outage-and-data-loss.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="primary-storage-outage-and-data-loss"> <title>Primary Storage Outage and Data Loss</title> <para>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.</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/primary-storage.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/primary-storage.xml b/docs/en-US/primary-storage.xml index 25afc21..59c95cc 100644 --- a/docs/en-US/primary-storage.xml +++ b/docs/en-US/primary-storage.xml @@ -1,10 +1,28 @@ <?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="primary-storage"> <title>Primary Storage</title> <para>This section gives concepts and technical details about CloudPlatform primary storage. For information about how to install and configure primary storage through the CloudPlatform UI, see the Advanced Installation Guide.</para> </section> - http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/private-public-template.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/private-public-template.xml b/docs/en-US/private-public-template.xml index 1acc91a..95abd65 100644 --- a/docs/en-US/private-public-template.xml +++ b/docs/en-US/private-public-template.xml @@ -1,12 +1,30 @@ <?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="private-public-template"> <title>Private and Public Templates</title> <para>When a user creates a template, it can be designated private or public.</para> <para>Private templates are only available to the user who created them. By default, an uploaded template is private.</para> <para>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.</para> - </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/projects.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/projects.xml b/docs/en-US/projects.xml index 37ca7b1..0390f52 100644 --- a/docs/en-US/projects.xml +++ b/docs/en-US/projects.xml @@ -1,13 +1,31 @@ <?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="projects"> <title>Projects</title> - <para>Projects are used to organize people and resources. CloudPlatform 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. CloudPlatform 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</para> - <para>You can configure CloudPlatform to allow any user to create a new project, or you can restrict that ability to just CloudPlatform administrators. Once you have created a project, you become that projectâs administrator, and you can add others within your domain to the project. CloudPlatform 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 CloudPlatform UI to show only project-related information, such as project VMs, fellow project members, project-related alerts, and so on.</para> - <para>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 CloudPlatform 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.</para> - <para>Resources created within a project are owned by the project, not by any particular CloudPlatform 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 offerin gs at the project level..</para> + <para>Projects are used to organize people and resources. &PRODUCT; 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. &PRODUCT; 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</para> + <para>You can configure &PRODUCT; to allow any user to create a new project, or you can restrict that ability to just &PRODUCT; administrators. Once you have created a project, you become that projectâs administrator, and you can add others within your domain to the project. &PRODUCT; 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 &PRODUCT; UI to show only project-related information, such as project VMs, fellow project members, project-related alerts, and so on.</para> + <para>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 &PRODUCT; 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.</para> + <para>Resources created within a project are owned by the project, not by any particular &PRODUCT; 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 a t the project level..</para> </section> - http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/provisioning-auth-api.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/provisioning-auth-api.xml b/docs/en-US/provisioning-auth-api.xml index d7c5184..0f28b1f 100644 --- a/docs/en-US/provisioning-auth-api.xml +++ b/docs/en-US/provisioning-auth-api.xml @@ -1,10 +1,29 @@ <?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="provisioning-auth-api"> <title>Provisioning and Authentication API</title> - <para>CloudPlatform 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 CloudPlatform to add/remove users..</para> - <para>CloudPlatform supports pluggable authenticators. By default, CloudPlatform 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 .</para> - </section> \ No newline at end of file + <para>&PRODUCT; 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 &PRODUCT; to add/remove users..</para> + <para>&PRODUCT; supports pluggable authenticators. By default, &PRODUCT; 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.</para> +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/provisioning-steps-overview.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/provisioning-steps-overview.xml b/docs/en-US/provisioning-steps-overview.xml index 3c1d465..d78a604 100644 --- a/docs/en-US/provisioning-steps-overview.xml +++ b/docs/en-US/provisioning-steps-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="provisioning-steps-overview"> <title>Overview of Provisioning Steps</title> <para>After the Management Server is installed and running, you can add the compute resources for it to manage. For an overview of how a &PRODUCT; cloud infrastructure is organized, see <xref linkend="cloud-infrastructure-overview" />.</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/provisioning-steps.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/provisioning-steps.xml b/docs/en-US/provisioning-steps.xml index 62ab9fa..074ad30 100644 --- a/docs/en-US/provisioning-steps.xml +++ b/docs/en-US/provisioning-steps.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="provisioning-steps"> <title>Steps to Provisioning Your Cloud Infrastructure</title> <para>This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.</para> @@ -15,4 +34,4 @@ <xi:include href="primary-storage-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="secondary-storage-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="initialize-and-test.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -</section> \ No newline at end of file +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5c7bd8/docs/en-US/provisioning.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/provisioning.xml b/docs/en-US/provisioning.xml index 957bc1e..dd6c79b 100644 --- a/docs/en-US/provisioning.xml +++ b/docs/en-US/provisioning.xml @@ -1,5 +1,5 @@ <?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; ]>
