cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pdion...@apache.org
Subject [3/5] git commit: 4.3.1: new api, issues, systemvm urls
Date Sun, 21 Sep 2014 15:53:08 GMT
4.3.1: new api, issues, systemvm urls


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/55f6a742
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/55f6a742
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/55f6a742

Branch: refs/heads/4.3
Commit: 55f6a7422a9406cb7791acf3b119d47a8ced8097
Parents: e6da1d6
Author: Pierre-Luc Dion <pdion891@apache.org>
Authored: Sun Sep 21 11:16:44 2014 -0400
Committer: Pierre-Luc Dion <pdion891@apache.org>
Committed: Sun Sep 21 11:16:44 2014 -0400

----------------------------------------------------------------------
 source/about.rst                    |  56 ++++-
 source/api-changes.rst              |  29 ++-
 source/rnotes.rst                   | 408 +------------------------------
 source/upgrade/_sysvm_templates.rst | 117 ---------
 source/upgrade/_templates.rst       |  99 ++++++++
 5 files changed, 188 insertions(+), 521 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/55f6a742/source/about.rst
----------------------------------------------------------------------
diff --git a/source/about.rst b/source/about.rst
index d81e9f3..2e6505a 100644
--- a/source/about.rst
+++ b/source/about.rst
@@ -551,12 +551,48 @@ summer. In advance of that, CloudStack 4.3 no longer uses realhostip.com
 DNS domains or SSL certificates to encrypt Console Proxy or file copy
 communications.
 
-Issues Fixed in 4.3.0
+
+Issues Fixed in 4.3.1
 ---------------------
 
 Apache CloudStack uses `Jira <https://issues.apache.org/jira/browse/CLOUDSTACK>`__ to track its
 issues. All new features and bugs for 4.3 have been tracked in Jira, and have a standard naming convention of "CLOUDSTACK-NNNN" where "NNNN" is the issue number.
 
