This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch security-tls-config
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git

commit 857094013fcc4bdedf7bdf1b4f05bde0a1f44181
Author: Paul Angus <paul.an...@shapeblue.com>
AuthorDate: Wed Nov 14 17:48:07 2018 +0000

    4.11.2 - initial documentation update (WIP)
---
 .gitignore                                         |   1 +
 source/_global.rst                                 |  17 +-
 source/conceptsandterminology/network_setup.rst    |   2 +-
 source/conf.py                                     |   2 +-
 .../installguide/management-server/_systemvm.rst   |  12 +-
 source/releasenotes/about.rst                      |   7 +
 source/releasenotes/fixed_issues.rst               | 258 ++++++++++++++++++++-
 source/upgrading/upgrade/_mysql_connector.rst      |   6 +-
 source/upgrading/upgrade/_sysvm_templates.rst      |  16 +-
 source/upgrading/upgrade/upgrade-4.10.rst          |   3 -
 source/upgrading/upgrade/upgrade-4.11.rst          |  90 +------
 11 files changed, 306 insertions(+), 108 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/source/_global.rst b/source/_global.rst
index ca35d38..3167d2d 100644
--- a/source/_global.rst
+++ b/source/_global.rst
@@ -23,12 +23,19 @@
 
 .. |documentation_home| replace:: http://docs.cloudstack.apache.org/
 
+.. Latest version systemvm template name
+.. |sysvm64-name-xen|    replace:: systemvm-xenserver-4.11.2
+.. |sysvm64-name-kvm|    replace:: systemvm-kvm-4.11.2
+.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.11.2
+.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.11.2
+.. |sysvm64-name-ovm|    replace:: systemvm-ovm-4.11.2
+
 .. Latest version systemvm template URL
-.. |sysvm64-url-xen|    replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-xen.vhd.bz2
-.. |sysvm64-url-kvm|    replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-kvm.qcow2.bz2
-.. |sysvm64-url-vmware| replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-vmware.ova
-.. |sysvm64-url-hyperv| replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-hyperv.vhd.zip
-.. |sysvm64-url-ovm|    replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-ovm.raw.bz2
+.. |sysvm64-url-xen|    replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-xen.vhd.bz2
+.. |sysvm64-url-kvm|    replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-kvm.qcow2.bz2
+.. |sysvm64-url-vmware| replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-vmware.ova
+.. |sysvm64-url-hyperv| replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-hyperv.vhd.zip
+.. |sysvm64-url-ovm|    replace:: 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-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/conceptsandterminology/network_setup.rst 
b/source/conceptsandterminology/network_setup.rst
index 08ddf5e..1137dc9 100644
--- a/source/conceptsandterminology/network_setup.rst
+++ b/source/conceptsandterminology/network_setup.rst
@@ -619,7 +619,7 @@ Adding a VNMC Instance
 
 #. Click OK.
 
-.. adding-an-asa-1000v-instance:
+.. _adding-an-asa-1000v-instance:
 
 Adding an ASA 1000v Instance
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/source/conf.py b/source/conf.py
index 5bc7660..0fbfe0d 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -26,7 +26,7 @@ author = 'Apache CloudStack Project'
 # The short X.Y version
 version = '4.11'
 # The full version, including alpha/beta/rc tags
