cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [5/5] git commit: Closes 6#: Fixing merge issues
Date Tue, 25 Mar 2014 07:44:48 GMT
Closes 6#: Fixing merge issues

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/3c2bc1d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/3c2bc1d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/3c2bc1d6

Branch: refs/heads/master
Commit: 3c2bc1d63930bafa34b18b4ccc69d70776f8e60c
Parents: eebea92
Author: Pierre-Luc Dion <pdion@cloudops.com>
Authored: Mon Mar 24 22:01:09 2014 -0400
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Tue Mar 25 08:44:14 2014 +0100

----------------------------------------------------------------------
 source/accounts.rst        |   4 +-
 source/api.rst             |   4 +-
 source/events.rst          | 230 ----------------------------------------
 source/hosts.rst           |  10 +-
 source/index.rst           |   7 ++
 source/networking.rst      |  15 +--
 source/networking2.rst     |  26 +----
 source/storage.rst         |   4 +-
 source/troubleshooting.rst |   2 +-
 source/ui.rst              |   9 +-
 source/usage.rst           |   5 +-
 11 files changed, 27 insertions(+), 289 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/accounts.rst
----------------------------------------------------------------------
diff --git a/source/accounts.rst b/source/accounts.rst
index 88181de..5367743 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -142,8 +142,8 @@ How to Use Dedicated Hosts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To use an explicitly dedicated host, use the explicit-dedicated type of
-affinity group (see `“Affinity
-Groups” <virtual_machines.html#affinity-groups>`_). For example, when creating a
new VM, an
+affinity group (see `“Affinity Groups” <virtual_machines.html#affinity-groups>`_).

+For example, when creating a new VM, an
 end user can choose to place it on dedicated infrastructure. This
 operation will succeed only if some infrastructure has already been
 assigned as dedicated to the user's account or domain.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/api.rst
----------------------------------------------------------------------
diff --git a/source/api.rst b/source/api.rst
index 1ba27bb..e8875fc 100644
--- a/source/api.rst
+++ b/source/api.rst
@@ -28,8 +28,8 @@ some indication of their state.
 
 The API has a REST-like query basis and returns results in XML or JSON.
 
-See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Developers>`__
-and `the API Reference <http://cloudstack.apache.org/docs/api/>`__.
+See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_
+and `the API Reference <http://cloudstack.apache.org/docs/api/>`_.
 
 Provisioning and Authentication API
 -----------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/events.rst
----------------------------------------------------------------------
diff --git a/source/events.rst b/source/events.rst
index 5093e02..d18d66a 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -326,234 +326,4 @@ Procedure
 
 #. 
 
-<<<<<<< HEAD
    Click OK.