+==========================================================================  ===================================================================================
+Bug ID                                                                      Description
+==========================================================================  ===================================================================================
+`CLOUDSTACK-7528 <https://issues.apache.org/jira/browse/CLOUDSTACK-7528>`_  When AlertManager fails to sendAlert it does not log the actual issue/error...
+`CLOUDSTACK-7404 <https://issues.apache.org/jira/browse/CLOUDSTACK-7404>`_  Failed to start an instance when originating template has been deleted...
+`CLOUDSTACK-7193 <https://issues.apache.org/jira/browse/CLOUDSTACK-7193>`_  Rebooting a VM doesn't update iptables rules...
+`CLOUDSTACK-7087 <https://issues.apache.org/jira/browse/CLOUDSTACK-7087>`_  [VR] [VPN] Downgrade openswan to previous version for VPN services to fix OSX cl...
+`CLOUDSTACK-7006 <https://issues.apache.org/jira/browse/CLOUDSTACK-7006>`_  Template ID is missing in ROOT volume usages...
+`CLOUDSTACK-6892 <https://issues.apache.org/jira/browse/CLOUDSTACK-6892>`_  Database HA Config prevents mgmt server from starting...
+`CLOUDSTACK-6886 <https://issues.apache.org/jira/browse/CLOUDSTACK-6886>`_  Cannot add SDX Netscaler device...
+`CLOUDSTACK-6816 <https://issues.apache.org/jira/browse/CLOUDSTACK-6816>`_  cloudstack-setup-management make /root directory's permission 0777  improperly...
+`CLOUDSTACK-6673 <https://issues.apache.org/jira/browse/CLOUDSTACK-6673>`_  cloudstack-setup-management make a chmod 777 on /root...
+`CLOUDSTACK-6665 <https://issues.apache.org/jira/browse/CLOUDSTACK-6665>`_  DHCP does not release ip addresses properly on VPC routers (edithosts.sh)...
+`CLOUDSTACK-6624 <https://issues.apache.org/jira/browse/CLOUDSTACK-6624>`_  Unable to create new Network Offerings via UI with Specify VLAN option set...
+`CLOUDSTACK-6531 <https://issues.apache.org/jira/browse/CLOUDSTACK-6531>`_  VR starts even if PF rules fails...
+`CLOUDSTACK-6509 <https://issues.apache.org/jira/browse/CLOUDSTACK-6509>`_  Cannot import multiple LDAP/AD users into a cloudstack account...
+`CLOUDSTACK-6472 <https://issues.apache.org/jira/browse/CLOUDSTACK-6472>`_  listUsageRecords generates NPEs for expunging instances...
+`CLOUDSTACK-6471 <https://issues.apache.org/jira/browse/CLOUDSTACK-6471>`_  Add logs to better diagnose failures and errors in LDAP AD integration...
+`CLOUDSTACK-6464 <https://issues.apache.org/jira/browse/CLOUDSTACK-6464>`_  [KVM:basic zone- upgrade to  4.3],after   any vm restart,all the nics  are plugg...
+`CLOUDSTACK-6433 <https://issues.apache.org/jira/browse/CLOUDSTACK-6433>`_  Make sure redundant router would create a pair of routers when implementation...
+`CLOUDSTACK-6317 <https://issues.apache.org/jira/browse/CLOUDSTACK-6317>`_  [VMware] Tagged VLAN support broken for Management/Control/Storage traffic...
+`CLOUDSTACK-6299 <https://issues.apache.org/jira/browse/CLOUDSTACK-6299>`_  GetVMPassword decypher instructions are wrong...
+`CLOUDSTACK-6297 <https://issues.apache.org/jira/browse/CLOUDSTACK-6297>`_  Cloudstack Fails to Launch on Ubuntu missing MySQL Driver...
+`CLOUDSTACK-6285 <https://issues.apache.org/jira/browse/CLOUDSTACK-6285>`_  Some passwords in the VR would be cleared out by accident due to falsely match i...
+`CLOUDSTACK-6115 <https://issues.apache.org/jira/browse/CLOUDSTACK-6115>`_  Investigate the use of TravisCI for CloudStack integration testing...
+`CLOUDSTACK-6099 <https://issues.apache.org/jira/browse/CLOUDSTACK-6099>`_  live migration is failing for vm deployed using dynaic compute offerings with NP...
+`CLOUDSTACK-4652 <https://issues.apache.org/jira/browse/CLOUDSTACK-4652>`_  ceph:UI:Noticed 2 records for same volume after migrating instance from one prim...
+`CLOUDSTACK-4557 <https://issues.apache.org/jira/browse/CLOUDSTACK-4557>`_  ceph:Performance:first time operstions taking more time...
+`CLOUDSTACK-4292 <https://issues.apache.org/jira/browse/CLOUDSTACK-4292>`_  ceph:destroyedvm failed with ArrayIndexexception while expunging...
+==========================================================================  ===================================================================================
+
+
+Issues Fixed in 4.3.0
+---------------------
+
 For the list of issues fixed, see `Issues Fixed in
 4.3 <https://issues.apache.org/jira/issues/?filter=12326161>`__.
 
@@ -726,12 +762,28 @@ Bug ID                                                                      Desc
 ==========================================================================  ===================================================================================
 
 
-Known Issues in 4.3.0
+Known Issues in 4.3.1
 ---------------------
 
 Apache CloudStack uses
 `Jira <https://issues.apache.org/jira/browse/CLOUDSTACK>`__ to track its issues. All new features and bugs for 4.3 have been tracked in Jira, and have a standard naming convention of "CLOUDSTACK-NNNN" where "NNNN" is the issue number.
 
+==========================================================================  ===================================================================================
+Bug ID                                                                      Description
+==========================================================================  ===================================================================================
+`CLOUDSTACK-7151 <https://issues.apache.org/jira/browse/CLOUDSTACK-7151>`_  vmware: Type of vSwitch was not detected correctly while preparing public/guest ...
+`CLOUDSTACK-7578 <https://issues.apache.org/jira/browse/CLOUDSTACK-7578>`_  XenServerInvestigator should do better investigation in case of OVS or other net...
+`CLOUDSTACK-6485 <https://issues.apache.org/jira/browse/CLOUDSTACK-6485>`_  [vpc] new private gateway network is registered wrong in network table...
+`CLOUDSTACK-6927 <https://issues.apache.org/jira/browse/CLOUDSTACK-6927>`_  Security group python script has several issues...
+`CLOUDSTACK-7291 <https://issues.apache.org/jira/browse/CLOUDSTACK-7291>`_  LXC: Mgmt server/agent keeps killing systemvms...
+`CLOUDSTACK-7297 <https://issues.apache.org/jira/browse/CLOUDSTACK-7297>`_  HA VM options is disabled for VMs created on CLVM primary storage...
+`CLOUDSTACK-7572 <https://issues.apache.org/jira/browse/CLOUDSTACK-7572>`_  Virtual Console Proxy url domain...
+==========================================================================  ===================================================================================
+
+
+Known Issues in 4.3.0
+---------------------
+
 For the list of known issues, see `Known Issues in
 4.3 <https://issues.apache.org/jira/issues/?filter=12326162>`__.
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/55f6a742/source/api-changes.rst
----------------------------------------------------------------------
diff --git a/source/api-changes.rst b/source/api-changes.rst
index f28d4ed..8fa7053 100644
--- a/source/api-changes.rst
+++ b/source/api-changes.rst
@@ -13,11 +13,24 @@
    specific language governing permissions and limitations
    under the License.
    
