You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/05/21 08:34:07 UTC

[08/10] git commit: split rnotes.rst in upgrade dir and remove it. Update Upgrade instruction to 4.4. Fix rst formating

split rnotes.rst in upgrade dir and remove it. Update Upgrade instruction to 4.4. Fix rst formating

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


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

Branch: refs/heads/master
Commit: bb313d3b0b676e2961d5d25e68dba5381a685235
Parents: e9be583
Author: Pierre-Luc Dion <pd...@cloudops.com>
Authored: Tue May 20 20:43:41 2014 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Wed May 21 08:33:10 2014 +0200

----------------------------------------------------------------------
 source/fixed_issues.rst             |  15 +
 source/index.rst                    |   1 +
 source/known_issues.rst             |  15 +
 source/rnotes.rst                   |  42 ---
 source/systemvm_templates.rst       |  84 -----
 source/upgrade/_sysvm_restart.rst   |  54 ++++
 source/upgrade/_sysvm_templates.rst | 120 ++++++++
 source/upgrade/_upgrade_header.rst  |  35 +++
 source/upgrade/upgrade-2.2.14.rst   | 411 ++++++++-----------------
 source/upgrade/upgrade-3.0.x.rst    | 412 +++++++++----------------
 source/upgrade/upgrade-4.0.rst      | 418 ++++++++++---------------
 source/upgrade/upgrade-4.1.rst      | 506 ++++++++++++-------------------
 source/upgrade/upgrade-4.2.rst      | 497 ++++++++++++------------------
 source/upgrade/upgrade-4.3.rst      | 246 +++++----------
 source/upgrade/valid_source.rst     |  17 +-
 15 files changed, 1149 insertions(+), 1724 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/fixed_issues.rst
----------------------------------------------------------------------
diff --git a/source/fixed_issues.rst b/source/fixed_issues.rst
index d4ee54c..e7c1768 100644
--- a/source/fixed_issues.rst
+++ b/source/fixed_issues.rst
@@ -1,3 +1,18 @@
+.. 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.
+   
 Issues Fixed in |release|
 -------------------------
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/index.rst
----------------------------------------------------------------------
diff --git a/source/index.rst b/source/index.rst
index b1cae07..29d2548 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -65,5 +65,6 @@ Contents:
    upgrade/upgrade-4.0
    upgrade/upgrade-3.0.x
    upgrade/upgrade-2.2.14