-=======
-   Click OK.
-
-
-TroubleShooting
-===============
-
-Working with Server Logs
-------------------------
-
-The CloudStack Management Server logs all web site, middle tier, and
-database activities for diagnostics purposes in
-`/var/log/cloudstack/management/`. The CloudStack logs a variety of error
-messages. We recommend this command to find the problematic output in
-the Management Server log:.
-
-.. note:: 
-      When copying and pasting a command, be sure the command has pasted as a
-      single line before executing. Some document viewers may introduce
-      unwanted line breaks in copied text.
-
-.. code:: bash
-
-            grep -i -E 'exception|unable|fail|invalid|leak|warn|error' /var/log/cloudstack/management/management-server.log
-
-The CloudStack processes requests with a Job ID. If you find an error in
-the logs and you are interested in debugging the issue you can grep for
-this job ID in the management server log. For example, suppose that you
-find the following ERROR message:
-
-.. code:: bash
-
-            2010-10-04 13:49:32,595 ERROR [cloud.vm.UserVmManagerImpl] (Job-Executor-11:job-1076)
Unable to find any host for [User|i-8-42-VM-untagged]
-
-Note that the job ID is 1076. You can track back the events relating to
-job 1076 with the following grep:
-
-.. code:: bash
-
-            grep "job-1076)" management-server.log
-
-The CloudStack Agent Server logs its activities in `/var/log/cloudstack/agent/`.
-
-
-Data Loss on Exported Primary Storage
--------------------------------------
-
-Symptom
-~~~~~~~
-
-Loss of existing data on primary storage which has been exposed as a
-Linux NFS server export on an iSCSI volume.
-
-Cause
-~~~~~
-
-It is possible that a client from outside the intended pool has mounted
-the storage. When this occurs, the LVM is wiped and all data in the
-volume is lost
-
-Solution
-~~~~~~~~
-
-When setting up LUN exports, restrict the range of IP addresses that are
-allowed access by specifying a subnet mask. For example:
-
-.. code:: bash
-
-    echo “/export 192.168.1.0/24(rw,async,no_root_squash,no_subtree_check)” > /etc/exports
-
-Adjust the above command to suit your deployment needs.
-
-More Information
-~~~~~~~~~~~~~~~~
-
-See the export procedure in the "Secondary Storage" section of the
-CloudStack Installation Guide
-
-Recovering a Lost Virtual Router
---------------------------------
-
-Symptom
-~~~~~~~
-
-A virtual router is running, but the host is disconnected. A virtual
-router no longer functions as expected.
-
-Cause
-~~~~~
-
-The Virtual router is lost or down.
-
-Solution
-~~~~~~~~
-
-If you are sure that a virtual router is down forever, or no longer
-functions as expected, destroy it. You must create one afresh while
-keeping the backup router up and running (it is assumed this is in a
-redundant router setup):
-
--  
-
-   Force stop the router. Use the stopRouter API with forced=true
-   parameter to do so.
-
--  
-
-   Before you continue with destroying this router, ensure that the
-   backup router is running. Otherwise the network connection will be
-   lost.
-
--  
-
-   Destroy the router by using the destroyRouter API.
-
-Recreate the missing router by using the restartNetwork API with
-cleanup=false parameter. For more information about redundant router
-setup, see Creating a New Network Offering.
-
-For more information about the API syntax, see the API Reference at
-`http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_.
-
-Maintenance mode not working on vCenter
----------------------------------------
-
-Symptom
-~~~~~~~
-
-Host was placed in maintenance mode, but still appears live in vCenter.
-
-Cause
-~~~~~~
-
-The CloudStack administrator UI was used to place the host in scheduled
-maintenance mode. This mode is separate from vCenter's maintenance mode.
-
-Solution
-~~~~~~~~
-
-Use vCenter to place the host in maintenance mode.
-
-
-Unable to deploy VMs from uploaded vSphere template
----------------------------------------------------
-
-Symptom
-~~~~~~~~
-
-When attempting to create a VM, the VM will not deploy.
-
-Cause
-~~~~~
-
-If the template was created by uploading an OVA file that was created
-using vSphere Client, it is possible the OVA contained an ISO image. If
-it does, the deployment of VMs from the template will fail.
-
-Solution
-~~~~~~~~
-
-Remove the ISO and re-upload the template.
-
-Unable to power on virtual machine on VMware
---------------------------------------------
-
-Symptom
-~~~~~~~
-
-Virtual machine does not power on. You might see errors like:
-
--  
-
-   Unable to open Swap File
-
--  
-
-   Unable to access a file since it is locked
-
--  
-
-   Unable to access Virtual machine configuration
-
-Cause
-~~~~~
-
-A known issue on VMware machines. ESX hosts lock certain critical
-virtual machine files and file systems to prevent concurrent changes.
-Sometimes the files are not unlocked when the virtual machine is powered
-off. When a virtual machine attempts to power on, it can not access
-these critical files, and the virtual machine is unable to power on.
-
-Solution
-~~~~~~~~
-
-See the following:
-
-`VMware Knowledge Base
-Article <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=10051/>`__
-
-Load balancer rules fail after changing network offering
---------------------------------------------------------
-
-Symptom
-~~~~~~~
-
-After changing the network offering on a network, load balancer rules
-stop working.
-
-Cause
-~~~~~
-
-Load balancing rules were created while using a network service offering
-that includes an external load balancer device such as NetScaler, and
-later the network service offering changed to one that uses the
-CloudStack virtual router.
-
-Solution
-~~~~~~~~
-
-Create a firewall rule on the virtual router for each of your existing
-load balancing rules so that they continue to function.
-<<<<<<< HEAD
-
-
-=======
-   Click OK.
->>>>>>> 8475ba5... fix merge to upstream
-=======
->>>>>>> caa1183... fixed sphinx warnings

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/hosts.rst
----------------------------------------------------------------------
diff --git a/source/hosts.rst b/source/hosts.rst
index 3af41ba..9fcf260 100644
--- a/source/hosts.rst
+++ b/source/hosts.rst
@@ -21,8 +21,8 @@ Adding Hosts
 ------------
 
 Additional hosts can be added at any time to provide more capacity for
-guest VMs. For requirements and instructions, see `“Adding
-a Host” <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/configuration.html#adding-a-host>`_.
+guest VMs. For requirements and instructions, see 
+`“Adding a Host” <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/configuration.html#adding-a-host>`_.
 
 Scheduled Maintenance and Maintenance Mode for Hosts
 ----------------------------------------------------