-API Changes Introduced in 4.3
+API Changes 
 =============================
 
+Introduced in 4.3.1
+-------------------
+
++-----------------+-------------------------------------------------------------------+
+| API             | Description                                                       |
++=================+===================================================================+
+| importLdapUsers | New parameters: account (optional)                                |
++-----------------+-------------------------------------------------------------------+
+
+Introduced in 4.3
+-----------------
+
+
 Hyper-V
--------
+^^^^^^^
 
 +-------------------+-------------------------------------------------------------------+
 | API               | Description                                                       |
@@ -27,8 +40,9 @@ Hyper-V
 | addImageStore     | To this existing API, the following field has been added: smb     |
 +-------------------+-------------------------------------------------------------------+
 
+
 Reporting CPU Sockets
----------------------
+^^^^^^^^^^^^^^^^^^^^^
 
 +----------+-------------------------------------------------------------------+
 | API      | Description                                                       |
@@ -39,8 +53,9 @@ Reporting CPU Sockets
 |          | The new response parameter added is: cpusockets                   |
 +----------+-------------------------------------------------------------------+
 
+
 Publishing Alerts Using the Web ROOT Admin API
-----------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 +---------------+-------------------------------------------------------------------+
 | API           | Description                                                       |
@@ -54,8 +69,9 @@ Publishing Alerts Using the Web ROOT Admin API
 |               | name. An alert can be searched on the basis of alert name.        |
 +---------------+-------------------------------------------------------------------+
 
+
 Dynamic Compute Offering
-------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 +-----------------+-------------------------------------------------------------------+
 | API             | Description                                                       |
@@ -78,8 +94,9 @@ Dynamic Compute Offering
 |                 |                                                                   |
 +-----------------+-------------------------------------------------------------------+
 
+
 Enhanced Upgrade for Virtual Routers
-------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 +-----------------------+-------------------------------------------------------------------+
 | API                   | Description                                                       |

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/55f6a742/source/rnotes.rst
----------------------------------------------------------------------
diff --git a/source/rnotes.rst b/source/rnotes.rst
index 74d4790..9ea8806 100644
--- a/source/rnotes.rst
+++ b/source/rnotes.rst
@@ -173,84 +173,10 @@ working on a production system.
       In the Register template dialog box, specify the following values
       (do not change these):
 
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | Hypervisor              | Description                                                                                   |
-       +=========================+===============================================================================================+
-       | XenServer               | Name: systemvm-xenserver-4.3                                                                  |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-xenserver-4.3                                                           |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2      |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | KVM                     | Name: systemvm-kvm-4.3                                                                        |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-kvm-4.3                                                                 |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |	
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2    |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | VMware                  | Name: systemvm-vmware-4.3                                                                     |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-vmware-4.3                                                              |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova       |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
+      .. include:: upgrade/_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.
 
 #. 
 
@@ -700,84 +626,7 @@ working on a production system.
       In the Register template dialog box, specify the following values
       (do not change these):
 
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | Hypervisor              | Description                                                                                   |
-       +=========================+===============================================================================================+
-       | XenServer               | Name: systemvm-xenserver-4.3                                                                  |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-xenserver-4.3                                                           |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2      |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | KVM                     | Name: systemvm-kvm-4.3                                                                        |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-kvm-4.3                                                                 |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2    |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | VMware                  | Name: systemvm-vmware-4.3                                                                     |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-vmware-4.3                                                              |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova       |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
+      .. include:: upgrade/_templates.rst
 
 
 #. 