+   upgrade/valid_source
    
 .. include:: global.rst

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/known_issues.rst
----------------------------------------------------------------------
diff --git a/source/known_issues.rst b/source/known_issues.rst
index 447fb8b..72666e6 100644
--- a/source/known_issues.rst
+++ b/source/known_issues.rst
@@ -1,3 +1,18 @@
+.. 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.
+
 Known Issues in |release|
 -------------------------
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/rnotes.rst
----------------------------------------------------------------------
diff --git a/source/rnotes.rst b/source/rnotes.rst
deleted file mode 100644
index a466cf4..0000000
--- a/source/rnotes.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-.. 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.
-
-
-Upgrade Instructions for |version|
-==================================
-
-This section contains upgrade instructions from prior versions of
-CloudStack to Apache CloudStack |version|. We include instructions on
-upgrading to Apache CloudStack from pre-Apache versions of Citrix
-CloudStack (last version prior to Apache is 3.0.2) and from the releases
-made while CloudStack was in the Apache Incubator.
-
-If you run into any issues during upgrades, please feel free to ask
-questions on users@cloudstack.apache.org or dev@cloudstack.apache.org.
-
-.. warning::
-   :name: Depreciation of realhostip.com DNS and SSL certificate
-   
-   The realhostip.com dynamic DNS resolution service is being retired this
-   summer. In advance of that, CloudStack 4.3 and later no longer uses realhostip.com
-   DNS domains or SSL certificates to encrypt Console Proxy or file copy
-   communications.
-
-
-
-.. include:: upgrade/valid_source.rst
-
-
-.. include:: global.rst
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/systemvm_templates.rst
----------------------------------------------------------------------
diff --git a/source/systemvm_templates.rst b/source/systemvm_templates.rst
deleted file mode 100644
index 6c550f5..0000000
--- a/source/systemvm_templates.rst
+++ /dev/null
@@ -1,84 +0,0 @@
-+-------------------------+-----------------------------------------------------------------------------------------------+
-| Hypervisor              | Description                                                                                   |
-+=========================+===============================================================================================+
-| XenServer               | Name: systemvm-xenserver-|version|                                                            |
-|                         |                                                                                               |
-|                         | Description: systemvm-xenserver-|version|                                                     |
-|                         |                                                                                               |
-|                         | URL:                                                                                          |
-|                         | |sysvm-url-xen|                                                                               |
-|                         |                                                                                               |
-|                         | Zone: Choose the zone where this hypervisor is used                                           |
-|                         |                                                                                               |
-|                         | Hypervisor: XenServer                                                                         |
-|                         |                                                                                               |
-|                         | Format: VHD                                                                                   |
-|                         |                                                                                               |
-|                         | OS Type: Debian GNU/Linux 7.0 (64-bit) (or the                                                |
-|                         | highest Debian release number available in the                                                |
-|                         | dropdown)                                                                                     |
-|                         |                                                                                               |
-|                         | Extractable: no                                                                               |
-|                         |                                                                                               |
-|                         | Password Enabled: no                                                                          |
-|                         |                                                                                               |
-|                         | Public: no                                                                                    |
-|                         |                                                                                               |
-|                         | Featured: no                                                                                  |
-|                         |                                                                                               |
-|                         | Routing: yes                                                                                  |
-+-------------------------+-----------------------------------------------------------------------------------------------+
-| KVM                     | Name: systemvm-kvm-|version|                                                                  |
-|                         |                                                                                               |
-|                         | Description: systemvm-kvm-|version|                                                           |
-|                         |                                                                                               |
-|                         | URL:                                                                                          |  
-|                         | |sysvm-url-kvm|                                                                               |
-|                         |                                                                                               |
-|                         | Zone: Choose the zone where this hypervisor is used                                           |
-|                         |                                                                                               |
-|                         | Hypervisor: KVM                                                                               |
-|                         |                                                                                               |
-|                         | Format: QCOW2                                                                                 |
-|                         |                                                                                               |
-|                         | OS Type: Debian GNU/Linux 7.0 (64-bit) (or the                                                |
-|                         | highest Debian release number available in the                                                |
-|                         | dropdown)                                                                                     |
-|                         |                                                                                               |
-|                         | Extractable: no                                                                               |
-|                         |                                                                                               |
-|                         | Password Enabled: no                                                                          |
-|                         |                                                                                               |
-|                         | Public: no                                                                                    |
-|                         |                                                                                               |
-|                         | Featured: no                                                                                  |
-|                         |                                                                                               |
-|                         | Routing: yes                                                                                  |
-+-------------------------+-----------------------------------------------------------------------------------------------+
-| VMware                  | Name: systemvm-vmware-|version|                                                               |
-|                         |                                                                                               |
-|                         | Description: systemvm-vmware-|version|                                                        |
-|                         |                                                                                               |
-|                         | URL:                                                                                          |
-|                         | |sysvm-url-vmware|                                                                            |
-|                         |                                                                                               |
-|                         | Zone: Choose the zone where this hypervisor is used                                           |
-|                         |                                                                                               |
-|                         | Hypervisor: VMware                                                                            |
-|                         |                                                                                               |
-|                         | Format: OVA                                                                                   |
-|                         |                                                                                               |
-|                         | OS Type: Debian GNU/Linux 7.0 (64-bit) (or the                                                |
-|                         | highest Debian release number available in the                                                |
-|                         | dropdown)                                                                                     |
-|                         |                                                                                               |
-|                         | Extractable: no                                                                               |
-|                         |                                                                                               |
-|                         | Password Enabled: no                                                                          |
-|                         |                                                                                               |
-|                         | Public: no                                                                                    |
-|                         |                                                                                               |
-|                         | Featured: no                                                                                  |
-|                         |                                                                                               |
-|                         | Routing: yes                                                                                  |
-+-------------------------+-----------------------------------------------------------------------------------------------+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/upgrade/_sysvm_restart.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_restart.rst b/source/upgrade/_sysvm_restart.rst
new file mode 100644
index 0000000..2b390a1
--- /dev/null
+++ b/source/upgrade/_sysvm_restart.rst
@@ -0,0 +1,54 @@
+System-VMs and Virtual-Routers
+------------------------------
+
+Once you've upgraded the packages on your management servers, you'll
+need to restart the system VMs. Ensure that the admin port is set to
+8096 by using the "integration.api.port" global parameter. This port
+is used by the cloud-sysvmadm script at the end of the upgrade
+procedure. For information about how to set this parameter, see
+`Setting Global Configuration Parameters <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/configuration.html#setting-global-configuration-parameters>`_ in the Installation Guide.
+Changing this parameter will require management server restart. Also
+make sure port 8096 is open in your local host firewall to do this.
+
+There is a script that will do this for you, all you need to do is
+run the script and supply the IP address for your MySQL instance and
+your MySQL credentials:
+
+.. sourcecode:: bash
+
+    # nohup cloudstack-sysvmadm -d IP address -u cloud -p -a > sysvm.log 2>&1 &
+
+You can monitor the log for progress. The process of restarting the
+system VMs can take an hour or more.
+
+.. sourcecode:: bash
+
+    # tail -f sysvm.log
+
+The output to ``sysvm.log`` will look something like this:
+
+.. sourcecode:: bash
+
+    Stopping and starting 1 secondary storage vm(s)...
+    Done stopping and starting secondary storage vm(s)
+    Stopping and starting 1 console proxy vm(s)...
+    Done stopping and starting console proxy vm(s).
+    Stopping and starting 4 running routing vm(s)...
+    Done restarting router(s).
+
+.. 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.
+
+.. sub-section included in upgrade notes.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/upgrade/_sysvm_templates.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_templates.rst b/source/upgrade/_sysvm_templates.rst
new file mode 100644
index 0000000..1bd9740
--- /dev/null
+++ b/source/upgrade/_sysvm_templates.rst
@@ -0,0 +1,120 @@
+.. 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.
+
+.. sub-section included in upgrade notes.
+
+Update System-VM templates
+--------------------------
+
+#. While running the existing |version_to_upgrade| system, log in to the UI as root
+   administrator.
+
+#. In the left navigation bar, click Templates.
+
+#. In Select view, click Templates.
+
+#. Click Register template.
+
+   The Register template dialog box is displayed.
+
+#. In the Register template dialog box, specify the following values
+   (do not change these):
+
+   +-------------------------+-----------------------------------------------------------------------------------------------+
+   | Hypervisor              | Description                                                                                   |
+   +=========================+===============================================================================================+
+   | XenServer               | Name: systemvm-xenserver-|version|                                                            |
+   |                         |                                                                                               |
+   |                         | Description: systemvm-xenserver-|version|                                                     |
+   |                         |                                                                                               |
+   |                         | URL:                                                                                          |
+   |                         | |sysvm-url-xen|                                                                               |
+   |                         |                                                                                               |
+   |                         | Zone: Choose the zone where this hypervisor is used                                           |
+   |                         |                                                                                               |
+   |                         | Hypervisor: XenServer                                                                         |
+   |                         |                                                                                               |
+   |                         | Format: VHD                                                                                   |
+   |                         |                                                                                               |
+   |                         | OS Type: Debian GNU/Linux 7.0 (64-bit) (or the                                                |
+   |                         | highest Debian release number available in the                                                |
+   |                         | dropdown)                                                                                     |
+   |                         |                                                                                               |
+   |                         | Extractable: no                                                                               |
+   |                         |                                                                                               |
+   |                         | Password Enabled: no                                                                          |
+   |                         |                                                                                               |
+   |                         | Public: no                                                                                    |
+   |                         |                                                                                               |
+   |                         | Featured: no                                                                                  |
+   |                         |                                                                                               |
+   |                         | Routing: yes                                                                                  |
+   +-------------------------+-----------------------------------------------------------------------------------------------+
+   | KVM                     | Name: systemvm-kvm-|version|                                                                  |
+   |                         |                                                                                               |
+   |                         | Description: systemvm-kvm-|version|                                                           |
+   |                         |                                                                                               |
+   |                         | URL:                                                                                          |  
+   |                         | |sysvm-url-kvm|                                                                               |
+   |                         |                                                                                               |
+   |                         | Zone: Choose the zone where this hypervisor is used                                           |
+   |                         |                                                                                               |
+   |                         | Hypervisor: KVM                                                                               |
+   |                         |                                                                                               |
+   |                         | Format: QCOW2                                                                                 |
+   |                         |                                                                                               |
+   |                         | OS Type: Debian GNU/Linux 7.0 (64-bit) (or the                                                |
+   |                         | highest Debian release number available in the                                                |
+   |                         | dropdown)                                                                                     |
+   |                         |                                                                                               |
+   |                         | Extractable: no                                                                               |
+   |                         |                                                                                               |
+   |                         | Password Enabled: no                                                                          |
+   |                         |                                                                                               |
+   |                         | Public: no                                                                                    |
+   |                         |                                                                                               |
+   |                         | Featured: no                                                                                  |
+   |                         |                                                                                               |
+   |                         | Routing: yes                                                                                  |
+   +-------------------------+-----------------------------------------------------------------------------------------------+
+   | VMware                  | Name: systemvm-vmware-|version|                                                               |
+   |                         |                                                                                               |
+   |                         | Description: systemvm-vmware-|version|                                                        |
+   |                         |                                                                                               |
+   |                         | URL:                                                                                          |
+   |                         | |sysvm-url-vmware|                                                                            |
+   |                         |                                                                                               |
+   |                         | Zone: Choose the zone where this hypervisor is used                                           |
+   |                         |                                                                                               |
+   |                         | Hypervisor: VMware                                                                            |
+   |                         |                                                                                               |
+   |                         | Format: OVA                                                                                   |
+   |                         |                                                                                               |
+   |                         | OS Type: Debian GNU/Linux 7.0 (64-bit) (or the                                                |
+   |                         | highest Debian release number available in the                                                |
+   |                         | dropdown)                                                                                     |
+   |                         |                                                                                               |
+   |                         | Extractable: no                                                                               |
+   |                         |                                                                                               |
+   |                         | Password Enabled: no                                                                          |
+   |                         |                                                                                               |
+   |                         | Public: no                                                                                    |
+   |                         |                                                                                               |
+   |                         | Featured: no                                                                                  |
+   |                         |                                                                                               |
+   |                         | Routing: yes                                                                                  |
+   +-------------------------+-----------------------------------------------------------------------------------------------+
+
+#. Watch the screen to be sure that the template downloads successfully and enters the **READY** state. Do not proceed until this is successful.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/upgrade/_upgrade_header.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_upgrade_header.rst b/source/upgrade/_upgrade_header.rst
new file mode 100644
index 0000000..22b7261
--- /dev/null
+++ b/source/upgrade/_upgrade_header.rst
@@ -0,0 +1,35 @@
+.. 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.
+
+.. sub-section included in upgrade notes.
+
+If you run into any issues during upgrades, please feel free to ask
+questions on users@cloudstack.apache.org or dev@cloudstack.apache.org.
+
+.. warning:: 
+   Depreciation of realhostip.com DNS and SSL certificate
+   
+   The realhostip.com dynamic DNS resolution service is being retired this
+   summer. In advance of that, CloudStack 4.3 and later no longer uses realhostip.com
+   DNS domains or SSL certificates to encrypt Console Proxy or file copy
+   communications.
+
+Any steps that are hypervisor-specific will be called out with a note.
+
+We recommend reading through this section once or twice before beginning
+your upgrade procedure, and working through it on a test system before
+working on a production system.
+
+.. note:: The following upgrade instructions should be performed regardless of hypervisor type.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/bb313d3b/source/upgrade/upgrade-2.2.14.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-2.2.14.rst b/source/upgrade/upgrade-2.2.14.rst
index 4ab33e5..65a47c8 100644
--- a/source/upgrade/upgrade-2.2.14.rst
+++ b/source/upgrade/upgrade-2.2.14.rst
@@ -1,11 +1,31 @@
-Upgrade Instruction from 2.2.14
--------------------------------
+.. 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.
 