@@ -204,7 +204,7 @@ migrated to other Hosts. To remove a Host from the cloud:
    Place the node in maintenance mode.
 
    See `“Scheduled Maintenance and Maintenance Mode for
-   Hosts” <#scheduled-maintenance-and-maintenance-mode-for-hosts>`__.
+   Hosts” <#scheduled-maintenance-and-maintenance-mode-for-hosts>`_.
 
 #. 
 
@@ -249,9 +249,7 @@ any system that is not up to date with patches.
 .. note:: 
    The lack of up-do-date hotfixes can lead to data corruption and lost VMs.
 
-(XenServer) For more information, see `Highly Recommended Hotfixes for
-XenServer in the CloudStack Knowledge
-Base <http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2>`__.
+(XenServer) For more information, see `Highly Recommended Hotfixes for XenServer in the CloudStack
Knowledge Base <http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2>`_.
 
 Changing Host Password
 ----------------------

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/index.rst
----------------------------------------------------------------------
diff --git a/source/index.rst b/source/index.rst
index 3c89fb6..ddfa3bb 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -21,6 +21,13 @@
 Welcome to CloudStack Administration Documentation
 ==================================================
 
+User Interface
+--------------
+
+.. toctree::
+   :maxdepth: 2
+
+   ui
 
 Managing Accounts, Users and Domains
 ------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/networking.rst
----------------------------------------------------------------------
diff --git a/source/networking.rst b/source/networking.rst
index 351a5ed..df65cd2 100644
--- a/source/networking.rst
+++ b/source/networking.rst
@@ -77,8 +77,7 @@ account. Isolated networks have the following properties.
    The network offering can be upgraded or downgraded but it is for the
    entire network
 
-For more information, see `“Configure Guest Traffic in
-an Advanced Zone” <networking2.html#configure-guest-traffic-in-an-advanced-zone>`_.
+For more information, see `“Configure Guest Traffic in an Advanced Zone” <networking2.html#configure-guest-traffic-in-an-advanced-zone>`_.
 
 Shared Networks
 ~~~~~~~~~~~~~~~
@@ -113,15 +112,8 @@ Basic zones in CloudStack 3.0.3 and later versions.
 
    Source NAT per zone is not supported in Shared Network when the
    service provider is virtual router. However, Source NAT per account
-   is supported.
+   is supported. For information, see `“Configuring a Shared Guest Network” <networking2.html#configuring-a-shared-guest-network>`_.
 