@@ -1245,85 +1094,7 @@ working on a production system.
       In the Register template dialog box, specify the following values
       (do not change these):
 
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | Hypervisor              | Description                                                                                   |
-       +=========================+===============================================================================================+
-       | XenServer               | Name: systemvm-xenserver-4.3                                                                  |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-xenserver-4.3                                                           |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2      |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | KVM                     | Name: systemvm-kvm-4.3                                                                        |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-kvm-4.3                                                                 |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2    |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | VMware                  | Name: systemvm-vmware-4.3                                                                     |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-vmware-4.3                                                              |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova       |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-
+      .. include:: upgrade/_templates.rst
 
 #. 
 
@@ -1662,88 +1433,8 @@ with a note.
 
       In the Register template dialog box, specify the following values
       (do not change these):
-
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | Hypervisor              | Description                                                                                   |
-       +=========================+===============================================================================================+
-       | XenServer               | Name: systemvm-xenserver-4.3                                                                  |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-xenserver-4.3                                                           |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2      |
-       |                         |                                                                                               |
-       |                         | Zone: Choose the zone where this hypervisor is used                                           |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | KVM                     | Name: systemvm-kvm-4.3                                                                        |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-kvm-4.3                                                                 |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2    |
-       |                         |                                                                                               |
-       |                         | Zone: Choose the zone where this hypervisor is used                                           |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | VMware                  | Name: systemvm-vmware-4.3                                                                     |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-vmware-4.3                                                              |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova       |
-       |                         |                                                                                               |
-       |                         | Zone: Choose the zone where this hypervisor is used                                           |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
+      
+      .. include:: upgrade/_templates.rst
 	   
    #. 
 
@@ -2488,85 +2179,7 @@ Upgrade from 2.2.14 to 4.3
       In the Register template dialog box, specify the following values
       depending on the hypervisor type (do not change these):
 
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | Hypervisor              | Description                                                                                   |
-       +=========================+===============================================================================================+
-       | XenServer               | Name: systemvm-xenserver-4.3                                                                  |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-xenserver-4.3                                                           |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2      |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | KVM                     | Name: systemvm-kvm-4.3                                                                        |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-kvm-4.3                                                                 |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2    |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-       | VMware                  | Name: systemvm-vmware-4.3                                                                     |
-       |                         |                                                                                               |
-       |                         | Description: systemvm-vmware-4.3                                                              |
-       |                         |                                                                                               |
-       |                         | URL:                                                                                          |
-       |                         | http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova       |
-       |                         |                                                                                               |
-       |                         | 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                                                                                  |
-       +-------------------------+-----------------------------------------------------------------------------------------------+
-
+      .. include:: upgrade/_templates.rst
 
 
 #. 
@@ -3400,3 +3013,6 @@ Upgrade from 2.2.14 to 4.3
 
       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

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/55f6a742/source/upgrade/_sysvm_templates.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_templates.rst b/source/upgrade/_sysvm_templates.rst
deleted file mode 100644
index 3cd8dca..0000000
--- a/source/upgrade/_sysvm_templates.rst
+++ /dev/null
@@ -1,117 +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.
-
-.. 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: |acs43-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: |acs43-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: |acs43-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/55f6a742/source/upgrade/_templates.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_templates.rst b/source/upgrade/_templates.rst
new file mode 100644
index 0000000..85fc5f4
--- /dev/null
+++ b/source/upgrade/_templates.rst
@@ -0,0 +1,99 @@
+.. 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.
+
++-------------------------+-----------------------------------------------------------------------------------------------+
+| Hypervisor              | Description                                                                                   |
++=========================+===============================================================================================+
+| XenServer               | Name: systemvm-xenserver-|version|                                                            |
+|                         |                                                                                               |
+|                         | Description: systemvm-xenserver-|version|                                                     |
+|                         |                                                                                               |
+|                         | URL: |acs43-sysvm64-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: |acs43-sysvm64-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: |acs43-sysvm64-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                                                                                  |
++-------------------------+-----------------------------------------------------------------------------------------------+
+


Mime
View raw message