You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pd...@apache.org on 2014/07/31 03:10:29 UTC
[1/2] git commit: update url for system-vm
Repository: cloudstack-docs-rn
Updated Branches:
refs/heads/master 6ec89185b -> 8c4ab36e7
update url for system-vm
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/c8cfc1d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/c8cfc1d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/c8cfc1d8
Branch: refs/heads/master
Commit: c8cfc1d8ccd9e8ba64a3e65cce50cb516fa48500
Parents: 6ec8918
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Wed Jul 30 21:02:10 2014 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Wed Jul 30 21:02:10 2014 -0400
----------------------------------------------------------------------
source/global.rst | 10 ++-
source/upgrade/_sysvm_templates.rst | 12 +--
source/upgrade/_sysvm_templates_pre43.rst | 118 +++++++++++++++++++++++++
source/upgrade/upgrade-2.2.14.rst | 2 +-
source/upgrade/upgrade-3.0.x.rst | 2 +-
source/upgrade/upgrade-4.0.rst | 2 +-
source/upgrade/upgrade-4.1.rst | 2 +-
source/upgrade/upgrade-4.2.rst | 2 +-
8 files changed, 136 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/c8cfc1d8/source/global.rst
----------------------------------------------------------------------
diff --git a/source/global.rst b/source/global.rst
index d32cd87..2ad70ec 100644
--- a/source/global.rst
+++ b/source/global.rst
@@ -20,6 +20,10 @@
.. _CloudStack Administrator's Guide: http://docs.cloudstack.apache.org/projects/cloudstack-administration
-.. |sysvm64-url-xen| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2
-.. |sysvm64-url-kvm| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2
-.. |sysvm64-url-vmware| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova
+.. |sysvm64-url-xen| replace:: http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-xen.vhd.bz2
+.. |sysvm64-url-kvm| replace:: http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-kvm.qcow2.bz2
+.. |sysvm64-url-vmware| replace:: http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-vmware.ova
+
+.. |acs43-sysvm64-url-xen| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2
+.. |acs43-sysvm64-url-kvm| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2
+.. |acs43-sysvm64-url-vmware| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/c8cfc1d8/source/upgrade/_sysvm_templates.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_templates.rst b/source/upgrade/_sysvm_templates.rst
index 6e8f657..5f197ca 100644
--- a/source/upgrade/_sysvm_templates.rst
+++ b/source/upgrade/_sysvm_templates.rst
@@ -35,9 +35,9 @@ Update System-VM templates
+-------------------------+------------------------------------------------------------+
| Hypervisor | Description |
+=========================+============================================================+
- | XenServer | Name: systemvm-xenserver-4.3 |
+ | XenServer | Name: systemvm-xenserver-|version| |
| | |
- | | Description: systemvm-xenserver-4.3 |
+ | | Description: systemvm-xenserver-|version| |
| | |
| | URL: |sysvm64-url-xen| |
| | |
@@ -61,9 +61,9 @@ Update System-VM templates
| | |
| | Routing: yes |
+-------------------------+------------------------------------------------------------+
- | KVM | Name: systemvm-kvm-4.3 |
+ | KVM | Name: systemvm-kvm-|version| |
| | |
- | | Description: systemvm-kvm-4.3 |
+ | | Description: systemvm-kvm-|version| |
| | |
| | URL: |sysvm64-url-kvm| |
| | |
@@ -87,9 +87,9 @@ Update System-VM templates
| | |
| | Routing: yes |
+-------------------------+------------------------------------------------------------+
- | VMware | Name: systemvm-vmware-4.3 |
+ | VMware | Name: systemvm-vmware-|version| |
| | |
- | | Description: systemvm-vmware-4.3 |
+ | | Description: systemvm-vmware-|version| |
| | |
| | URL: |sysvm64-url-vmware| |
| | |
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/c8cfc1d8/source/upgrade/_sysvm_templates_pre43.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_templates_pre43.rst b/source/upgrade/_sysvm_templates_pre43.rst
new file mode 100644
index 0000000..6e8f657
--- /dev/null
+++ b/source/upgrade/_sysvm_templates_pre43.rst
@@ -0,0 +1,118 @@
+.. 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-4.3 |
+ | | |
+ | | Description: systemvm-xenserver-4.3 |
+ | | |
+ | | URL: |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-4.3 |
+ | | |
+ | | Description: systemvm-kvm-4.3 |
+ | | |
+ | | URL: |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-4.3 |
+ | | |
+ | | Description: systemvm-vmware-4.3 |
+ | | |
+ | | URL: |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 |
+ +-------------------------+------------------------------------------------------------+
+
+#. 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/c8cfc1d8/source/upgrade/upgrade-2.2.14.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-2.2.14.rst b/source/upgrade/upgrade-2.2.14.rst
index fca4d03..ebf37c9 100644
--- a/source/upgrade/upgrade-2.2.14.rst
+++ b/source/upgrade/upgrade-2.2.14.rst
@@ -55,7 +55,7 @@ This section will guide you from pre-Apache versions of Citrix CloudStack
Notes. This step is critical, as the database will be encrypted after
the upgrade to |version|.
-.. include:: _sysvm_templates.rst
+.. include:: _sysvm_templates_pre43.rst
#. **WARNING**: If you use more than one type of hypervisor in your
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/c8cfc1d8/source/upgrade/upgrade-3.0.x.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-3.0.x.rst b/source/upgrade/upgrade-3.0.x.rst
index 6d3d309..bb41090 100644
--- a/source/upgrade/upgrade-3.0.x.rst
+++ b/source/upgrade/upgrade-3.0.x.rst
@@ -50,7 +50,7 @@ them for :ref:`ubuntu40` or :ref:`rhel40` hosts upgrade.
Instructions for creating packages from the CloudStack source are in the
`CloudStack Installation Guide`_.
-.. include:: _sysvm_templates.rst
+.. include:: _sysvm_templates_pre43.rst
Upgrade Steps
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/c8cfc1d8/source/upgrade/upgrade-4.0.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.0.rst b/source/upgrade/upgrade-4.0.rst
index 59b9fbc..fd70bda 100644
--- a/source/upgrade/upgrade-4.0.rst
+++ b/source/upgrade/upgrade-4.0.rst
@@ -50,7 +50,7 @@ them for :ref:`ubuntu40` or :ref:`rhel40` hosts upgrade.
Instructions for creating packages from the CloudStack source are in the
`CloudStack Installation Guide`_.
-.. include:: _sysvm_templates.rst
+.. include:: _sysvm_templates_pre43.rst
Database Preparation
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/c8cfc1d8/source/upgrade/upgrade-4.1.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.1.rst b/source/upgrade/upgrade-4.1.rst
index f56a2b5..23bba10 100644
--- a/source/upgrade/upgrade-4.1.rst
+++ b/source/upgrade/upgrade-4.1.rst
@@ -54,7 +54,7 @@ them for :ref:`ubuntu41` or :ref:`rhel41` and :ref:`kvm41` hosts upgrade.
Instructions for creating packages from the CloudStack source are in the
`CloudStack Installation Guide`_.
-.. include:: _sysvm_templates.rst
+.. include:: _sysvm_templates_pre43.rst
Database Preparation
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/c8cfc1d8/source/upgrade/upgrade-4.2.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.2.rst b/source/upgrade/upgrade-4.2.rst
index 868cb08..f72d68e 100644
--- a/source/upgrade/upgrade-4.2.rst
+++ b/source/upgrade/upgrade-4.2.rst
@@ -54,7 +54,7 @@ them for :ref:`ubuntu42` or :ref:`rhel42` and :ref:`kvm42` hosts upgrade.
Instructions for creating packages from the CloudStack source are in the
`CloudStack Installation Guide`_.
-.. include:: _sysvm_templates.rst
+.. include:: _sysvm_templates_pre43.rst
Database Preparation
[2/2] git commit: update systemplate from 4.3 upgrade to4.4
Posted by pd...@apache.org.
update systemplate from 4.3 upgrade to4.4
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/8c4ab36e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/8c4ab36e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/8c4ab36e
Branch: refs/heads/master
Commit: 8c4ab36e7c01bab57fc216d7446bbc8923273d12
Parents: c8cfc1d
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Wed Jul 30 21:09:44 2014 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Wed Jul 30 21:09:44 2014 -0400
----------------------------------------------------------------------
source/upgrade/_sysvm_templates_pre43.rst | 2 ++
source/upgrade/upgrade-4.3.rst | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/8c4ab36e/source/upgrade/_sysvm_templates_pre43.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_templates_pre43.rst b/source/upgrade/_sysvm_templates_pre43.rst
index 6e8f657..8043b67 100644
--- a/source/upgrade/_sysvm_templates_pre43.rst
+++ b/source/upgrade/_sysvm_templates_pre43.rst
@@ -32,6 +32,8 @@ Update System-VM templates
#. In the Register template dialog box, specify the following values
(do not change these):
+ *The name of the template must end by "-4.3" when you upgrade to CloudStack 4.4.0*
+
+-------------------------+------------------------------------------------------------+
| Hypervisor | Description |
+=========================+============================================================+
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/8c4ab36e/source/upgrade/upgrade-4.3.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.3.rst b/source/upgrade/upgrade-4.3.rst
index 3d56b7f..bba9878 100644
--- a/source/upgrade/upgrade-4.3.rst
+++ b/source/upgrade/upgrade-4.3.rst
@@ -58,7 +58,7 @@ them for :ref:`ubuntu43` or :ref:`rhel43` and :ref:`kvm43` hosts upgrade.
Instructions for creating packages from the CloudStack source are in the
`CloudStack Installation Guide`_.
-.. include:: _no-sysvm_templates.rst
+.. include:: _sysvm_templates.rst
Database Preparation
--------------------