Skip to content

Commit 99404f8

Browse files
yadvrandrijapanicsb
yadvr
and
andrijapanicsb
authored
upgrade: upgrade systemvmtemplate for 4.14 (#87)
* upgrade: upgrade systemvmtemplate for 4.14 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * use latest available guest OS or other linux 64-bit Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * bump version to 4.14 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * address some review comments Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * References update (TBT) * remove kvm pool slash issue workaround Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * fixes Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * remove jsvc, no longer used by cloudstack agents Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * notes on primate and jdk11 version Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * update references * template warning message for 4.13 was missing * note on non-supported OS versions * copyright years * Java 1.11 to 11 * minor wording change Co-authored-by: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
1 parent baff87b commit 99404f8

18 files changed

Lines changed: 429 additions & 251 deletions

‎source/_global.rst‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525

2626
.. Latest version systemvm template name
2727
28-
.. |sysvm64-version| replace:: 4.11.3
29-
.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.11.3
30-
.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.11.3
31-
.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.11.3
32-
.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.11.3
33-
.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.11.3
28+
.. |sysvm64-version| replace:: 4.14.0
29+
.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.14.0
30+
.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.14.0
31+
.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.14.0
32+
.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.14.0
33+
.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.14.0
3434

3535
.. Latest version systemvm template URL
36-
.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-xen.vhd.bz2
37-
.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-kvm.qcow2.bz2
38-
.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-vmware.ova
39-
.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-hyperv.vhd.zip
40-
.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-ovm.raw.bz2
36+
.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-xen.vhd.bz2
37+
.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-kvm.qcow2.bz2
38+
.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-vmware.ova
39+
.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-hyperv.vhd.zip
40+
.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-ovm.raw.bz2
4141

4242
.. Version specific: 4.5 systemvm template URL
4343
.. |acs45-sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2

‎source/conf.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
# -- Project information -----------------------------------------------------
2121

2222
project = 'Apache CloudStack'
23-
copyright = '2018, Apache Foundation'
23+
copyright = '2012-2020, Apache Foundation'
2424
author = 'Apache CloudStack Project'
2525

2626
# The short X.Y version
27-
version = '4.13'
27+
version = '4.14'
2828
# The full version, including alpha/beta/rc tags
29-
release = '4.13.0.0'
29+
release = '4.14.0.0'
3030

3131
rst_epilog = """
3232
.. include:: /_global.rst

‎source/upgrading/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Contents:
3737
.. toctree::
3838
:maxdepth: 1
3939

40+
upgrade/upgrade-4.13
4041
upgrade/upgrade-4.12
4142
upgrade/upgrade-4.11
4243
upgrade/upgrade-4.10

source/upgrading/upgrade/_java_8_ubuntu.rst renamed to source/upgrading/upgrade/_java_version.rst

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,24 @@
1515
1616
.. sub-section included in upgrade notes.
1717
18-
Java 8 JRE on Ubuntu
19-
--------------------
18+
Java Version Requirement
19+
------------------------
2020

21-
CloudStack |version| requires installation of Java 8 JRE from an external PPA
22-
such as openjdk-r for Ubuntu distributions where the openjdk-8 packages are not
23-
available from the main repositories such as on Ubuntu 14.04. The PPA can be
24-
added before installation/upgrade:
21+
CloudStack |version| requires installation of Java 11 JRE for management server
22+
and the KVM agent. On installing or upgrading cloudstack-management and/or
23+
cloudstack-agent packages, please configure Java 11 as the default java
24+
version using:
25+
26+
.. parsed-literal::
27+
28+
$ sudo alternatives --config java
29+
30+
Note: For Ubuntu distributions where the openjdk-11 packages are not available
31+
from the main repositories, the JRE can be installed from an external PPA such
32+
as openjdk-r. The PPA can be added before installation/upgrade:
2533

2634
.. parsed-literal::
2735
2836
$ sudo add-apt-repository ppa:openjdk-r/ppa
2937
$ sudo apt-get update
3038
31-
Users can also choose to install Java 8 distribution from Oracle, or `Xulu-8 <http://repos.azulsystems.com/>`_ OpenJDK distribution from Azul.

‎source/upgrading/upgrade/_sysvm_templates.rst‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ Update System-VM templates
4848
| | |
4949
| | Format: VHD |
5050
| | |
51-
| | OS Type: Debian GNU/Linux 7.0 (64-bit) (or the |
52-
| | highest Debian release number available in the |
53-
| | dropdown) |
51+
| | OS Type: Other Linux (64-bit) |
5452
| | |
5553
| | Extractable: no |
5654
| | |
@@ -100,7 +98,7 @@ Update System-VM templates
10098
| | |
10199
| | Format: OVA |
102100
| | |
103-
| | OS Type: Other Linux 64-bit |
101+
| | OS Type: Other Linux (64-bit) |
104102
| | |
105103
| | Extractable: no |
106104
| | |

‎source/upgrading/upgrade/upgrade-4.10.rst‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ http://markmail.org/message/f42kqr3mx4r4hgih
5959

6060
.. include:: _sysvm_templates.rst
6161

62+
.. include:: _java_version.rst
63+
6264
Packages repository
6365
-------------------
6466

@@ -105,22 +107,6 @@ Backup current database
105107
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
106108
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
107109
108-
#. **(KVM Only)** If primary storage of type local storage is in use, the
109-
path for this storage needs to be verified to ensure it passes new
110-
validation. Check local storage by querying the cloud.storage\_pool
111-
table:
112-
113-
.. parsed-literal::
114-
115-
$ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
116-
117-
If local storage paths are found to have a trailing forward slash,
118-
remove it:
119-
120-
.. parsed-literal::
121-
122-
$ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
123-
124110
125111
.. _ubuntu410:
126112
.. _apt-repo410:
@@ -145,7 +131,6 @@ each system with CloudStack packages. This means all management
145131
servers, and any hosts that have the KVM agent. (No changes should
146132
be necessary for hosts that are running VMware or Xen.)
147133

148-
.. include:: _java_8_ubuntu.rst
149134

150135
Start by opening ``/etc/apt/sources.list.d/cloudstack.list`` on
151136
any systems that have CloudStack packages installed.
@@ -162,6 +147,8 @@ We'll change it to point to the new package repository:
162147
163148
deb http://download.cloudstack.org/ubuntu precise |version|
164149
150+
Please note that CloudStack |version| doesn't support Ubuntu 12.04/Precise and it's recommended to upgrade to Ubuntu 18.04
151+
165152
Setup the public key for the above repository:
166153

167154
.. parsed-literal::
@@ -232,6 +219,8 @@ If you are using the community provided package repository, change the base url
232219
233220
http://download.cloudstack.org/centos/$releasever/|version|/
234221
222+
Please note that CloudStack |version| doesn't support CentOS 6 and it's recommended to upgrade to CentOS 7.
223+
235224
Setup the GPG public key if you wish to enable ``gpgcheck=1``:
236225

237226
.. parsed-literal::
@@ -414,7 +403,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
414403
.. parsed-literal::
415404
416405
$ sudo service cloudstack-agent stop
417-
$ sudo killall jsvc
418406
$ sudo service cloudstack-agent start
419407
420408

‎source/upgrading/upgrade/upgrade-4.11.rst‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,14 @@ Overview of Upgrade Steps:
5050
.. include:: _customisation_warnings.rst
5151

5252
.. warning::
53-
If you have not registered the 4.11.3 System VM templates for your hypervisors,
54-
you will need to register them prior to performing the upgrade of the CloudStack
55-
packages. This includes those currently running a **clean** install of CloudStack 4.11.3 (ie you
56-
did not upgrade from another version to reach 4.11.3), you will still need to
57-
explicitly register the 4.11.3 System VM template(s), you will not however need
58-
to restart the existing system VMs.
59-
60-
If you are running an instance of CloudStack 4.11.3
61-
that was upgraded from a the previous versions,
62-
you will already have explicitly registered the 4.11.3 System VM template(s) and
63-
need not do it again.
53+
If you are not already using the |sysvm64-version| System VM template you will need to
54+
upgrade your System VM template prior to performing the upgrade of the
55+
CloudStack packages.
6456

6557
.. include:: _sysvm_templates.rst
6658

59+
.. include:: _java_version.rst
60+
6761
Packages repository
6862
-------------------
6963

@@ -109,22 +103,6 @@ Backup current database
109103
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
110104
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
111105
112-
#. **(KVM Only)** If primary storage of type local storage is in use, the
113-
path for this storage needs to be verified to ensure it passes new
114-
validation. Check local storage by querying the cloud.storage\_pool
115-
table:
116-
117-
.. parsed-literal::
118-
119-
$ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
120-
121-
If local storage paths are found to have a trailing forward slash,
122-
remove it:
123-
124-
.. parsed-literal::
125-
126-
$ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
127-
128106
129107
.. _ubuntu411:
130108
.. _apt-repo411:
@@ -347,7 +325,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
347325
.. parsed-literal::
348326
349327
$ sudo service cloudstack-agent stop
350-
$ sudo killall jsvc
351328
$ sudo service cloudstack-agent start
352329
353330

‎source/upgrading/upgrade/upgrade-4.12.rst‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ Overview of Upgrade Steps:
5454

5555
.. include:: _sysvm_templates.rst
5656

57+
.. include:: _java_version.rst
58+
5759
Packages repository
5860
-------------------
5961

@@ -99,22 +101,6 @@ Backup current database
99101
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
100102
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
101103
102-
#. **(KVM Only)** If primary storage of type local storage is in use, the
103-
path for this storage needs to be verified to ensure it passes new
104-
validation. Check local storage by querying the cloud.storage\_pool
105-
table:
106-
107-
.. parsed-literal::
108-
109-
$ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
110-
111-
If local storage paths are found to have a trailing forward slash,
112-
remove it:
113-
114-
.. parsed-literal::
115-
116-
$ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
117-
118104
119105
.. _ubuntu412:
120106
.. _apt-repo412:
@@ -126,7 +112,7 @@ Ubuntu
126112
######
127113
128114
If you are using Ubuntu, follow this procedure to upgrade your packages. If
129-
not, skip to step :ref:`rhel411`.
115+
not, skip to step :ref:`rhel412`.
130116
131117
.. note::
132118
**Community Packages:** This section assumes you're using the community
@@ -147,13 +133,13 @@ This file should have one line, which contains:
147133

148134
.. parsed-literal::
149135
150-
deb http://download.cloudstack.org/ubuntu precise 4.12
136+
deb http://download.cloudstack.org/ubuntu bionic 4.12
151137
152138
We'll change it to point to the new package repository:
153139

154140
.. parsed-literal::
155141
156-
deb http://download.cloudstack.org/ubuntu precise |version|
142+
deb http://download.cloudstack.org/ubuntu bionic |version|
157143
158144
Setup the public key for the above repository:
159145

@@ -214,7 +200,7 @@ This file should have content similar to the following:
214200
215201
[apache-cloudstack]
216202
name=Apache CloudStack
217-
baseurl=http://download.cloudstack.org/centos/6/4.12/
203+
baseurl=http://download.cloudstack.org/centos/7/4.12/
218204
enabled=1
219205
gpgcheck=0
220206
@@ -285,7 +271,7 @@ steps will not affect running guests in the cloud. These steps are
285271
required only for clouds using KVM as hosts and only on the KVM
286272
hosts.
287273

288-
#. Configure the :ref:`APT repo <apt-repo411>` as detailed above.
274+
#. Configure the :ref:`APT repo <apt-repo412>` as detailed above.
289275

290276
#. Stop the running agent.
291277

@@ -320,7 +306,7 @@ KVM on CentOS/RHEL
320306

321307
For KVM hosts, upgrade the ``cloudstack-agent`` package
322308

323-
#. Configure the :ref:`rpm-repo411` as detailed above.
309+
#. Configure the :ref:`rpm-repo412` as detailed above.
324310

325311
.. parsed-literal::
326312
@@ -340,7 +326,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
340326
.. parsed-literal::
341327
342328
$ sudo service cloudstack-agent stop
343-
$ sudo killall jsvc
344329
$ sudo service cloudstack-agent start
345330
346331

0 commit comments

Comments
 (0)