You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2015/12/21 21:04:21 UTC
[4/7] cloudstack-docs-rn git commit: fix pre 4.5 upgrade instruction
fix pre 4.5 upgrade instruction
Signed-off-by: runseb <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/2ff573fd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/2ff573fd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/2ff573fd
Branch: refs/heads/master
Commit: 2ff573fd298aa59f0e87b2b67866c31a005b7a88
Parents: f4eea7d
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Tue Nov 17 22:24:39 2015 -0500
Committer: runseb <ru...@gmail.com>
Committed: Mon Dec 21 21:02:55 2015 +0100
----------------------------------------------------------------------
source/global.rst | 8 +-
source/upgrade/_sysvm_templates_pre43.rst | 214 ------------------------
source/upgrade/_sysvm_templates_pre45.rst | 219 +++++++++++++++++++++++++
source/upgrade/upgrade-4.2.rst | 2 +-
source/upgrade/upgrade-4.3.rst | 2 +-
source/upgrade/upgrade-4.4.rst | 2 +-
6 files changed, 226 insertions(+), 221 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/2ff573fd/source/global.rst
----------------------------------------------------------------------
diff --git a/source/global.rst b/source/global.rst
index c7f6f7a..34d73b8 100644
--- a/source/global.rst
+++ b/source/global.rst
@@ -28,7 +28,7 @@
.. |sysvm64-url-ovm| replace:: http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-ovm.raw.bz2
.. Version specific: 4.3 systemvm template URL
-.. |acs43-sysvm64-url-xen| replace:: http://packages.shapeblue.com/systemvmtemplate/4.3/systemvm64template-4.3-xen.vhd.bz2
-.. |acs43-sysvm64-url-kvm| replace:: http://packages.shapeblue.com/systemvmtemplate/4.3/systemvm64template-4.3-kvm.qcow2.bz2
-.. |acs43-sysvm64-url-vmware| replace:: http://packages.shapeblue.com/systemvmtemplate/4.3/systemvm64template-4.3-vmware.ova
-.. |acs43-sysvm64-url-hyperv| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-hyperv.vhd.bz2
+.. |acs45-sysvm64-url-xen| replace:: http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2
+.. |acs45-sysvm64-url-kvm| replace:: http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-kvm.qcow2.bz2
+.. |acs45-sysvm64-url-vmware| replace:: http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-vmware.ova
+.. |acs45-sysvm64-url-hyperv| replace:: http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-hyperv.vhd.zip
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/2ff573fd/source/upgrade/_sysvm_templates_pre43.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_templates_pre43.rst b/source/upgrade/_sysvm_templates_pre43.rst
deleted file mode 100644
index fce9dd1..0000000
--- a/source/upgrade/_sysvm_templates_pre43.rst
+++ /dev/null
@@ -1,214 +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
---------------------------
-
-.. note::
- Upgrading pre-4.3 to 4.4.1 require 2 systemvm templates downloaded: the 4.3 and 4.4.
-
-#. 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.
-
-#. Register 4.3 systemvm template:
-
- #. 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: |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: no |
- +------------+------------------------------------------------------------+
- | KVM | Name: systemvm-kvm-4.3 |
- | | |
- | | Description: systemvm-kvm-4.3 |
- | | |
- | | 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: no |
- +------------+------------------------------------------------------------+
- | VMware | Name: systemvm-vmware-4.3 |
- | | |
- | | Description: systemvm-vmware-4.3 |
- | | |
- | | 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: no |
- +------------+------------------------------------------------------------+
-
-#. Register |version| systemvm template:
-
- #. 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: |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: no |
- +------------+------------------------------------------------------------+
- | KVM | Name: systemvm-kvm-|version| |
- | | |
- | | Description: systemvm-kvm-|version| |
- | | |
- | | 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: no |
- +------------+------------------------------------------------------------+
- | VMware | Name: systemvm-vmware-|version| |
- | | |
- | | Description: systemvm-vmware-|version| |
- | | |
- | | 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: no |
- +------------+------------------------------------------------------------+
-
-#. 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/2ff573fd/source/upgrade/_sysvm_templates_pre45.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_templates_pre45.rst b/source/upgrade/_sysvm_templates_pre45.rst
new file mode 100644
index 0000000..48db1bd
--- /dev/null
+++ b/source/upgrade/_sysvm_templates_pre45.rst
@@ -0,0 +1,219 @@
+.. 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
+--------------------------
+
+.. warning::
+ Upgrading from 4.4 or older to 4.6.0 require 2 systemvm templates to be
+ downloaded, for 4.5 and 4.6.
+
+#. 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.
+
+#. Register 4.5 systemvm template:
+
+ #. Click Register template.
+
+ The Register template dialog box is displayed.
+
+ #. In the Register template dialog box, specify the following values
+ (do not change these):
+
+ .. cssclass:: table-striped table-bordered table-hover
+
+ +------------+------------------------------------------------------------+
+ | Hypervisor | Description |
+ +============+============================================================+
+ | XenServer | Name: systemvm-xenserver-4.5 |
+ | | |
+ | | Description: systemvm-xenserver-4.5 |
+ | | |
+ | | URL: |acs45-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: no |
+ +------------+------------------------------------------------------------+
+ | KVM | Name: systemvm-kvm-4.5 |
+ | | |
+ | | Description: systemvm-kvm-4.5 |
+ | | |
+ | | URL: |acs45-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: no |
+ +------------+------------------------------------------------------------+
+ | VMware | Name: systemvm-vmware-4.5 |
+ | | |
+ | | Description: systemvm-vmware-4.5 |
+ | | |
+ | | URL: |acs45-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: no |
+ +------------+------------------------------------------------------------+
+
+#. Register |version| systemvm template:
+
+ #. Click Register template.
+
+ The Register template dialog box is displayed.
+
+ #. In the Register template dialog box, specify the following values
+ (do not change these):
+
+ .. cssclass:: table-striped table-bordered table-hover
+
+ +------------+------------------------------------------------------------+
+ | Hypervisor | Description |
+ +============+============================================================+
+ | XenServer | Name: systemvm-xenserver-|version| |
+ | | |
+ | | Description: systemvm-xenserver-|version| |
+ | | |
+ | | 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: no |
+ +------------+------------------------------------------------------------+
+ | KVM | Name: systemvm-kvm-|version| |
+ | | |
+ | | Description: systemvm-kvm-|version| |
+ | | |
+ | | 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: no |
+ +------------+------------------------------------------------------------+
+ | VMware | Name: systemvm-vmware-|version| |
+ | | |
+ | | Description: systemvm-vmware-|version| |
+ | | |
+ | | 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: no |
+ +------------+------------------------------------------------------------+
+
+#. 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/2ff573fd/source/upgrade/upgrade-4.2.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.2.rst b/source/upgrade/upgrade-4.2.rst
index 399dbcd..44fa0bb 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_pre45.rst
Database Preparation
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/2ff573fd/source/upgrade/upgrade-4.3.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.3.rst b/source/upgrade/upgrade-4.3.rst
index 5dcfe6b..e365d6b 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:: _sysvm_templates.rst
+.. include:: _sysvm_templates_pre45.rst
Database Preparation
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/2ff573fd/source/upgrade/upgrade-4.4.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.4.rst b/source/upgrade/upgrade-4.4.rst
index 09eaec7..e871f6b 100644
--- a/source/upgrade/upgrade-4.4.rst
+++ b/source/upgrade/upgrade-4.4.rst
@@ -58,7 +58,7 @@ them for :ref:`ubuntu44` or :ref:`rhel44` and :ref:`kvm44` hosts upgrade.
Instructions for creating packages from the CloudStack source are in the
`CloudStack Installation Guide`_.
-.. include:: _sysvm_templates.rst
+.. include:: _sysvm_templates_pre45.rst
Database Preparation