-<<<<<<< HEAD
-For information, see `“Configuring a Shared Guest
-Network” <networking2.html#configuring-a-shared-guest-network>`_.
-=======
-For information, see `“Configuring a Shared Guest Network” <networking2.html#configuring-a-shared-guest-network>`_.
-
->>>>>>> 8475ba5... fix merge to upstream
 
 Runtime Allocation of Virtual Network Resources
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -371,10 +363,7 @@ To create a network offering:
       Security Groups     For more information, see `“Adding a Security               
                Not Supported Supported
                           Group” <networking2.html#adding-a-security-group>`_.
       =================== ============================================================================
============= =============
-<<<<<<< HEAD
 
-=======
->>>>>>> 8475ba5... fix merge to upstream
 
    -  
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/networking2.rst
----------------------------------------------------------------------
diff --git a/source/networking2.rst b/source/networking2.rst
index 9c50f0c..b020a19 100644
--- a/source/networking2.rst
+++ b/source/networking2.rst
@@ -1138,8 +1138,7 @@ offering. Later, the user can acquire an IP for the VM and enable static
 NAT.
 
 For more information on the Associate Public IP option, see
-`"Creating a New Network
-Offering" <networking.html#creating-a-new-network-offering>`_.
+`"Creating a New Network Offering" <networking.html#creating-a-new-network-offering>`_.
 
 .. note:: 
    The Associate Public IP feature is designed only for use with user VMs.
@@ -2202,10 +2201,6 @@ VMs.
    that they continue to function.
 
 .. _adding-lb-rule:
-<<<<<<< HEAD
-=======
-
->>>>>>> 8475ba5... fix merge to upstream
 
 Adding a Load Balancer Rule
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -2242,10 +2237,6 @@ Adding a Load Balancer Rule
    Addresses page when the rule is created.
 
    To do that, select the name of the network, then click Add Load
-<<<<<<< HEAD
-=======
-
->>>>>>> 8475ba5... fix merge to upstream
    Balancer tab. Continue with #7.
 
 #. 
@@ -4053,12 +4044,7 @@ Vista. The commands should be similar for other Windows versions.
 #.
 
    In Type of VPN, choose L2TP IPsec VPN, then click IPsec settings.
-<<<<<<< HEAD
-   Select Use preshared key. Enter the preshared key from step
-   #1.
-=======
    Select Use preshared key. Enter the preshared key from step #1.
->>>>>>> 8475ba5... fix merge to upstream
 
 #. 
 
@@ -6233,12 +6219,7 @@ follows:
       Private Cloud-enabled. A Virtual Private Cloud (VPC) is a private,
       isolated part of CloudStack. A VPC can have its own virtual
       network topology that resembles a traditional physical network.
-<<<<<<< HEAD
-      For more information on VPCs, see `"About Virtual
-      Private Clouds" <#about-virtual-private-clouds>`_.
-=======
       For more information on VPCs, see `"About Virtual Private Clouds" <#about-virtual-private-clouds>`_.
->>>>>>> 8475ba5... fix merge to upstream
 
    -  
 
@@ -6418,13 +6399,8 @@ CloudStack supports sharing workload across different tiers within
your
 VPC. Assume that multiple tiers are set up in your environment, such as
 Web tier and Application tier. Traffic to each tier is balanced on the
 VPC virtual router on the public side, as explained in
-<<<<<<< HEAD
-`"Adding Load Balancing Rules on a
-VPC" <#adding-load-balancing-rules-on-a-vpc>`_. If you want the traffic coming
-=======
 `"Adding Load Balancing Rules on a VPC" <#adding-load-balancing-rules-on-a-vpc>`_.

 If you want the traffic coming