+.. |version_to_upgrade| replace:: 2.2.14
 
+Upgrade Instruction from |version_to_upgrade|
+=============================================
 
-#. 
+This section will guide you from pre-Apache versions of Citrix CloudStack |version_to_upgrade| version to Apache CloudStack |version|.
 
-   Ensure that you query your IPaddress usage records and process them;
+.. include:: _upgrade_header.rst
+
+.. important:: **Package Structure Changes:** The package structure for CloudStack has changed significantly since the |version_to_upgrade| releases. If you've compiled your own packages, you'll notice that the package names and the number of packages has changed. This is *not* a bug. However, this *does* mean that the procedure is not as simple as an ``apt-get upgrade`` or ``yum update``, so please follow this section carefully.
+
+
+#. Ensure that you query your IPaddress usage records and process them;
    for example, issue invoices for any usage that you have not yet
    billed users for.
 
@@ -16,82 +36,37 @@ Upgrade Instruction from 2.2.14
    any existing IP address usage records in the old format will no
    longer be available.
 
-#. 
-
-   If you are using version 2.2.0 - 2.2.13, first upgrade to 2.2.14 by
-   using the instructions in the `2.2.14 Release
-   Notes <http://download.cloud.com/releases/2.2.0/CloudStack2.2.14ReleaseNotes.pdf>`__.
+#. If you are using version 2.2.0 - 2.2.13, first upgrade to 2.2.14 by
+   using the instructions in the `2.2.14 Release Notes <http://download.cloud.com/releases/2.2.0/CloudStack2.2.14ReleaseNotes.pdf>`_.
 
    .. warning:: **KVM Hosts:** If KVM hypervisor is used in your cloud, be sure you completed the step to insert a valid username and password into the host\_details table on each KVM node as described in the 2.2.14 Release Notes. This step is critical, as the database will be encrypted after the upgrade to |version|.
 
