apache · andrijapanicsb · Apr 29, 2020 · Jan 9, 2020 · Jan 9, 2020 · Jan 9, 2020
diff --git 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
@@ -20,13 +20,13 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Apache CloudStack'
-copyright = '2018, Apache Foundation'
+copyright = '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
@@ -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 → source/upgrading/upgrade/_java_version.rst b/source/upgrading/upgrade/_java_8_ubuntu.rst → 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 <http://repos.azulsystems.com/>`_ OpenJDK distribution from Azul.
diff --git 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
@@ -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.
@@ -414,7 +399,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
@@ -49,21 +49,10 @@ 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.
-
 .. include:: _sysvm_templates.rst
 
+.. include:: _java_version.rst
+
 Packages repository
 -------------------
 
@@ -109,22 +98,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 +320,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
@@ -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:
@@ -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
 
@@ -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