->>>>>>> 8475ba5... fix merge to upstream
 from the Web tier to the Application tier to be balanced, use the
 internal load balancing feature offered by CloudStack.
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/storage.rst
----------------------------------------------------------------------
diff --git a/source/storage.rst b/source/storage.rst
index cef4f9a..e8193ae 100644
--- a/source/storage.rst
+++ b/source/storage.rst
@@ -35,7 +35,7 @@ This section gives concepts and technical details about CloudStack
 primary storage. For information about how to install and configure
 primary storage through the CloudStack UI, see the Installation Guide.
 
-`Section 2.6, “About Primary Storage” <#about-primary-storage>`__
+`“About Primary Storage” <http://docs.cloudstack.apache.org/en/latest/concepts.html#about-primary-storage>`_
 
 Best Practices for Primary Storage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -183,7 +183,7 @@ secondary storage. For information about how to install and configure
 secondary storage through the CloudStack UI, see the Advanced
 Installation Guide.
 
-`Section 2.7, “About Secondary Storage” <#about-secondary-storage>`__
+`“About Secondary Storage” <http://docs.cloudstack.apache.org/en/latest/concepts.html#about-secondary-storage>`_
 
 Working With Volumes
 --------------------

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/troubleshooting.rst
----------------------------------------------------------------------
diff --git a/source/troubleshooting.rst b/source/troubleshooting.rst
index db3ca0d..df5782c 100644
--- a/source/troubleshooting.rst
+++ b/source/troubleshooting.rst
@@ -206,7 +206,7 @@ Solution
 See the following:
 
 `VMware Knowledge Base
-Article <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=10051/>`__
+Article <http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=10051/>`_
 
 Load balancer rules fail after changing network offering
 --------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/ui.rst
----------------------------------------------------------------------
diff --git a/source/ui.rst b/source/ui.rst
index 14ed3d3..6a3af0e 100644
--- a/source/ui.rst
+++ b/source/ui.rst
@@ -130,13 +130,14 @@ provision, view, and manage your cloud infrastructure.
 
    You should set a new root administrator password. If you chose basic
    setup, you’ll be prompted to create a new password right away. If you
-   chose experienced user, use the steps in `“Changing
-   the Root Password” <#changing-the-root-password>`_.
+   chose experienced user, use the steps in :ref:`changing-root-password`.
 
 .. warning:: 
 
    You are logging in as the root administrator. This account manages the CloudStack deployment,
including physical infrastructure. The root administrator can modify configuration settings
to change basic functionality, create or delete user accounts, and take many actions that
should be performed only by an authorized person. Please change the default password to a
new, unique password.
 
+.. _changing-root-password:
+
 Changing the Root Password
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -212,9 +213,7 @@ Create an instance template that supports SSH Keys.
 
 #. 
 
-   Download the cloudstack script from `The SSH Key Gen
-   Script <http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`__\
to
-   the instance you have created.
+   Download the cloudstack script from `The SSH Key Gen Script <http://sourceforge.net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`_
to the instance you have created.
 
    .. sourcecode:: bash
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/3c2bc1d6/source/usage.rst
----------------------------------------------------------------------
diff --git a/source/usage.rst b/source/usage.rst
index 92aaa76..16d6e9c 100644
--- a/source/usage.rst
+++ b/source/usage.rst
@@ -92,15 +92,14 @@ for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:
     usage.execution.timezone = PST
     usage.aggregation.timezone = GMT
 
-Valid values for the time zone are specified in `Appendix A, *Time
-Zones* <#time-zones>`__
+Valid values for the time zone are specified in `Appendix A, *Time Zones* <http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones#time-zones>`_
 
 Default: GMT
 
 usage.execution.timezone
 
 The time zone of usage.stats.job.exec.time. Valid values for the time
-zone are specified in `Appendix A, *Time Zones* <#time-zones>`__
+zone are specified in `Appendix A, *Time Zones* <http://docs.cloudstack.apache.org/en/latest/dev.html?highlight=time%20zones#time-zones>`_
 
 Default: The time zone of the management server.
 


Mime
View raw message