-#. 
-
-   While running the 2.2.14 system, log in to the UI as root
-   administrator.
-
-#. 
-
-   Using the UI, add a new System VM template for each hypervisor type
-   that is used in your cloud. In each zone, add a system VM template
-   for each hypervisor used in that zone
-
-   #. 
-
-      In the left navigation bar, click Templates.
-
-   #. 
-
-      In Select view, click Templates.
-
-   #. 
-
-      Click Register template.
+.. include:: _sysvm_templates.rst
 
-      The Register template dialog box is displayed.
 
-   #. 
-
-      In the Register template dialog box, specify the following values
-      depending on the hypervisor type (do not change these):
-
-      .. include:: /systemvm_templates.rst
-
-
-#. 
-
-   Watch the screen to be sure that the template downloads successfully
-   and enters the READY state. Do not proceed until this is successful
-
-#. 
-
-   **WARNING**: If you use more than one type of hypervisor in your
+#. **WARNING**: If you use more than one type of hypervisor in your
    cloud, be sure you have repeated these steps to download the system
    VM template for each hypervisor type. Otherwise, the upgrade will
    fail.
 
-#. 
+Upgrade Steps
+-------------------
 
-   (KVM on RHEL 6.0/6.1 only) If your existing CloudStack deployment
+#. (KVM on RHEL 6.0/6.1 only) If your existing CloudStack deployment
    includes one or more clusters of KVM hosts running RHEL 6.0 or RHEL
    6.1, perform the following:
 
-   #. 
-
-      Ensure that you upgrade the operating system version on those
+   #. Ensure that you upgrade the operating system version on those
       hosts before upgrading CloudStack
 
       To do that, change the yum repository for each system with
       CloudStack packages, that implies that all the Management Servers
       and any hosts that have the KVM agent.
 
-   #. 
-
-      Open ``/etc/yum.repos.d/cloudstack.repo`` on any systems that have
+   #. Open ``/etc/yum.repos.d/cloudstack.repo`` on any systems that have
       CloudStack packages installed.
 
-   #. 
-
-      Edit as follows:
+   #. Edit as follows:
 
       .. sourcecode:: bash
 
@@ -102,45 +77,37 @@ Upgrade Instruction from 2.2.14
                       gpgcheck=0
                       [apache CloudStack]
                       name= Apache CloudStack
-                      baseurl= http://cloudstack.apt-get.eu/rhel/4.3/
+                      baseurl= http://cloudstack.apt-get.eu/rhel/4.4/
                       enabled=1
                       gpgcheck=0
 
       If you are using the community provided package repository, change
-      the baseurl to http:// cloudstack.apt-get.eu/rhel/4.3/
+      the baseurl to ``http://cloudstack.apt-get.eu/rhel/4.4/``
 
       If you are using your own package repository, change this line to
-      read as appropriate for your 4.3 repository.
-
-   #. 
+      read as appropriate for your |version| repository.
 
-      Now that you have the repository configured, upgrade the host
+   #. Now that you have the repository configured, upgrade the host
       operating system from RHEL 6.0 to 6.3:
 
       .. sourcecode:: bash
 
           # yum upgrade
 
-#. 
-
-   Stop all Usage Servers if running. Run this on all Usage Server
+#. Stop all Usage Servers if running. Run this on all Usage Server
    hosts.
 
    .. sourcecode:: bash
 
        # service cloud-usage stop
 
-#. 
-
-   Stop the Management Servers. Run this on all Management Server hosts.
+#. Stop the Management Servers. Run this on all Management Server hosts.
 
    .. sourcecode:: bash
 
        # service cloud-management stop
 
-#. 
-
-   On the MySQL master, take a backup of the MySQL databases. We
+#. On the MySQL master, take a backup of the MySQL databases. We
    recommend performing this step even in test upgrades. If there is an
    issue, this will assist with debugging.
 
@@ -151,24 +118,18 @@ Upgrade Instruction from 2.2.14
    .. sourcecode:: bash
 
        # mysqldump -u root -pmysql_password cloud > cloud-backup.dmp
-                               # mysqldump -u root -pmysql_password cloud_usage > cloud-usage-backup.dmp
+       # mysqldump -u root -pmysql_password cloud_usage > cloud-usage-backup.dmp
 
-#. 
-
-   Either build RPM/DEB packages as detailed in the Installation Guide,
+#. Either build RPM/DEB packages as detailed in the Installation Guide,
    or use one of the community provided yum/apt repositories to gain
    access to the CloudStack binaries.
 