-release = '4.11.1.0'
+release = '4.11.2.0'
 
 rst_epilog = """
 .. include:: /_global.rst 
diff --git a/source/installguide/management-server/_systemvm.rst 
b/source/installguide/management-server/_systemvm.rst
index 9bbb197..744c1c7 100644
--- a/source/installguide/management-server/_systemvm.rst
+++ b/source/installguide/management-server/_systemvm.rst
@@ -45,7 +45,7 @@ CloudStack system VMs.
 
          
/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-hyperv.vhd.zip
 \
+         -u |sysvm64-url-hyperv| \
          -h hyperv \
          -s <optional-management-server-secret-key> \
          -F
@@ -56,7 +56,7 @@ CloudStack system VMs.
 
          
/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-xen.vhd.bz2
 \
+         -u |sysvm64-url-xen| \
          -h xenserver \
          -s <optional-management-server-secret-key> \
          -F
@@ -67,7 +67,7 @@ CloudStack system VMs.
 
          
/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-vmware.ova 
\
+         -u |sysvm64-url-vmware| \
          -h vmware \
          -s <optional-management-server-secret-key> \
          -F
@@ -78,7 +78,7 @@ CloudStack system VMs.
 
          
/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-kvm.qcow2.bz2
 \
+         -u |sysvm64-name-kvm| \
          -h kvm \
          -s <optional-management-server-secret-key> \
          -F
@@ -89,7 +89,7 @@ CloudStack system VMs.
 
          
/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.1-kvm.qcow2.bz2
 \
+         -u |sysvm64-name-kvm| \
          -h lxc \
          -s <optional-management-server-secret-key> \
          -F
@@ -100,7 +100,7 @@ CloudStack system VMs.
 
          
/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u 
http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.0-ovm.raw.bz2
 \
+         -u |sysvm64-url-ovm| \
          -h ovm3 \
          -s <optional-management-server-secret-key> \
          -F
diff --git a/source/releasenotes/about.rst b/source/releasenotes/about.rst
index 0a9cad5..549ade6 100644
--- a/source/releasenotes/about.rst
+++ b/source/releasenotes/about.rst
@@ -17,6 +17,13 @@
 What's New in |release|
 =======================
 
+What's New in 4.11.2.0
+----------------------
+
+The new |release| version is a |version| maintainance release containing over 
70
+fixes and improvements on the 4.11.1.0 release.
+
+
 What's New in 4.11.1.0
 ----------------------
 
diff --git a/source/releasenotes/fixed_issues.rst 
b/source/releasenotes/fixed_issues.rst
index 6ae16b1..562be2e 100644
--- a/source/releasenotes/fixed_issues.rst
+++ b/source/releasenotes/fixed_issues.rst
@@ -18,13 +18,269 @@
 Issues Fixed in |release|
 =========================
 
-Apache CloudStack uses `Jira 
<https://issues.apache.org/jira/browse/CLOUDSTACK>`_ 
+Apache CloudStack now uses GitHub 
<https://github.com/apache/cloudstack/issues>`_ 
+to track its issues. links to the GitHub pull requests have been included at 
the end
+of each section. 
+
+Apache CloudStack previously used `Jira 
<https://issues.apache.org/jira/browse/CLOUDSTACK>`_ 
 to track its issues and `Github <https://github.com/apache/cloudstack/pulls>`_ 
for 
 pull requests. All new features and bugs for |version| have been merged through
 Github pull requests.  A subset of these changes are tracked in Jira, which 
have a 
 standard naming convention of "CLOUDSTACK-NNNN" where "NNNN" is the issue 
number.
 
 
+Issues Fixed in 4.11.2.0
+------------------------
+
+.. cssclass:: table-striped table-bordered table-hover
+
+
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| Version                 | Github   | Type          | Priority | Description  
                                              |
++=========================+==========+===============+==========+============================================================+
+| 4.11.2.0                | `#3021`_ |               |          | Skip network 
migration tests for not supported hypervisors |
+|                         |          |               |          | instead of 
failing                                         |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#3022`_ |               |          | 
systemvmtemplate: update debian 9.6 iso url and checksum   |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#3012`_ |               |          | 
CLOUDSTACK-3009: Fixed resource calculation CPU, RAM for   |
+|                         |          |               |          | accounts.    
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#3018`_ |               |          | Prevent 
error on GroupAnswers on VR creation               |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#3007`_ |               |          | Add missing 
ConfigDrive entries on existing zones after    |
+|                         |          |               |          | upgrade      
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2980`_ |               |          | [4.11] Fix 
set initial reservation on public IP ranges     |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#3010`_ |               |          | Fix 
DirectNetworkGuru canHandle checks for lowercase       |
+|                         |          |               |          | isolation 
methods                                          |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2984`_ |               |          | kvm: reset 
KVM host on heartbeat failure                   |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2928`_ |               |          | Migrating VM 
from ISO failures                             |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2979`_ |               |          | vr: defer 
was broken in VR because of json name change     |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2927`_ |               |          | server: fix 
unwanted txn commit warning messages           |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2923`_ |               |          | Improved 
perfomance on creating VM (KVM)                   |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2926`_ |               |          | network: on 
rolling restart force stop old routers         |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2915`_ |               |          | packaging: 
install plugins at                              |
+|                         |          |               |          | 
/usr/share/cloudstack-management/lib                       |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2916`_ |               |          | systemvm: 
Ensure cloud service reboots after failure       |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2907`_ |               |          | client: mgmt 
server listen default to 0.0.0.0              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2911`_ |               |          | Unify 
templates/ISOs checksum API output                   |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2900`_ |               |          | network: 
Allow ability to disable rolling restart feature  |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2904`_ |               |          | agent: Fixes 
#2899 on shutdown don't allow server          |
+|                         |          |               |          | reconnection 
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2902`_ |               |          | Add checksum 
sanity validation on template registration    |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2903`_ |               |          | Set http 
level to INFO as default                          |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2892`_ |               |          | vr: memory 
and swap optimizations                          |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2876`_ |               |          | 
PULL_REQUEST_TEMPLATE: simplify and remove unpopular       |
+|                         |          |               |          | sections     
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2888`_ |               |          | router: 
Fixes #2719 program VR nics by device id order for |
+|                         |          |               |          | VPC          
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2889`_ |               |          | Fixes: #2881 
Improve Exception message                     |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2884`_ |               |          | add date to 
usage server logs                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2879`_ |               |          | ca: Fixes 
#2877 mgmt server cert should have all addrs of  |
+|                         |          |               |          | default nic  
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2878`_ |               |          | Fixed Issue 
2868, libvirt resize notify failure            |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2875`_ |               |          | CertUtils: 
export private key to pem format correctly      |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2866`_ |               |          | systemvm: 
baremetal-vr: reduce memory usage                |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2743`_ |               |          | 
CLOUDSTACK-10380: Fix startvm giving another pw after pw   |
+|                         |          |               |          | reset        
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2860`_ |               |          | packaging: 
Fixes #2857 don't overwrite agent logrotate     |
+|                         |          |               |          | config       
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2859`_ |               |          | agent: Fixes 
#2858 agent LB not working                    |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2855`_ |               |          | systemvm: 
export $TYPE before patching ssvm/cpvm           |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2852`_ |               |          | Make 
networkofferingid required in migrateNetwork          |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2846`_ |               |          | Fix 
PowerReportMissing for new VRs                         |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2840`_ |               |          | Fix for 
Vmware full clones update                          |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2799`_ |               |          | 
systemvmtemplate: new 4.11.2 template and fixes            |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2829`_ |               |          | 
CLOUDSTACK-9473: storage pool capacity check when volume   |
+|                         |          |               |          | is resized 
or migrated                                     |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2824`_ |               |          | Fix 
SystemVMs running in Xen HVM mode are not configured   |
+|                         |          |               |          | (#2760)      
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2836`_ |               |          | Volume 
snapshot recurring schedule not showing             |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2825`_ |               |          | expunge if 
flag is set                                     |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2832`_ |               |          | Bigger 
partiton table for SVM & ambigous redirect bugfix   |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2806`_ |               |          | ajusting 
dict to pass on if tests later on code, in this   |
+|                         |          |               |          | way arping 
i?                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2819`_ |               |          | KVM hook 
script include                                    |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2091`_ |               |          | 
CLOUDSTACK-8609: [VMware] VM is not accessible after       |
+|                         |          |               |          | migration 
across clusters                                  |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2815`_ |               |          | display 
translation labels as html instead of plain text   |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2722`_ |               |          | 
CLOUDSTACK-10310 Fix KVM reboot on storage issue           |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2810`_ |               |          | Project 
drop-down refresh data fix                         |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2809`_ |               |          | Backport 
Update DBCP version to 4.11                       |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2811`_ |               |          | Fix a typo 
in                                              |
+|                         |          |               |          | 
server/src/com/cloud/vm/UserVmManagerImpl.java             |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2776`_ |               |          | Issue 2774: 
Changed the implementation of                  |
+|                         |          |               |          | 
isVolumeOnManagedStorage(VolumeInfo) to?                   |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2794`_ |               |          | vmware: 
reboot VR after mac updates                        |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2790`_ |               |          | add height 
sizing to detail view so that it renders all    |
+|                         |          |               |          | detail items 
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2788`_ |               |          | data table 
header cursor type and title                    |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2785`_ |               |          | change 
dashboard events cursor to default to prevent user  |
+|                         |          |               |          | confusion    
                                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2784`_ |               |          | insert 
plugin css files before custom.css file             |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2782`_ |               |          | add 
ipaddress input field to 'Add network to VM' form      |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2791`_ |               |          | router: 
Fixes #2789 fix proper mark based packet routing   |
+|                         |          |               |          | across 
interfaces                                          |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2792`_ |               |          | Fix issue 
when multiple cidrs with different sizes are     |
+|                         |          |               |          | assigned on 
a VR                                           |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2781`_ |               |          | hvm checkbox 
visibility                                    |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2775`_ |               |          | Fix typo in 
ISO url                                        |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2778`_ |               |          | reset ssh 
key pair visibility                              |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2769`_ |               |          | Fix config 
drive iso path on Vmware                        |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2747`_ |               |          | systemvm: 
Update ISO URLs to the latest                    |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2734`_ |               |          | Fix invalid 
consoleproxy url after upgrade                 |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2767`_ |               |          | storage 
traffic type reset ui fix                          |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2757`_ |               |          | register 
template kvm context ui fix                       |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2709`_ |               |          | check 
volumes for state when retrieving pool for           |
+|                         |          |               |          | configDrive 
creation                                       |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2728`_ |               |          | Consistence 
POM version for 4.11.x.y                       |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+| 4.11.2.0                | `#2727`_ |               |          | maven: bump 
up vmware sdk jar to 6.7                       |
++-------------------------+----------+---------------+----------+------------------------------------------------------------+
+
+71 Issues listed
+
+GitHub links to listed issues:
+
+.. _`#3021`: https://github.com/apache/cloudstack/pull/3021 
+.. _`#3022`: https://github.com/apache/cloudstack/pull/3022 
+.. _`#3012`: https://github.com/apache/cloudstack/pull/3012 
+.. _`#3018`: https://github.com/apache/cloudstack/pull/3018 
+.. _`#3007`: https://github.com/apache/cloudstack/pull/3007 
+.. _`#2980`: https://github.com/apache/cloudstack/pull/2980 
+.. _`#3010`: https://github.com/apache/cloudstack/pull/3010 
+.. _`#2984`: https://github.com/apache/cloudstack/pull/2984 
+.. _`#2928`: https://github.com/apache/cloudstack/pull/2928 
+.. _`#2979`: https://github.com/apache/cloudstack/pull/2979 
+.. _`#2927`: https://github.com/apache/cloudstack/pull/2927 
+.. _`#2923`: https://github.com/apache/cloudstack/pull/2923 
+.. _`#2926`: https://github.com/apache/cloudstack/pull/2926 
+.. _`#2915`: https://github.com/apache/cloudstack/pull/2915 
+.. _`#2916`: https://github.com/apache/cloudstack/pull/2916 
+.. _`#2907`: https://github.com/apache/cloudstack/pull/2907 
+.. _`#2911`: https://github.com/apache/cloudstack/pull/2911 
+.. _`#2900`: https://github.com/apache/cloudstack/pull/2900 
+.. _`#2904`: https://github.com/apache/cloudstack/pull/2904 
+.. _`#2902`: https://github.com/apache/cloudstack/pull/2902 
+.. _`#2903`: https://github.com/apache/cloudstack/pull/2903 
+.. _`#2892`: https://github.com/apache/cloudstack/pull/2892 
+.. _`#2876`: https://github.com/apache/cloudstack/pull/2876 
+.. _`#2888`: https://github.com/apache/cloudstack/pull/2888 
+.. _`#2889`: https://github.com/apache/cloudstack/pull/2889 
+.. _`#2884`: https://github.com/apache/cloudstack/pull/2884 
+.. _`#2879`: https://github.com/apache/cloudstack/pull/2879 
+.. _`#2878`: https://github.com/apache/cloudstack/pull/2878 
+.. _`#2875`: https://github.com/apache/cloudstack/pull/2875 
+.. _`#2866`: https://github.com/apache/cloudstack/pull/2866 
+.. _`#2743`: https://github.com/apache/cloudstack/pull/2743 
+.. _`#2860`: https://github.com/apache/cloudstack/pull/2860 
+.. _`#2859`: https://github.com/apache/cloudstack/pull/2859 
+.. _`#2855`: https://github.com/apache/cloudstack/pull/2855 
+.. _`#2852`: https://github.com/apache/cloudstack/pull/2852 
+.. _`#2846`: https://github.com/apache/cloudstack/pull/2846 
+.. _`#2840`: https://github.com/apache/cloudstack/pull/2840 
+.. _`#2799`: https://github.com/apache/cloudstack/pull/2799 
+.. _`#2829`: https://github.com/apache/cloudstack/pull/2829 
+.. _`#2824`: https://github.com/apache/cloudstack/pull/2824 
+.. _`#2836`: https://github.com/apache/cloudstack/pull/2836 
+.. _`#2825`: https://github.com/apache/cloudstack/pull/2825 
+.. _`#2832`: https://github.com/apache/cloudstack/pull/2832 
+.. _`#2806`: https://github.com/apache/cloudstack/pull/2806 
+.. _`#2819`: https://github.com/apache/cloudstack/pull/2819 
+.. _`#2091`: https://github.com/apache/cloudstack/pull/2091 
+.. _`#2815`: https://github.com/apache/cloudstack/pull/2815 
+.. _`#2722`: https://github.com/apache/cloudstack/pull/2722 
+.. _`#2810`: https://github.com/apache/cloudstack/pull/2810 
+.. _`#2809`: https://github.com/apache/cloudstack/pull/2809 
+.. _`#2811`: https://github.com/apache/cloudstack/pull/2811 
+.. _`#2776`: https://github.com/apache/cloudstack/pull/2776 
+.. _`#2794`: https://github.com/apache/cloudstack/pull/2794 
+.. _`#2790`: https://github.com/apache/cloudstack/pull/2790 
+.. _`#2788`: https://github.com/apache/cloudstack/pull/2788 
+.. _`#2785`: https://github.com/apache/cloudstack/pull/2785 
+.. _`#2784`: https://github.com/apache/cloudstack/pull/2784 
+.. _`#2782`: https://github.com/apache/cloudstack/pull/2782 
+.. _`#2791`: https://github.com/apache/cloudstack/pull/2791 
+.. _`#2792`: https://github.com/apache/cloudstack/pull/2792 
+.. _`#2781`: https://github.com/apache/cloudstack/pull/2781 
+.. _`#2775`: https://github.com/apache/cloudstack/pull/2775 
+.. _`#2778`: https://github.com/apache/cloudstack/pull/2778 
+.. _`#2769`: https://github.com/apache/cloudstack/pull/2769 
+.. _`#2747`: https://github.com/apache/cloudstack/pull/2747 
+.. _`#2734`: https://github.com/apache/cloudstack/pull/2734 
+.. _`#2767`: https://github.com/apache/cloudstack/pull/2767 
+.. _`#2757`: https://github.com/apache/cloudstack/pull/2757 
+.. _`#2709`: https://github.com/apache/cloudstack/pull/2709 
+.. _`#2728`: https://github.com/apache/cloudstack/pull/2728 
+.. _`#2727`: https://github.com/apache/cloudstack/pull/2727 
+
+
+
 Issues Fixed in 4.11.1.0
 ------------------------
 
diff --git a/source/upgrading/upgrade/_mysql_connector.rst 
b/source/upgrading/upgrade/_mysql_connector.rst
index a2afa31..77e0323 100644
--- a/source/upgrading/upgrade/_mysql_connector.rst
+++ b/source/upgrading/upgrade/_mysql_connector.rst
@@ -1,9 +1,9 @@
 Install new MySQL connector
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Apache CloudStack |release| require an upgrade of the MySQL connector on 
CentOS.
-Starting with 4.9.0, cloudstack-management RPM's now depend on
-``mysql-connector-python`` package.
+Starting with 4.9.0, cloudstack-management RPM's now depend on the
+``mysql-connector-python`` package. Therefore Apache CloudStack 
+|release| requires the instalation of the MySQL connector on CentOS.
 
 
 MySQL connector RPM repository
diff --git a/source/upgrading/upgrade/_sysvm_templates.rst 
b/source/upgrading/upgrade/_sysvm_templates.rst
index 45bee8c..9321a47 100644
--- a/source/upgrading/upgrade/_sysvm_templates.rst
+++ b/source/upgrading/upgrade/_sysvm_templates.rst
@@ -37,9 +37,9 @@ Update System-VM templates
    +------------+------------------------------------------------------------+
    | Hypervisor | Description                                                |
    +============+============================================================+
-   | XenServer  | Name: systemvm-xenserver-4.11.1                            |
+   | XenServer  | Name: |sysvm64-name-xen|                                   |
    |            |                                                            |
-   |            | Description: systemvm-xenserver-4.11.1                     |
+   |            | Description: |sysvm64-name-xen|                            |
    |            |                                                            |
    |            | URL: |sysvm64-url-xen|                                     |
    |            |                                                            |
@@ -63,9 +63,9 @@ Update System-VM templates
    |            |                                                            |
    |            | Routing: no                                                |
    +------------+------------------------------------------------------------+
-   | KVM        | Name: systemvm-kvm-4.11.1                                  |
+   | KVM        | Name: |sysvm64-name-kvm|                                   |
    |            |                                                            |
-   |            | Description: systemvm-kvm-4.11.1                           |
+   |            | Description: |sysvm64-name-kvm|                            |
    |            |                                                            |
    |            | URL: |sysvm64-url-kvm|                                     | 
 
    |            |                                                            |
@@ -89,9 +89,9 @@ Update System-VM templates
    |            |                                                            |
    |            | Routing: no                                                |
    +------------+------------------------------------------------------------+
-   | VMware     | Name: systemvm-vmware-4.11.1                               |
+   | VMware     | Name: |sysvm64-name-vmware|                                |
    |            |                                                            |
-   |            | Description: systemvm-vmware-4.11.1                        |
+   |            | Description: |sysvm64-name-vmware|                         |
    |            |                                                            |
    |            | URL: |sysvm64-url-vmware|                                  |
    |            |                                                            |
@@ -113,9 +113,9 @@ Update System-VM templates
    |            |                                                            |
    |            | Routing: no                                                |
    +------------+------------------------------------------------------------+
-   | HyperV     | Name: systemvm-hyperv-4.11.1                               |
+   | HyperV     | Name: |sysvm64-name-hyperv|                                |
    |            |                                                            |
-   |            | Description: systemvm-hyperv-4.11.1                        |
+   |            | Description: |sysvm64-name-hyperv|                         |
    |            |                                                            |
    |            | URL: |sysvm64-url-hyperv|                                  |
    |            |                                                            |
diff --git a/source/upgrading/upgrade/upgrade-4.10.rst 
b/source/upgrading/upgrade/upgrade-4.10.rst
index 2c3572b..3c00ee1 100644
--- a/source/upgrading/upgrade/upgrade-4.10.rst
+++ b/source/upgrading/upgrade/upgrade-4.10.rst
@@ -192,9 +192,6 @@ packages. If not, skip to hypervisors section 
:ref:`upg_hyp_410`.
    yum repository, substitute your own URL for the ones used in these examples.
 
 
-.. include:: _mysql_connector.rst
-
-
 .. _rpm-repo410:
 
 CloudStack RPM repository
diff --git a/source/upgrading/upgrade/upgrade-4.11.rst 
b/source/upgrading/upgrade/upgrade-4.11.rst
index 952d1cf..1c6af51 100644
--- a/source/upgrading/upgrade/upgrade-4.11.rst
+++ b/source/upgrading/upgrade/upgrade-4.11.rst
@@ -14,7 +14,7 @@
     under the License.
 
 
-.. |version_to_upgrade| replace:: 4.11.0.0
+.. |version_to_upgrade| replace:: 4.11.0.0 or 4.11.1
 
 Upgrade Instruction from |version_to_upgrade|
 =============================================
@@ -121,9 +121,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
-
 .. _apt-repo411:
 
 CloudStack apt repository
@@ -187,9 +184,6 @@ packages. If not, skip to hypervisors section 
:ref:`upg_hyp_411`.
    yum repository, substitute your own URL for the ones used in these examples.
 
 
-.. include:: _mysql_connector.rst
-
-
 .. _rpm-repo411:
 
 CloudStack RPM repository
@@ -244,17 +238,14 @@ read as appropriate for your |version| repository.
 
 .. _upg_hyp_411:
 
-Hypervisor: XenServer
----------------------
+Upgrade Hypervisors
+-------------------
 
-**(XenServer only)** Copy vhd-utils file on CloudStack management servers.
-Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_
-to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
 
-.. parsed-literal::
+Hypervisor: XenServer
+^^^^^^^^^^^^^^^^^^^^^
 
-   wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \
-   http://download.cloudstack.org/tools/vhd-util
+No additional steps are required wrt for XenServer Hypervisor for this upgrade.
 
 
 Hypervisor: VMware
@@ -264,78 +255,17 @@ Hypervisor: VMware
    For VMware hypervisor CloudStack management server packages must be
    build using "noredist". Refer to :ref:`building-noredist`.
 
-**(VMware only)** Additional steps are required for each VMware cluster.
-These steps will not affect running guests in the cloud. These steps
-are required only for clouds using VMware clusters:
-
-#. Stop the Management Server:
-
-   .. parsed-literal::
-
-      $ sudo service cloudstack-management stop
-
-#. Generate the encrypted equivalent of your vCenter password:
-
-   .. parsed-literal::
-
-      $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar 
org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh 
input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" 
verbose=false
-
-Store the output from this step, we need to add this in
-cluster\_details table and vmware\_data\_center tables in place of
-the plain text password
-
-#. Find the ID of the row of cluster\_details table that you have to
-   update:
-
-   .. parsed-literal::
-
-      $ mysql -u <username> -p<password>
-
-   .. parsed-literal::
-
-      select * from cloud.cluster_details;
-
-#. Update the plain text password with the encrypted one
-
-   .. parsed-literal::
-
-      update cloud.cluster_details set value = '_ciphertext_from_step_1_'
-      where id = _id_from_step_2_;
-
-#. Confirm that the table is updated:
-
-   .. parsed-literal::
-
-      select * from cloud.cluster_details;
-
-#. Find the ID of the correct row of vmware\_data\_center that you
-    want to update
-
-   .. parsed-literal::
-
-      select * from cloud.vmware_data_center;
-
-#. update the plain text password with the encrypted one:
-
-   .. parsed-literal::
-
-      update cloud.vmware_data_center set password = '_ciphertext_from_step_1_'
-      where id = _id_from_step_5_;
-
-#. Confirm that the table is updated:
-
-   .. parsed-literal::
 
-      select * from cloud.vmware_data_center;
+No additional steps are requried for the VMware Hypervisor for this upgrade.
 
 
 .. _kvm411:
 
 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
@@ -373,7 +303,7 @@ hosts.
 
 
 KVM on CentOS/RHEL
-^^^^^^^^^^^^^^^^^^
+"""""""""""""""""""
 For KVM hosts, upgrade the ``cloudstack-agent`` package
 
 #. Configure the :ref:`rpm-repo411` as detailed above.

Reply via email to