diff --git a/source/_global.rst b/source/_global.rst
index 87044f6653..8804b0837c 100644
--- a/source/_global.rst
+++ b/source/_global.rst
@@ -25,19 +25,19 @@
.. Latest version systemvm template name
-.. |sysvm64-version| replace:: 4.11.3
-.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.11.3
-.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.11.3
-.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.11.3
-.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.11.3
-.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.11.3
+.. |sysvm64-version| replace:: 4.14.0
+.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.14.0
+.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.14.0
+.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.14.0
+.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.14.0
+.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.14.0
.. Latest version systemvm template URL
-.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-xen.vhd.bz2
-.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-kvm.qcow2.bz2
-.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-vmware.ova
-.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-hyperv.vhd.zip
-.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-ovm.raw.bz2
+.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-xen.vhd.bz2
+.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-kvm.qcow2.bz2
+.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-vmware.ova
+.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-hyperv.vhd.zip
+.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-ovm.raw.bz2
.. Version specific: 4.5 systemvm template URL
.. |acs45-sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2
diff --git a/source/conf.py b/source/conf.py
index bfbcb047fd..9733e623ab 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -20,13 +20,13 @@
# -- Project information -----------------------------------------------------
project = 'Apache CloudStack'
-copyright = '2018, Apache Foundation'
+copyright = '2012-2020, Apache Foundation'
author = 'Apache CloudStack Project'
# The short X.Y version
-version = '4.13'
+version = '4.14'
# The full version, including alpha/beta/rc tags
-release = '4.13.0.0'
+release = '4.14.0.0'
rst_epilog = """
.. include:: /_global.rst
diff --git a/source/upgrading/index.rst b/source/upgrading/index.rst
index 3acf799f95..4c3c2facdd 100644
--- a/source/upgrading/index.rst
+++ b/source/upgrading/index.rst
@@ -37,6 +37,7 @@ Contents:
.. toctree::
:maxdepth: 1
+ upgrade/upgrade-4.13
upgrade/upgrade-4.12
upgrade/upgrade-4.11
upgrade/upgrade-4.10
diff --git a/source/upgrading/upgrade/_java_8_ubuntu.rst b/source/upgrading/upgrade/_java_version.rst
similarity index 61%
rename from source/upgrading/upgrade/_java_8_ubuntu.rst
rename to source/upgrading/upgrade/_java_version.rst
index 1e0a57d056..5604747836 100644
--- a/source/upgrading/upgrade/_java_8_ubuntu.rst
+++ b/source/upgrading/upgrade/_java_version.rst
@@ -15,17 +15,24 @@
.. sub-section included in upgrade notes.
-Java 8 JRE on Ubuntu
---------------------
+Java Version Requirement
+------------------------
-CloudStack |version| requires installation of Java 8 JRE from an external PPA
-such as openjdk-r for Ubuntu distributions where the openjdk-8 packages are not
-available from the main repositories such as on Ubuntu 14.04. The PPA can be
-added before installation/upgrade:
+CloudStack |version| requires installation of Java 11 JRE for management server
+and the KVM agent. On installing or upgrading cloudstack-management and/or
+cloudstack-agent packages, please configure Java 11 as the default java
+version using:
+
+ .. parsed-literal::
+
+ $ sudo alternatives --config java
+
+Note: For Ubuntu distributions where the openjdk-11 packages are not available
+from the main repositories, the JRE can be installed from an external PPA such
+as openjdk-r. The PPA can be added before installation/upgrade:
.. parsed-literal::
$ sudo add-apt-repository ppa:openjdk-r/ppa
$ sudo apt-get update
-Users can also choose to install Java 8 distribution from Oracle, or `Xulu-8 `_ OpenJDK distribution from Azul.
diff --git a/source/upgrading/upgrade/_sysvm_templates.rst b/source/upgrading/upgrade/_sysvm_templates.rst
index 36793d4e1d..6503568e61 100644
--- a/source/upgrading/upgrade/_sysvm_templates.rst
+++ b/source/upgrading/upgrade/_sysvm_templates.rst
@@ -48,9 +48,7 @@ Update System-VM templates
| | |
| | Format: VHD |
| | |
- | | OS Type: Debian GNU/Linux 7.0 (64-bit) (or the |
- | | highest Debian release number available in the |
- | | dropdown) |
+ | | OS Type: Other Linux (64-bit) |
| | |
| | Extractable: no |
| | |
@@ -100,7 +98,7 @@ Update System-VM templates
| | |
| | Format: OVA |
| | |
- | | OS Type: Other Linux 64-bit |
+ | | OS Type: Other Linux (64-bit) |
| | |
| | Extractable: no |
| | |
diff --git a/source/upgrading/upgrade/upgrade-4.10.rst b/source/upgrading/upgrade/upgrade-4.10.rst
index 87b07605bd..00ff2ab530 100644
--- a/source/upgrading/upgrade/upgrade-4.10.rst
+++ b/source/upgrading/upgrade/upgrade-4.10.rst
@@ -59,6 +59,8 @@ http://markmail.org/message/f42kqr3mx4r4hgih
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Packages repository
-------------------
@@ -105,22 +107,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu410:
.. _apt-repo410:
@@ -145,7 +131,6 @@ each system with CloudStack packages. This means all management
servers, and any hosts that have the KVM agent. (No changes should
be necessary for hosts that are running VMware or Xen.)
-.. include:: _java_8_ubuntu.rst
Start by opening ``/etc/apt/sources.list.d/cloudstack.list`` on
any systems that have CloudStack packages installed.
@@ -162,6 +147,8 @@ We'll change it to point to the new package repository:
deb http://download.cloudstack.org/ubuntu precise |version|
+Please note that CloudStack |version| doesn't support Ubuntu 12.04/Precise and it's recommended to upgrade to Ubuntu 18.04
+
Setup the public key for the above repository:
.. parsed-literal::
@@ -232,6 +219,8 @@ If you are using the community provided package repository, change the base url
http://download.cloudstack.org/centos/$releasever/|version|/
+Please note that CloudStack |version| doesn't support CentOS 6 and it's recommended to upgrade to CentOS 7.
+
Setup the GPG public key if you wish to enable ``gpgcheck=1``:
.. parsed-literal::
@@ -414,7 +403,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.11.rst b/source/upgrading/upgrade/upgrade-4.11.rst
index f1679a165a..ccdf9eb6ca 100644
--- a/source/upgrading/upgrade/upgrade-4.11.rst
+++ b/source/upgrading/upgrade/upgrade-4.11.rst
@@ -50,20 +50,14 @@ Overview of Upgrade Steps:
.. include:: _customisation_warnings.rst
.. warning::
- If you have not registered the 4.11.3 System VM templates for your hypervisors,
- you will need to register them prior to performing the upgrade of the CloudStack
- packages. This includes those currently running a **clean** install of CloudStack 4.11.3 (ie you
- did not upgrade from another version to reach 4.11.3), you will still need to
- explicitly register the 4.11.3 System VM template(s), you will not however need
- to restart the existing system VMs.
-
- If you are running an instance of CloudStack 4.11.3
- that was upgraded from a the previous versions,
- you will already have explicitly registered the 4.11.3 System VM template(s) and
- need not do it again.
+ If you are not already using the |sysvm64-version| System VM template you will need to
+ upgrade your System VM template prior to performing the upgrade of the
+ CloudStack packages.
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Packages repository
-------------------
@@ -109,22 +103,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu411:
.. _apt-repo411:
@@ -347,7 +325,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.12.rst b/source/upgrading/upgrade/upgrade-4.12.rst
index 70db11a991..be40e28b6e 100644
--- a/source/upgrading/upgrade/upgrade-4.12.rst
+++ b/source/upgrading/upgrade/upgrade-4.12.rst
@@ -54,6 +54,8 @@ Overview of Upgrade Steps:
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Packages repository
-------------------
@@ -99,22 +101,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu412:
.. _apt-repo412:
@@ -126,7 +112,7 @@ Ubuntu
######
If you are using Ubuntu, follow this procedure to upgrade your packages. If
-not, skip to step :ref:`rhel411`.
+not, skip to step :ref:`rhel412`.
.. note::
**Community Packages:** This section assumes you're using the community
@@ -147,13 +133,13 @@ This file should have one line, which contains:
.. parsed-literal::
- deb http://download.cloudstack.org/ubuntu precise 4.12
+ deb http://download.cloudstack.org/ubuntu bionic 4.12
We'll change it to point to the new package repository:
.. parsed-literal::
- deb http://download.cloudstack.org/ubuntu precise |version|
+ deb http://download.cloudstack.org/ubuntu bionic |version|
Setup the public key for the above repository:
@@ -214,7 +200,7 @@ This file should have content similar to the following:
[apache-cloudstack]
name=Apache CloudStack
- baseurl=http://download.cloudstack.org/centos/6/4.12/
+ baseurl=http://download.cloudstack.org/centos/7/4.12/
enabled=1
gpgcheck=0
@@ -285,7 +271,7 @@ steps will not affect running guests in the cloud. These steps are
required only for clouds using KVM as hosts and only on the KVM
hosts.
-#. Configure the :ref:`APT repo ` as detailed above.
+#. Configure the :ref:`APT repo ` as detailed above.
#. Stop the running agent.
@@ -320,7 +306,7 @@ KVM on CentOS/RHEL
For KVM hosts, upgrade the ``cloudstack-agent`` package
-#. Configure the :ref:`rpm-repo411` as detailed above.
+#. Configure the :ref:`rpm-repo412` as detailed above.
.. parsed-literal::
@@ -340,7 +326,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.13.rst b/source/upgrading/upgrade/upgrade-4.13.rst
new file mode 100644
index 0000000000..d1c9d25231
--- /dev/null
+++ b/source/upgrading/upgrade/upgrade-4.13.rst
@@ -0,0 +1,347 @@
+.. 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.
+
+.. |version_to_upgrade| replace:: 4.13.x
+
+Upgrade Instruction from |version_to_upgrade|
+=============================================
+
+This section will guide you from CloudStack |version_to_upgrade| to latest
+CloudStack |release|.
+
+Any steps that are hypervisor-specific will be called out with a note.
+
+We recommend reading through this section once or twice before beginning
+your upgrade procedure, and working through it on a test system before
+working on a production system.
+
+.. note::
+ The following upgrade instructions should be performed regardless of
+ hypervisor type.
+
+Overview of Upgrade Steps:
+----------------------------
+
+#. Check any customisations and integrations
+#. Upload the |sysvm64-version| System VM template if not already using it.
+#. Stop all running management servers
+#. Backup CloudStack database (MySQL)
+#. Upgrade 1st CloudStack management server
+#. Update hypervisors specific dependencies
+#. Restart 1st management server
+#. Check that your upgraded environment works as expected
+#. Upgrade and restart the remaining management servers
+
+
+.. include:: _customisation_warnings.rst
+
+.. warning::
+ If you are not already using the |sysvm64-version| System VM template you will need to
+ upgrade your System VM template prior to performing the upgrade of the
+ CloudStack packages.
+
+.. include:: _sysvm_templates.rst
+
+.. include:: _java_version.rst
+
+Packages repository
+-------------------
+
+Most users of CloudStack manage the installation and upgrades of
+CloudStack with one of Linux's predominant package systems, RPM or
+APT. This guide assumes you'll be using RPM and Yum (for Red Hat
+Enterprise Linux or CentOS), or APT and Debian packages (for Ubuntu).
+
+Create RPM or Debian packages (as appropriate) and a repository from
+the |release| source, or check the Apache CloudStack downloads page at
+http://cloudstack.apache.org/downloads.html
+for package repositories supplied by community members. You will need
+them for :ref:`ubuntu413` or :ref:`rhel413` and :ref:`kvm413` hosts upgrade.
+
+Instructions for creating packages from the CloudStack source are in the
+`CloudStack Installation Guide`_.
+
+Database Preparation
+--------------------
+
+Backup current database
+
+#. Stop your management server or servers. Run this on all management
+ server hosts:
+
+ .. parsed-literal::
+
+ $ sudo service cloudstack-management stop
+
+#. If you are running a usage server or usage servers, stop those as well:
+
+ .. parsed-literal::
+
+ $ sudo service cloudstack-usage stop
+
+#. Make a backup of your MySQL database. If you run into any issues or
+ need to roll back the upgrade, this will assist in debugging or
+ restoring your existing environment. You'll be prompted for your
+ password.
+
+ .. parsed-literal::
+
+ $ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
+ $ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
+
+
+.. _ubuntu413:
+.. _apt-repo413:
+
+Management Server
+-----------------
+
+Ubuntu
+######
+
+If you are using Ubuntu, follow this procedure to upgrade your packages. If
+not, skip to step :ref:`rhel413`.
+
+.. note::
+ **Community Packages:** This section assumes you're using the community
+ supplied packages for CloudStack. If you've created your own packages and
+ APT repository, substitute your own URL for the ones used in these examples.
+
+The first order of business will be to change the sources list for
+each system with CloudStack packages. This means all management
+servers, and any hosts that have the KVM agent. (No changes should
+be necessary for hosts that are running VMware or Xen.)
+
+
+
+Start by opening ``/etc/apt/sources.list.d/cloudstack.list`` on
+any systems that have CloudStack packages installed.
+
+This file should have one line, which contains:
+
+.. parsed-literal::
+
+ deb http://download.cloudstack.org/ubuntu bionic 4.13
+
+We'll change it to point to the new package repository:
+
+.. parsed-literal::
+
+ deb http://download.cloudstack.org/ubuntu bionic |version|
+
+
+
+Setup the public key for the above repository:
+
+.. parsed-literal::
+
+ wget -qO - http://download.cloudstack.org/release.asc | sudo apt-key add -
+
+If you're using your own package repository, change this line to
+read as appropriate for your |version| repository.
+
+#. Now update your apt package list:
+
+ .. parsed-literal::
+
+ $ sudo apt-get update
+
+#. Now that you have the repository configured, it's time to upgrade
+ the ``cloudstack-management`` package.
+
+ .. parsed-literal::
+
+ $ sudo apt-get upgrade cloudstack-management
+
+#. If you use CloudStack usage server
+
+ .. parsed-literal::
+
+ $ sudo apt-get upgrade cloudstack-usage
+
+
+.. _rhel413:
+.. _rpm-repo413:
+
+CentOS/RHEL
+##############
+
+If you are using CentOS or RHEL, follow this procedure to upgrade your
+packages. If not, skip to hypervisors section :ref:`upg_hyp_413`.
+
+.. note::
+ **Community Packages:** This section assumes you're using the community
+ supplied packages for CloudStack. If you've created your own packages and
+ yum repository, substitute your own URL for the ones used in these examples.
+
+The first order of business will be to change the yum repository
+for each system with CloudStack packages. This means all
+management servers, and any hosts that have the KVM agent.
+
+(No changes should be necessary for hosts that are running VMware
+or Xen.)
+
+Start by opening ``/etc/yum.repos.d/cloudstack.repo`` on any
+systems that have CloudStack packages installed.
+
+This file should have content similar to the following:
+
+.. parsed-literal::
+
+ [apache-cloudstack]
+ name=Apache CloudStack
+ baseurl=http://download.cloudstack.org/centos/7/4.13/
+ enabled=1
+ gpgcheck=0
+
+If you are using the community provided package repository, change
+the base url to:
+
+.. parsed-literal::
+
+ http://download.cloudstack.org/centos/$releasever/|version|/
+
+Setup the GPG public key if you wish to enable ``gpgcheck=1``:
+
+.. parsed-literal::
+
+ rpm --import http://download.cloudstack.org/RPM-GPG-KEY
+
+
+
+If you're using your own package repository, change this line to
+read as appropriate for your |version| repository.
+
+#. Now that you have the repository configured, it's time to upgrade the
+ ``cloudstack-management``.
+
+ .. parsed-literal::
+
+ $ sudo yum upgrade cloudstack-management
+
+#. If you use CloudStack usage server
+
+ .. parsed-literal::
+
+ $ sudo yum upgrade cloudstack-usage
+
+.. _upg_hyp_413:
+
+Upgrade Hypervisors
+-------------------
+
+Hypervisor: XenServer
+#####################
+
+
+No additional steps are required for XenServer Hypervisor for this upgrade.
+
+
+Hypervisor: VMware
+###################
+
+.. warning::
+ For VMware hypervisor CloudStack management server packages must be
+ build using "noredist". Refer to :ref:`building-noredist`.
+
+
+No additional steps are requried for the VMware Hypervisor for this upgrade.
+
+
+.. _kvm413:
+
+Hypervisor: KVM
+#################
+
+KVM on Ubuntu
+""""""""""""""
+
+(KVM only) Additional steps are required for each KVM host. These
+steps will not affect running guests in the cloud. These steps are
+required only for clouds using KVM as hosts and only on the KVM
+hosts.
+
+#. Configure the :ref:`APT repo ` as detailed above.
+
+#. Stop the running agent.
+
+ .. parsed-literal::
+
+ $ sudo service cloudstack-agent stop
+
+#. Update the agent software.
+
+ .. parsed-literal::
+
+ $ sudo apt-get upgrade cloudstack-agent
+
+#. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a
+ line that reads:
+
+ .. parsed-literal::
+
+ paths.script=/usr/share/cloudstack-common
+
+ If not, add the line.
+
+#. Start the agent.
+
+ .. parsed-literal::
+
+ $ sudo service cloudstack-agent start
+
+
+KVM on CentOS/RHEL
+"""""""""""""""""""
+
+For KVM hosts, upgrade the ``cloudstack-agent`` package
+
+#. Configure the :ref:`rpm-repo413` as detailed above.
+
+ .. parsed-literal::
+
+ $ sudo yum upgrade cloudstack-agent
+
+#. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a
+ line that reads:
+
+ .. parsed-literal::
+
+ paths.script=/usr/share/cloudstack-common
+
+ If not, add the line.
+
+#. Restart the agent:
+
+ .. parsed-literal::
+
+ $ sudo service cloudstack-agent stop
+ $ sudo service cloudstack-agent start
+
+
+Restart management services
+---------------------------
+
+#. Now it's time to start the management server
+
+ .. parsed-literal::
+
+ $ sudo service cloudstack-management start
+
+#. If you use it, start the usage server
+
+ .. parsed-literal::
+
+ $ sudo service cloudstack-usage start
diff --git a/source/upgrading/upgrade/upgrade-4.2.rst b/source/upgrading/upgrade/upgrade-4.2.rst
index cd782ccf2d..564e886e33 100644
--- a/source/upgrading/upgrade/upgrade-4.2.rst
+++ b/source/upgrading/upgrade/upgrade-4.2.rst
@@ -56,6 +56,8 @@ Instructions for creating packages from the CloudStack source are in the
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Database Preparation
--------------------
@@ -86,23 +88,6 @@ Backup current database
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
-
.. _ubuntu42:
Management Server Ubuntu
@@ -123,7 +108,6 @@ be necessary for hosts that are running VMware or Xen.)
.. _apt-repo42:
-.. include:: _java_8_ubuntu.rst
CloudStack apt repository
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -397,7 +381,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.3.rst b/source/upgrading/upgrade/upgrade-4.3.rst
index 491cc194ac..08aa3d05c1 100644
--- a/source/upgrading/upgrade/upgrade-4.3.rst
+++ b/source/upgrading/upgrade/upgrade-4.3.rst
@@ -60,6 +60,8 @@ Instructions for creating packages from the CloudStack source are in the
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Database Preparation
--------------------
@@ -89,22 +91,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu43:
@@ -127,7 +113,6 @@ be necessary for hosts that are running VMware or Xen.)
.. _apt-repo43:
-.. include:: _java_8_ubuntu.rst
CloudStack apt repository
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -402,7 +387,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.4.rst b/source/upgrading/upgrade/upgrade-4.4.rst
index 67f1223c66..df1b2f71ae 100644
--- a/source/upgrading/upgrade/upgrade-4.4.rst
+++ b/source/upgrading/upgrade/upgrade-4.4.rst
@@ -60,6 +60,8 @@ Instructions for creating packages from the CloudStack source are in the
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Database Preparation
--------------------
@@ -89,22 +91,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu44:
@@ -127,7 +113,6 @@ be necessary for hosts that are running VMware or Xen.)
.. _apt-repo44:
-.. include:: _java_8_ubuntu.rst
CloudStack apt repository
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -404,7 +389,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.5.rst b/source/upgrading/upgrade/upgrade-4.5.rst
index 7e7d5b4886..92fc4b9d3f 100644
--- a/source/upgrading/upgrade/upgrade-4.5.rst
+++ b/source/upgrading/upgrade/upgrade-4.5.rst
@@ -53,6 +53,8 @@ Upgrade Steps:
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Packages repository
-------------------
@@ -98,22 +100,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu45:
@@ -136,7 +122,6 @@ be necessary for hosts that are running VMware or Xen.)
.. _apt-repo45:
-.. include:: _java_8_ubuntu.rst
CloudStack apt repository
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -415,7 +400,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.6.rst b/source/upgrading/upgrade/upgrade-4.6.rst
index e308b04e40..1cb4d26b8a 100644
--- a/source/upgrading/upgrade/upgrade-4.6.rst
+++ b/source/upgrading/upgrade/upgrade-4.6.rst
@@ -59,6 +59,8 @@ Instructions for creating packages from the CloudStack source are in the
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Database Preparation
--------------------
@@ -87,22 +89,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu46:
@@ -125,7 +111,6 @@ be necessary for hosts that are running VMware or Xen.)
.. _apt-repo46:
-.. include:: _java_8_ubuntu.rst
CloudStack apt repository
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -401,7 +386,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.7.rst b/source/upgrading/upgrade/upgrade-4.7.rst
index 0833c6d05f..c1115f6990 100644
--- a/source/upgrading/upgrade/upgrade-4.7.rst
+++ b/source/upgrading/upgrade/upgrade-4.7.rst
@@ -58,6 +58,8 @@ Instructions for creating packages from the CloudStack source are in the
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Database Preparation
--------------------
@@ -86,22 +88,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu47:
@@ -124,7 +110,6 @@ be necessary for hosts that are running VMware or Xen.)
.. _apt-repo47:
-.. include:: _java_8_ubuntu.rst
CloudStack apt repository
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -398,7 +383,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.8.rst b/source/upgrading/upgrade/upgrade-4.8.rst
index 6cdc837287..2400b5330d 100644
--- a/source/upgrading/upgrade/upgrade-4.8.rst
+++ b/source/upgrading/upgrade/upgrade-4.8.rst
@@ -41,6 +41,8 @@ Upgrade Steps:
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Packages repository
-------------------
@@ -87,22 +89,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu48:
@@ -125,7 +111,6 @@ be necessary for hosts that are running VMware or Xen.)
.. _apt-repo48:
-.. include:: _java_8_ubuntu.rst
CloudStack apt repository
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -401,7 +386,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade-4.9.rst b/source/upgrading/upgrade/upgrade-4.9.rst
index d19e22dea1..e6a8a7edc8 100644
--- a/source/upgrading/upgrade/upgrade-4.9.rst
+++ b/source/upgrading/upgrade/upgrade-4.9.rst
@@ -56,6 +56,8 @@ Overview of Upgrade Steps:
.. include:: _sysvm_templates.rst
+.. include:: _java_version.rst
+
Packages repository
-------------------
@@ -102,22 +104,6 @@ Backup current database
$ mysqldump -u root -p cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
$ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
-#. **(KVM Only)** If primary storage of type local storage is in use, the
- path for this storage needs to be verified to ensure it passes new
- validation. Check local storage by querying the cloud.storage\_pool
- table:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
-
- If local storage paths are found to have a trailing forward slash,
- remove it:
-
- .. parsed-literal::
-
- $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
-
.. _ubuntu49:
.. _apt-repo49:
@@ -141,7 +127,6 @@ each system with CloudStack packages. This means all management
servers, and any hosts that have the KVM agent. (No changes should
be necessary for hosts that are running VMware or Xen.)
-.. include:: _java_8_ubuntu.rst
Start by opening ``/etc/apt/sources.list.d/cloudstack.list`` on
any systems that have CloudStack packages installed.
@@ -412,7 +397,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
.. parsed-literal::
$ sudo service cloudstack-agent stop
- $ sudo killall jsvc
$ sudo service cloudstack-agent start
diff --git a/source/upgrading/upgrade/upgrade_notes.rst b/source/upgrading/upgrade/upgrade_notes.rst
index 713c5b16ee..cd53754549 100644
--- a/source/upgrading/upgrade/upgrade_notes.rst
+++ b/source/upgrading/upgrade/upgrade_notes.rst
@@ -18,15 +18,28 @@ General Upgrade Notes
=====================
-Java version upgraded to Java 1.8
+Java version upgraded to Java 11
---------------------------------
-As of Apache CloudStack 4.10, Java version required is 1.8 for the
+As of Apache CloudStack 4.14, Java version required is 11 for the
management-server, cloudstack-usage, KVM agent and system-VMs.
-.. include:: _java_8_ubuntu.rst
+.. include:: _java_version.rst
+UI Deprecation Notice
+---------------------
+
+The current jQuery-based CloudStack UI will be `deprecated
+`_ in the next Apache CloudStack
+major release and removed in the subsequent future releases.
+
+`Primate `_ will ship as the
+modern UI for future Apache CloudStack releases. Users are encouraged to `test
+`_
+Primate, report bugs and give feedback to the `dev community
+`_ with this release of Apache
+CloudStack.
Migrating to dynamic roles feature
----------------------------------
@@ -95,12 +108,3 @@ added in CloudStack's db.properties file:
db.cloud.driver=jdbc:mysql
db.usage.driver=jdbc:mysql
-
-
-Other Notes
------------
-
-If you are experiencing CloudStack UI issues, please consider upgrading your
-tomcat instance to version 6.0.43 (tested version, but earlier versions prior
-to 6.0.37 might work as well), to address the tomcat response issues caused by
-latency between the browser/client and CloudStack Management server.