-#. 
-
-   If you are using Ubuntu, follow this procedure to upgrade your
+#. If you are using Ubuntu, follow this procedure to upgrade your
    packages. If not, skip to step `13 <#upgrade-rpm-packages-22>`__.
 
    .. note:: **Community Packages:** This section assumes you're using the community supplied packages for CloudStack. If you've created your own packages and APT repository, substitute your own URL for the ones used in these examples.
 
-   #. 
-
-      The first order of business will be to change the sources list for
+   #. The first order of business will be to change the sources list for
       each system with CloudStack packages. This means all management
       servers, and any hosts that have the KVM agent. (No changes should
       be necessary for hosts that are running VMware or Xen.)
@@ -186,22 +147,18 @@ Upgrade Instruction from 2.2.14
 
       .. sourcecode:: bash
 
-          deb http://cloudstack.apt-get.eu/ubuntu precise 4.3
+          deb http://cloudstack.apt-get.eu/ubuntu precise 4.4
 
       If you're using your own package repository, change this line to
-      read as appropriate for your 4.3 repository.
-
-   #. 
+      read as appropriate for your |version| repository.
 
-      Now update your apt package list:
+   #. Now update your apt package list:
 
       .. sourcecode:: bash
 
           $ sudo apt-get update
 
-   #. 
-
-      Now that you have the repository configured, it's time to install
+   #. Now that you have the repository configured, it's time to install
       the ``cloudstack-management`` package. This will pull in any other
       dependencies you need.
 
@@ -209,9 +166,7 @@ Upgrade Instruction from 2.2.14
 
           $ sudo apt-get install cloudstack-management
 
-   #. 
-
-      On KVM hosts, you will need to manually install the
+   #. On KVM hosts, you will need to manually install the
       ``cloudstack-agent`` package:
 
       .. sourcecode:: bash
@@ -226,9 +181,7 @@ Upgrade Instruction from 2.2.14
       When prompted whether you wish to keep your configuration, say
       Yes.
 
-   #. 
-
-      Verify that the file
+   #. Verify that the file
       ``/etc/cloudstack/agent/environment.properties`` has a line that
       reads:
 
@@ -238,9 +191,7 @@ Upgrade Instruction from 2.2.14
 
       If not, add the line.
 
-   #. 
-
-      Restart the agent:
+   #. Restart the agent:
 
       .. sourcecode:: bash
 
@@ -248,9 +199,7 @@ Upgrade Instruction from 2.2.14
           killall jsvc
           service cloudstack-agent start
 
-   #. 
-
-      During the upgrade, ``log4j-cloud.xml`` was simply copied over, so
+   #. During the upgrade, ``log4j-cloud.xml`` was simply copied over, so
       the logs will continue to be added to
       ``/var/log/cloud/agent/agent.log``. There's nothing *wrong* with
       this, but if you prefer to be consistent, you can change this by
@@ -262,26 +211,20 @@ Upgrade Instruction from 2.2.14
           mv log4j-cloud.xml.dpkg-dist log4j-cloud.xml
           service cloudstack-agent restart
 
-   #. 
-
-      Once the agent is running, you can uninstall the old cloud-\*
+   #. Once the agent is running, you can uninstall the old cloud-\*
       packages from your system:
 
       .. sourcecode:: bash
 
           sudo dpkg --purge cloud-agent
 
-#. 
-
-   If you are using CentOS or RHEL, follow this procedure to upgrade
+#. If you are using CentOS or RHEL, follow this procedure to upgrade
    your packages. If not, skip to step
    `14 <#correct-components-xml-22>`__.
 
    .. note:: **Community Packages:** This section assumes you're using the community supplied packages for CloudStack. If you've created your own packages and yum repository, substitute your own URL for the ones used in these examples.
 
