sysvm-templates infos in one file and include in upgrade instructions.
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/1955c9d5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/1955c9d5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/1955c9d5
Branch: refs/heads/master
Commit: 1955c9d537a5ade2221ecc596d4f9f74112d5e3c
Parents: f2d59ab
Author: Pierre-Luc Dion <pd...@cloudops.com>
Authored: Wed May 7 21:57:20 2014 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon May 19 08:49:38 2014 +0200
----------------------------------------------------------------------
source/global.rst | 3 +
source/rnotes.rst | 400 +------------------------------------
source/systemvm_templates.rst | 78 ++++++++
3 files changed, 87 insertions(+), 394 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/1955c9d5/source/global.rst
----------------------------------------------------------------------
diff --git a/source/global.rst b/source/global.rst
index 76b7df6..2f5fce1 100644
--- a/source/global.rst
+++ b/source/global.rst
@@ -18,3 +18,6 @@
.. _CloudStack Installation Guide: http://docs.cloudstack.apache.org/projects/cloudstack-installation
.. _CloudStack Administrator's Guide: http://docs.cloudstack.apache.org/projects/cloudstack-administration
+.. |sysvm-url-xen| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2
+.. |sysvm-url-kvm| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2
+.. |sysvm-url-vmware| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/1955c9d5/source/rnotes.rst
----------------------------------------------------------------------
diff --git a/source/rnotes.rst b/source/rnotes.rst
index 8409c7f..48f9b38 100644
--- a/source/rnotes.rst
+++ b/source/rnotes.rst
@@ -173,84 +173,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-|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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
+ .. include:: systemvm_templates.rst
#.
@@ -700,84 +623,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-|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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
+ .. include:: systemvm_templates.rst
#.
@@ -1245,84 +1091,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-|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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
+ .. include:: systemvm_templates.rst
#.
@@ -1663,84 +1432,7 @@ with a note.
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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
+ .. include:: systemvm_templates.rst
#.
@@ -2485,85 +2177,7 @@ Upgrade from 2.2.14 to |version|
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-|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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
- | 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 |
- +-------------------------+-----------------------------------------------------------------------------------------------+
-
+ .. include:: systemvm_templates.rst
#.
@@ -3398,6 +3012,4 @@ Upgrade from 2.2.14 to |version|
On each slave host in the Xen pool, repeat these steps, starting
from "manually live migrate VMs."
-.. |sysvm-url-xen| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2
-.. |sysvm-url-kvm| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2
-.. |sysvm-url-vmware| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova
+.. include:: global.rst
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/1955c9d5/source/systemvm_templates.rst
----------------------------------------------------------------------
diff --git a/source/systemvm_templates.rst b/source/systemvm_templates.rst
new file mode 100644
index 0000000..496e750
--- /dev/null
+++ b/source/systemvm_templates.rst
@@ -0,0 +1,78 @@
++-------------------------+-----------------------------------------------------------------------------------------------+
+| 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 |
++-------------------------+-----------------------------------------------------------------------------------------------+
+| 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 |
++-------------------------+-----------------------------------------------------------------------------------------------+
+| 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 |
++-------------------------+-----------------------------------------------------------------------------------------------+
\ No newline at end of file