-   #. 
-
-      The first order of business will be to change the yum repository
+   #. The first order of business will be to change the yum repository
       for each system with CloudStack packages. This means all
       management servers, and any hosts that have the KVM agent. (No
       changes should be necessary for hosts that are running VMware or
@@ -301,14 +244,12 @@ Upgrade Instruction from 2.2.14
           gpgcheck=0
 
       If you are using the community provided package repository, change
-      the baseurl to http://cloudstack.apt-get.eu/rhel/4.3/
+      the baseurl to ``http://cloudstack.apt-get.eu/rhel/4.4/``
 
       If you're using your own package repository, change this line to
       read as appropriate for your |version| repository.
 
-   #. 
-
-      Now that you have the repository configured, it's time to install
+   #. Now that you have the repository configured, it's time to install
       the ``cloudstack-management`` package by upgrading the older
       ``cloud-client`` package.
 
@@ -316,9 +257,7 @@ Upgrade Instruction from 2.2.14
 
           $ sudo yum upgrade cloud-client
 
-   #. 
-
-      For KVM hosts, you will need to upgrade the ``cloud-agent``
+   #. For KVM hosts, you will need to upgrade the ``cloud-agent``
       package, similarly installing the new version as
       ``cloudstack-agent``.
 
@@ -331,11 +270,7 @@ Upgrade Instruction from 2.2.14
       ``environment.properties`` from ``/etc/cloud/agent`` to
       ``/etc/cloudstack/agent``.
 
-   #. 
-
-      Verify that the file
-      ``/etc/cloudstack/agent/environment.properties`` has a line that
-      reads:
+   #. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a line that reads:
 
       .. sourcecode:: bash
 
@@ -343,9 +278,7 @@ Upgrade Instruction from 2.2.14
 
       If not, add the line.
 
-   #. 
-
-      Restart the agent:
+   #. Restart the agent:
 
       .. sourcecode:: bash
 
@@ -353,9 +286,7 @@ Upgrade Instruction from 2.2.14
           killall jsvc
           service cloudstack-agent start
 
-#. 
-
-   If you have made changes to your existing copy of the file
+#. If you have made changes to your existing copy of the file
    components.xml in your previous-version CloudStack installation, the
    changes will be preserved in the upgrade. However, you need to do the
    following steps to place these changes in a new version of the file
@@ -368,36 +299,28 @@ Upgrade Instruction from 2.2.14
        warning: /etc/cloud/management/components.xml created as 
        /etc/cloud/management/components.xml.rpmnew
 
-   #. 
-
-      Make a backup copy of your
+   #. Make a backup copy of your
       ``/etc/cloud/management/components.xml`` file. For example:
 
       .. sourcecode:: bash
 
           # mv /etc/cloud/management/components.xml /etc/cloud/management/components.xml-backup
 
-   #. 
-
-      Copy ``/etc/cloud/management/components.xml.rpmnew`` to create a
+   #. Copy ``/etc/cloud/management/components.xml.rpmnew`` to create a
       new ``/etc/cloud/management/components.xml``:
 
       .. sourcecode:: bash
 
           # cp -ap /etc/cloud/management/components.xml.rpmnew /etc/cloud/management/components.xml
 
-   #. 
-
-      Merge your changes from the backup file into the new
+   #. Merge your changes from the backup file into the new
       components.xml file.
 
       .. sourcecode:: bash
 
           # vi /etc/cloudstack/management/components.xml
 
-#. 
-
-   After upgrading to |version|, API clients are expected to send plain text
+#. After upgrading to |version|, API clients are expected to send plain text
    passwords for login and user creation, instead of MD5 hash. If API
    client changes are not acceptable, following changes are to be made
    for backward compatibility:
@@ -423,45 +346,35 @@ Upgrade Instruction from 2.2.14
    PlainTextUserAuthenticator works the same way MD5UserAuthenticator
    worked prior to 4.2.
 
-#. 
-
-   If you have made changes to your existing copy of the
+#. If you have made changes to your existing copy of the
    ``/etc/cloud/management/db.properties`` file in your previous-version
    CloudStack installation, the changes will be preserved in the
    upgrade. However, you need to do the following steps to place these
    changes in a new version of the file which is compatible with this
    version.
 
-   #. 
-
-      Make a backup copy of your file
+   #. Make a backup copy of your file
       ``/etc/cloud/management/db.properties``. For example:
 
       .. sourcecode:: bash
 
           # mv /etc/cloud/management/db.properties /etc/cloud/management/db.properties-backup
 
-   #. 
-
-      Copy ``/etc/cloud/management/db.properties.rpmnew`` to create a
+   #. Copy ``/etc/cloud/management/db.properties.rpmnew`` to create a
       new ``/etc/cloud/management/db.properties``:
 
       .. sourcecode:: bash
 
           # cp -ap /etc/cloud/management/db.properties.rpmnew etc/cloud/management/db.properties
 
-   #. 
-
-      Merge your changes from the backup file into the new db.properties
+   #. Merge your changes from the backup file into the new db.properties
       file.
 
       .. sourcecode:: bash
 
           # vi /etc/cloudstack/management/db.properties
 
-#. 
-
-   On the management server node, run the following command. It is
+#. On the management server node, run the following command. It is
    recommended that you use the command-line flags to provide your own
    encryption keys. See Password and Key Encryption in the Installation
    Guide.
@@ -473,35 +386,25 @@ Upgrade Instruction from 2.2.14
    When used without arguments, as in the following example, the default
    encryption type and keys will be used:
 
-   -  
-
-      (Optional) For encryption\_type, use file or web to indicate the
+   -  (Optional) For encryption\_type, use file or web to indicate the
       technique used to pass in the database encryption password.
       Default: file.
 
-   -  
-
-      (Optional) For management\_server\_key, substitute the default key
+   -  (Optional) For management\_server\_key, substitute the default key
       that is used to encrypt confidential parameters in the properties
       file. Default: password. It is highly recommended that you replace
       this with a more secure value
 
-   -  
-
-      (Optional) For database\_key, substitute the default key that is
+   -  (Optional) For database\_key, substitute the default key that is
       used to encrypt confidential parameters in the CloudStack
       database. Default: password. It is highly recommended that you
       replace this with a more secure value.
 
-#. 
-
-   Repeat steps 10 - 14 on every management server node. If you provided
+#. Repeat steps 10 - 14 on every management server node. If you provided
    your own encryption key in step 14, use the same key on all other
    management servers.
 
-#. 
-
-   Start the first Management Server. Do not start any other Management
+#. Start the first Management Server. Do not start any other Management
    Server nodes yet.
 
    .. sourcecode:: bash
@@ -513,39 +416,29 @@ Upgrade Instruction from 2.2.14
    After confirmation, start the other Management Servers one at a time
    by running the same command on each node.
 
-#. 
-
-   Start all Usage Servers (if they were running on your previous
+#. Start all Usage Servers (if they were running on your previous
    version). Perform this on each Usage Server host.
 
    .. sourcecode:: bash
 
        # service cloudstack-usage start
 
-#. 
-
-   (KVM only) Perform the following additional steps on each KVM host.
+#. (KVM only) Perform the following additional steps on each KVM host.
 
    These steps will not affect running guests in the cloud. These steps
    are required only for clouds using KVM as hosts and only on the KVM
    hosts.
 
-   #. 
-
-      Configure your CloudStack package repositories as outlined in the
+   #. Configure your CloudStack package repositories as outlined in the
       Installation Guide
 
-   #. 
-
-      Stop the running agent.
+   #. Stop the running agent.
 
       .. sourcecode:: bash
 
           # service cloud-agent stop
 
-   #. 
-
-      Update the agent software with one of the following command sets
+   #. Update the agent software with one of the following command sets
       as appropriate.
 
       .. sourcecode:: bash
@@ -557,27 +450,21 @@ Upgrade Instruction from 2.2.14
            # apt-get update
            # apt-get upgrade cloud-*
 
-   #. 
-
-      Copy the contents of the ``agent.properties`` file to the new
+   #. Copy the contents of the ``agent.properties`` file to the new
       ``agent.properties`` file by using the following command
 
       .. sourcecode:: bash
 
           sed -i 's/com.cloud.agent.resource.computing.LibvirtComputingResource/com.cloud.hypervisor.kvm.resource.LibvirtComputingResource/g' /etc/cloudstack/agent/agent.properties
 
-   #. 
-
-      Upgrade all the existing bridge names to new bridge names by
+   #. Upgrade all the existing bridge names to new bridge names by
       running this script:
 
       .. sourcecode:: bash
 
            # cloudstack-agent-upgrade
 
-   #. 
-
-      Install a libvirt hook with the following commands:
+   #. Install a libvirt hook with the following commands:
 
       .. sourcecode:: bash
 
@@ -585,31 +472,23 @@ Upgrade Instruction from 2.2.14
            # cp /usr/share/cloudstack-agent/lib/libvirtqemuhook /etc/libvirt/hooks/qemu
            # chmod +x /etc/libvirt/hooks/qemu
 
-   #. 
-
-      Restart libvirtd.
+   #. Restart libvirtd.
 
       .. sourcecode:: bash
 
           # service libvirtd restart
 
-   #. 
-
-      Start the agent.
+   #. Start the agent.
 
       .. sourcecode:: bash
 
           # service cloudstack-agent start
 
-   #. 
-
-      When the Management Server is up and running, log in to the
+   #. When the Management Server is up and running, log in to the
       CloudStack UI and restart the virtual router for proper
       functioning of all the features.
 
-#. 
-
-   Log in to the CloudStack UI as admin, and check the status of the
+#. Log in to the CloudStack UI as admin, and check the status of the
    hosts. All hosts should come to Up state (except those that you know
    to be offline). You may need to wait 20 or 30 minutes, depending on
    the number of hosts.
@@ -617,14 +496,10 @@ Upgrade Instruction from 2.2.14
    Do not proceed to the next step until the hosts show in the Up state.
    If the hosts do not come to the Up state, contact support.
 
-#. 
-
-   Run the following script to stop, then start, all Secondary Storage
+#. Run the following script to stop, then start, all Secondary Storage
    VMs, Console Proxy VMs, and virtual routers.
 
-   #. 
-
-      Run the command once on one management server. Substitute your own
+   #. Run the command once on one management server. Substitute your own
       IP address of the MySQL instance, the MySQL user to connect as,
       and the password to use for that user. In addition to those
       parameters, provide the "-c" and "-r" arguments. For example:
@@ -637,9 +512,7 @@ Upgrade Instruction from 2.2.14
       This might take up to an hour or more to run, depending on the
       number of accounts in the system.
 
-   #. 
-
-      After the script terminates, check the log to verify correct
+   #. After the script terminates, check the log to verify correct
       execution:
 
       .. sourcecode:: bash
@@ -650,16 +523,14 @@ Upgrade Instruction from 2.2.14
 
       .. sourcecode:: bash
 
-                                          Stopping and starting 1 secondary storage vm(s)...
-                                          Done stopping and starting secondary storage vm(s)
-                                          Stopping and starting 1 console proxy vm(s)...
-                                          Done stopping and starting console proxy vm(s).
-                                          Stopping and starting 4 running routing vm(s)...
-                                          Done restarting router(s).
-
-#. 
+         Stopping and starting 1 secondary storage vm(s)...
+         Done stopping and starting secondary storage vm(s)
+         Stopping and starting 1 console proxy vm(s)...
+         Done stopping and starting console proxy vm(s).
+         Stopping and starting 4 running routing vm(s)...
+         Done restarting router(s).
 
-   If you would like additional confirmation that the new system VM
+#. If you would like additional confirmation that the new system VM
    templates were correctly applied when these system VMs were rebooted,
    SSH into the System VM and check the version.
 
@@ -677,14 +548,14 @@ Upgrade Instruction from 2.2.14
 
    .. sourcecode:: bash
 
-       # ssh -i private-key-path link-local-ip -p 3922
-                               # cat /etc/cloudstack-release
+      # ssh -i private-key-path link-local-ip -p 3922
+      # cat /etc/cloudstack-release
 
    The output should be like the following:
 
    .. sourcecode:: bash
 
-       Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012
+      Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012
 
    **ESXi:**
 
@@ -696,8 +567,8 @@ Upgrade Instruction from 2.2.14
 
    .. sourcecode:: bash
 
-       # ssh -i private-key-path private-ip -p 3922
-                               # cat /etc/cloudstack-release
+      # ssh -i private-key-path private-ip -p 3922
+      # cat /etc/cloudstack-release
 
    The output should be like the following:
 
@@ -705,22 +576,16 @@ Upgrade Instruction from 2.2.14
 
        Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012
 
-#. 
-
-   If needed, upgrade all Citrix XenServer hypervisor hosts in your
+#. If needed, upgrade all Citrix XenServer hypervisor hosts in your
    cloud to a version supported by CloudStack 4.0.0-incubating. The
    supported versions are XenServer 5.6 SP2 and 6.0.2. Instructions for
    upgrade can be found in the CloudStack 4.0.0-incubating Installation
    Guide.
 
-#. 
-
-   Apply the XenServer hotfix XS602E003 (and any other needed hotfixes)
+#. Apply the XenServer hotfix XS602E003 (and any other needed hotfixes)
    to XenServer v6.0.2 hypervisor hosts.
 
-   #. 
-
-      Disconnect the XenServer cluster from CloudStack.
+   #. Disconnect the XenServer cluster from CloudStack.
 
       In the left navigation bar of the CloudStack UI, select
       Infrastructure. Under Clusters, click View All. Select the
@@ -735,17 +600,13 @@ Upgrade Instruction from 2.2.14
       the unmanaged state, there is no connection to the hosts in the
       cluster.
 
-   #. 
-
-      To clean up the VLAN, log in to one XenServer host and run:
+   #. To clean up the VLAN, log in to one XenServer host and run:
 
       .. sourcecode:: bash
 
           /opt/xensource/bin/cloud-clean-vlan.sh
 
-   #. 
-
-      Prepare the upgrade by running the following on one XenServer
+   #. Prepare the upgrade by running the following on one XenServer
       host:
 
       .. sourcecode:: bash
@@ -755,9 +616,7 @@ Upgrade Instruction from 2.2.14
       If you see a message like "can't eject CD", log in to the VM and
       umount the CD, then run this script again.
 
-   #. 
-
-      Upload the hotfix to the XenServer hosts. Always start with the
+   #. Upload the hotfix to the XenServer hosts. Always start with the
       Xen pool master, then the slaves. Using your favorite file copy
       utility (e.g. WinSCP), copy the hotfixes to the host. Place them
       in a temporary folder such as /root or /tmp.
@@ -773,9 +632,7 @@ Upgrade Instruction from 2.2.14
 
       .. note:: (Optional) If you are applying other hotfixes as well, you can repeat the commands in this section with the appropriate hotfix number. For example, XS602E004.xsupdate.
 
-   #. 
-
-      Manually live migrate all VMs on this host to another host. First,
+   #. Manually live migrate all VMs on this host to another host. First,
       get a list of the VMs on this host:
 
       .. sourcecode:: bash
@@ -791,9 +648,7 @@ Upgrade Instruction from 2.2.14
 
       .. note:: **Troubleshooting:** If you see a message like "You attempted an operation on a VM which requires PV drivers to be installed but the drivers were not detected," run: ``/opt/xensource/bin/make_migratable.sh b6cf79c8-02ee-050b-922f-49583d9f1a14``.
 
-   #. 
-
-      Apply the hotfix. First, get the UUID of this host:
+   #. Apply the hotfix. First, get the UUID of this host:
 
       ``# xe host-list``
 
@@ -805,9 +660,7 @@ Upgrade Instruction from 2.2.14
 
       ``xe patch-apply host-uuid=host-uuid`` uuid=\ *``hotfix-uuid``*
 
-   #. 
-
-      Copy the following files from the CloudStack Management Server to
+   #. Copy the following files from the CloudStack Management Server to
       the host.
 
        +-------------------------+-------------------------------------------------+
@@ -829,64 +682,46 @@ Upgrade Instruction from 2.2.14
        | igratable.sh``          |                                                 |
        +-------------------------+-------------------------------------------------+
 
-   #. 
-
-      (Only for hotfixes XS602E005 and XS602E007) You need to apply a
+   #. (Only for hotfixes XS602E005 and XS602E007) You need to apply a
       new Cloud Support Pack.
 
-      -  
-
-         Download the CSP software onto the XenServer host from one of
+      -  Download the CSP software onto the XenServer host from one of
          the following links:
 
          For hotfix XS602E005:
-         `http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E005/56710/xe-phase-2/xenserver-cloud-supp.tgz <http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E005/56710/xe-phase-2/xenserver-cloud-supp.tgz>`__
+         `http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E005/56710/xe-phase-2/xenserver-cloud-supp.tgz <http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E005/56710/xe-phase-2/xenserver-cloud-supp.tgz>`_
 
          For hotfix XS602E007:
-         `http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E007/57824/xe-phase-2/xenserver-cloud-supp.tgz <http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E007/57824/xe-phase-2/xenserver-cloud-supp.tgz>`__
-
-      -  
+         `http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E007/57824/xe-phase-2/xenserver-cloud-supp.tgz <http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E007/57824/xe-phase-2/xenserver-cloud-supp.tgz>`_
 
-         Extract the file:
+      -  Extract the file:
 
          ``# tar xf xenserver-cloud-supp.tgz``
 
-      -  
-
-         Run the following script:
+      -  Run the following script:
 
          ``# xe-install-supplemental-pack xenserver-cloud-supp.iso``
 
-      -  
-
-         If the XenServer host is part of a zone that uses basic
+      -  If the XenServer host is part of a zone that uses basic
          networking, disable Open vSwitch (OVS):
 
          ``# xe-switch-network-backend bridge``
 
-   #. 
-
-      Reboot this XenServer host.
+   #. Reboot this XenServer host.
 
-   #. 
-
-      Run the following:
+   #. Run the following:
 
       ``/opt/xensource/bin/setupxenserver.sh``
 
       .. note:: If the message "mv: cannot stat \`/etc/cron.daily/logrotate': No such file or directory" appears, you can safely ignore it.
 
-   #. 
-
-      Run the following:
+   #. Run the following:
 
       .. sourcecode:: bash
 
         ``for pbd in `xe pbd-list currently-attached=false| grep ^uuid | awk '{print $NF}'`; do xe pbd-plug uuid=$pbd ; ``
 
-   #. 
-
-      On each slave host in the Xen pool, repeat these steps, starting
+   #. On each slave host in the Xen pool, repeat these steps, starting
       from "manually live migrate VMs."
 
 .. include:: /global.rst
\ No newline at end of file