cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pdion...@apache.org
Subject [6/8] cloudstack-docs-rn git commit: update repo URLs, fixed file formating, few updated from 4.6 release
Date Tue, 17 Nov 2015 12:54:19 GMT
update repo URLs, fixed file formating, few updated from 4.6 release


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/commit/80a33ed2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/80a33ed2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/80a33ed2

Branch: refs/heads/4.6
Commit: 80a33ed2bac086cb5a346c3bd1793c1423aa5f86
Parents: eae064b
Author: Pierre-Luc Dion <pdion891@apache.org>
Authored: Thu Nov 12 21:56:31 2015 -0500
Committer: Pierre-Luc Dion <pdion891@apache.org>
Committed: Thu Nov 12 21:56:31 2015 -0500

----------------------------------------------------------------------
 source/about.rst                  | 186 ++++++----------------
 source/api-changes.rst            |  42 ++---
 source/compat.rst                 |   4 +-
 source/upgrade/_xenserver_upg.rst |  57 +++++++
 source/upgrade/upgrade-4.2.rst    | 141 ++++++++---------
 source/upgrade/upgrade-4.3.rst    | 126 ++++++---------
 source/upgrade/upgrade-4.4.rst    | 282 +++++++++++++++------------------
 source/upgrade/upgrade-4.5.rst    |  51 ++----
 source/upgrade/upgrade_notes.rst  |  27 ----
 9 files changed, 378 insertions(+), 538 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/about.rst
----------------------------------------------------------------------
diff --git a/source/about.rst b/source/about.rst
index 037448a..05d21f6 100644
--- a/source/about.rst
+++ b/source/about.rst
@@ -17,7 +17,7 @@
 What's New in |version|
 =======================
 
-Version |release| includes more than 200 bug fixes from previous release, the
+Version |release| includes more than 240 bug fixes from previous release, the
 following new features and improvements.
 
 
@@ -33,164 +33,72 @@ following new features and improvements.
 10) Support for non-US keyboards in Console Proxy, CloudStack-8665, Anshul
 
 
+Redundant Routers for VPC
+-------------------------
 
+<TBD>
 
+====================== ============================================================================
+Supported hypervisors: N/A
+Link                   `CLOUDSTACK-7583`_
+====================== ============================================================================
 
 
+UI: SSH keys and User-Data
+--------------------------
 
+It is now possible to import, delete and get instances inventory for SSH keys
+from the webui at the account level. Instance can now be created with ssh key
+and user-data defined from the webui wizard.
 
+====================== ============================================================================
+Supported hypervisors: N/A
+Link                   `CLOUDSTACK-7882`_
+====================== ============================================================================
 
-NuageVsp Network Plugin
------------------------
 
-   The Nuage NetworksTM Virtualized Services Platform (VSP) is a Software-Defined
-   Networking (SDN) solution that virtualizes any datacenter (DC) network
-   infrastructure and automatically establishes connectivity between compute
-   resources upon their creation.
 
-   NuageVsp networking plugin bring the Nuage VSP network virtualization technology
-   to CloudStack. All the network isolation and routing is handled by the Nuage
-   SDN solution. Routing of the packets happen at hypervisor itself. Virtual Router
-   is not used for routing the packets and is spawned only for Password reset
-   functionality. The Nuage solution also helps significantly improve the agility
-   and scale of a CloudStack deployment as compared to a Virtual Router based
-   deployment.
+Send statistics collected by StatsCollector to Graphite
+-------------------------------------------------------
 
+Send StatsCollector from the management server to a Graphite server in addition
+to the usage database. This allows ease of graphing for CPU, Network and
+Disk I/O for instances and hosts.
 
-   ====================== ============================================================================
-   Supported hypervisors: XenServer, VMware
-   Link                   `NuageVsp Network Plugin spec`_
-   ====================== ============================================================================
+====================== ============================================================================
+Supported hypervisors: N/A
+Link                   `CLOUDSTACK-7583`_
+====================== ============================================================================
 
 
-Bind integration with Globo DNSAPI
-----------------------------------
-   
-   GloboDNS provide API to Bind DNS server used to centralized DNS server outside of CloudStack networks.
-   When deploying Advanced Networks, Virtual Routers are used to isolate networks
-   and provide DNS service for all machines inside each network. This approach
-   imposes a challenge when instances need to translate names that belong to
-   instances from another network.
-
-   ====================== ============================================================================
-   Supported hypervisors: Any
-   Link                   `Globo DNSAPI spec`_
-   ====================== ============================================================================
-
-
-SAML 2.0 Plugin
----------------
-   
-   SAML 2.0 Plugin provide integration of CloudStack to existing authentication
-   mechanism. This provide Single Sign On (SSO) and Single Log Out (SLO) to work
-   on CloudStack UI and clients. SAML (Security Assertion Markup Language) 2.0
-   is an old, stable and widely used XML based authentication and authorization
-   protocol supported by Salesforce, Google Apps and other public and private
-   companies and the aim is to integrate the SSO SAML support in CloudStack. The
-   current implementation is experimental, will change in future and should be
-   avoided in prouduction.
-
-   ====================== ============================================================================
-   Supported hypervisors: N/A
-   Link                   `SAML spec`_
-   ====================== ============================================================================
-
-
-Managed storage for KVM
------------------------
-
-   This adapter provides one to one mapping between SAN volume to VM's disk.
-   This is to guarantee quality of services for performance sensitive
-   applications. This adapter is based on nfs protocol.
-
-   ====================== ============================================================================
-   Supported hypervisors: KVM
-   Link                   `CLOUDSTACK-7576 <https://issues.apache.org/jira/browse/CLOUDSTACK-7576>`_
-   ====================== ============================================================================
-
-
-Improved CloudByte Storage Plugin
----------------------------------
+Browser-based Template/Volume upload
+------------------------------------
 
-   The new improved CloudByte plugin support the following features:
+This feature enables the users to directly upload template or volume to
+Cloudstack and eliminates the dependency on an external http server. This is a
+complementary functionality and users can continue to register template/volume
+with URL.
 
-   - Managed storage, where each vm disk has the guaranteed QoS.
-   - Account integration in cloudbyte with respect to domains in CloudStack.
-   - Resize of the volume.
-   - both iSCSI and nfs protocols in XenServer.
-   - iSCSI protocol for KVM and VMware ESX.
-   - Storage level snapshot capabilities as well as hypervisor level snapshot feature. 
-   - Expose custom API's for ui integration.
-   - Unlimited storage nodes across the sites.
+====================== ============================================================================
+Supported hypervisors: N/A
+Link                   `Browser Upload spec`_
+====================== ============================================================================
 
-   ====================== ============================================================================
-   Supported hypervisors: KVM, VMware, XenServer
-   Link                   `CLOUDSTACK-7098 <https://issues.apache.org/jira/browse/CLOUDSTACK-7098>`_
-   ====================== ============================================================================
 
 
-Use SSH for commands sent to Virtual-Router
--------------------------------------------
-
-   For XenServer host, sending commands to Virtual-Routers now use SSH,
-   previously using XAPI plugin, this change reduce XAPI workload and allow
-   Virtual-Router update while XenServer pool master is down.
-
-   ====================== ============================================================================
-   Supported hypervisors: XenServer
-   Link                   `CLOUDSTACK-6314 <https://issues.apache.org/jira/browse/CLOUDSTACK-6314>`_
-   ====================== ============================================================================
-
-
-Baremetal Advanced Networking Support
--------------------------------------
-
-This feature is about CloudStack network plugin for baremetal advanced
-networking. With this plugin, CloudStack can automatically program vlan on
-physical switch to which baremetal instances connect when creating/destroying
-baremetal instance. This feature cannot work standalone, it needs support
-from physical switch itself either from vendor's SDK or from an in-switch
-agent for whitebox switch. When using this feature, baremetal instances gain
-Layer 2 isolation methods provided by CloudStack advanced networking which is
-particularly useful in public cloud that wants to provide baremetal as a
-service.  This feature currently requires a VMware virtual router, so is only
-supported by that hypervisor.
-
-   ====================== ============================================================================
-   Supported hypervisors: N/A
-   Link                   `Baremetal feature spec`_
-   ====================== ============================================================================
-
-
-Instance Password Generation length can now be changed
-------------------------------------------------------
-
-   For instance using random password generated by CloudStack, Password length and
-   encoder can now be define with following Global Settings:
-   ``vm.password.length``, ``user.password.encoders.exclude``, ``user.password.encoders.order``
 
 
 Improvements
 ------------
 
--  [UI] keep advanced search parameters visible after search has been run
--  [UI] Add new vGPU types K160Q, K180Q, K280Q
--  [LXC] storage migration for LXC VMs fixed
--  Use of MariaDB as cloudstack management server database
--  System VM password reset now supported
--  Root volume detach support
--  System VM local storage setting ``system.vm.use.local.storage`` is configurable at zone level
--  Ability to set CPU features for user vms on KVM using ``guest.cpu.features`` property
--  A threaded Python based password server that consumes less RAM and CPU
--  VMFS support in VMWare
--  XenServer 6.5 support
--  Separate /var/log partition in SystemVM template
--  VMXNET3 nic adapter support for KVM
--  ``nicAdapter`` VM detail is configurable for VMWare to set custom nic adapter
--  New secure and default user authenticator: PBKDF2-SHA-256
--  Resize volume support on KVM
-
-.. _Baremetal feature spec: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Baremetal+Advanced+Networking+Support
-.. _Globo DNSAPI spec: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Bind+integration+by+Globo+DNSAPI
-.. _NuageVsp Network Plugin spec : https://cwiki.apache.org/confluence/display/CLOUDSTACK/NuageVsp+Network+Plugin
-.. _SAML spec: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SAML+2.0+Plugin
+-  Enable configuring local storage use for system VMs at zone level.
+-  Restore volume from volune-snapshot (KVM)
+-  Addition of an empty custom.css for ease of UI customization.
+-  Local Storage overprovisionning for KVM.
+-  Provide smbios vendor information via KVM/Libvirt to Guest.
+-  KVM vlan passthrough '4095', usable for nested hypervisor as instance.
+
+
+.. _Browser Upload spec : https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39620237
+.. _CLOUDSTACK-7583 : https://issues.apache.org/jira/browse/CLOUDSTACK-7583
+.. _CLOUDSTACK-7882 : https://issues.apache.org/jira/browse/CLOUDSTACK-7882
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/api-changes.rst
----------------------------------------------------------------------
diff --git a/source/api-changes.rst b/source/api-changes.rst
index 1fab1f8..e7fa812 100644
--- a/source/api-changes.rst
+++ b/source/api-changes.rst
@@ -67,7 +67,8 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | addCluster                        | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: ovm3cluster (optional), ovm3pool (optional), ovm3vip (optional)           |
+|                                   | New parameters: ``ovm3cluster`` (optional), ``ovm3pool`` (optional),                      |
+|                                   | ``ovm3vip`` (optional)                                                                    |
 |                                   |                                                                                           |
 |                                   | Response:                                                                                 |
 |                                   |                                                                                           |
@@ -76,7 +77,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | createTemplate                    | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: projectid (optional)                                                      |
+|                                   | New parameters: ``projectid`` (optional)                                                  |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | registerSSHKeyPair                | Response:                                                                                 |
@@ -101,12 +102,12 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | updateStoragePool                 | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: enabled (optional)                                                        |
+|                                   | New parameters: ``enabled`` (optional)                                                    |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | updateHostPassword                | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: update_passwd_on_host (optional)                                          |
+|                                   | New parameters: ``update_passwd_on_host`` (optional)                                      |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | listSSHKeyPairs                   | Response:                                                                                 |
@@ -131,7 +132,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | updatePortForwardingRule          | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: vmguestip (optional)                                                      |
+|                                   | New parameters: ``vmguestip`` (optional)                                                  |
 |                                   |                                                                                           |
 |                                   | Removed parameters: ipaddressid, privateip, protocol, publicport                          |
 |                                   |                                                                                           |
@@ -143,7 +144,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | updateTrafficType                 | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: ovm3networklabel (optional), xennetworklabel (optional)                   |
+|                                   | New parameters: ``ovm3networklabel`` (optional), ``xennetworklabel`` (optional)           |
 |                                   |                                                                                           |
 |                                   | Removed parameters: xenservernetworklabel                                                 |
 |                                   |                                                                                           |
@@ -167,14 +168,14 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | listLBHealthCheckPolicies         | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: id (optional)                                                             |
+|                                   | New parameters: ``id`` (optional)                                                         |
 |                                   |                                                                                           |
 |                                   | Changed parameters: lbruleid (old version - required, new version - optional)             |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | listDiskOfferings                 | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: isrecursive (optional), listall (optional)                                |
+|                                   | New parameters: ``isrecursive`` (optional), ``listall`` (optional)                        |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | listSnapshots                     | Response:                                                                                 |
@@ -184,7 +185,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | addS3                             | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: connectionttl (optional), usetcpkeepalive (optional)                      |
+|                                   | New parameters: ``connectionttl`` (optional), ``usetcpkeepalive`` (optional)              |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | attachIso                         | Response:                                                                                 |
@@ -210,7 +211,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | prepareTemplate                   | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: storageid (optional)                                                      |
+|                                   | New parameters: ``storageid`` (optional)                                                  |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | rebootVirtualMachine              | Response:                                                                                 |
@@ -230,7 +231,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | addTrafficType                    | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: ovm3networklabel (optional), xennetworklabel (optional)                   |
+|                                   | New parameters: ``ovm3networklabel`` (optional), ``xennetworklabel`` (optional)           |
 |                                   |                                                                                           |
 |                                   | Removed parameters: xenservernetworklabel                                                 |
 |                                   |                                                                                           |
@@ -243,7 +244,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | updateTemplate                    | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: requireshvm (optional)                                                    |
+|                                   | New parameters: ``requireshvm`` (optional)                                                |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | removeNicFromVirtualMachine       | Response:                                                                                 |
@@ -314,12 +315,12 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | listServiceOfferings              | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: isrecursive (optional), listall (optional)                                |
+|                                   | New parameters: ``isrecursive`` (optional), ``listall`` (optional)                        |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | samlSso                           | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: idpid (required)                                                          |
+|                                   | New parameters: ``idpid`` (required)                                                      |
 |                                   |                                                                                           |
 |                                   | Removed parameters: idpurl                                                                |
 |                                   |                                                                                           |
@@ -352,7 +353,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | createSnapshot                    | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: name (optional)                                                           |
+|                                   | New parameters: ``name`` (optional)                                                       |
 |                                   |                                                                                           |
 |                                   | Response:                                                                                 |
 |                                   |                                                                                           |
@@ -361,7 +362,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | updateIso                         | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: requireshvm (optional)                                                    |
+|                                   | New parameters: ``requireshvm`` (optional)                                                |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | destroyVirtualMachine             | Response:                                                                                 |
@@ -376,7 +377,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | listVirtualMachines               | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: keypair (optional), userid (optional)                                     |
+|                                   | New parameters: ``keypair`` (optional), ``userid`` (optional)                             |
 |                                   |                                                                                           |
 |                                   | Response:                                                                                 |
 |                                   |                                                                                           |
@@ -385,7 +386,7 @@ Updated API commands
 +-----------------------------------+-------------------------------------------------------------------------------------------+
 | restartVPC                        | Request:                                                                                  |
 |                                   |                                                                                           |
-|                                   | New parameters: cleanup (optional), makeredundant (optional)                              |
+|                                   | New parameters: ``cleanup`` (optional), ``makeredundant`` (optional)                      |
 |                                   |                                                                                           |
 |                                   | Response:                                                                                 |
 |                                   |                                                                                           |
@@ -397,6 +398,11 @@ Updated API commands
 |                                   | New parameters: physicalsize                                                              |
 |                                   |                                                                                           |
 +-----------------------------------+-------------------------------------------------------------------------------------------+
+| createVpnCustomerGateway          | Request:                                                                                  |
+|                                   |                                                                                           |
+|                                   | New parameters: ``projectid`` (optional)                                                  |
+|                                   |                                                                                           |
++-----------------------------------+-------------------------------------------------------------------------------------------+
 
 
 .. include:: global.rst

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/compat.rst
----------------------------------------------------------------------
diff --git a/source/compat.rst b/source/compat.rst
index 95feec5..3c160ec 100644
--- a/source/compat.rst
+++ b/source/compat.rst
@@ -48,7 +48,7 @@ and VMware with vSphere.
 -  Red Hat Enterprise Linux 6.2 with KVM
 -  XenServer versions 6.1, 6.2 SP1 and 6.5 with latest hotfixes
 
-      .. note:: It is now required to enable HA on the XenServer pool in order to recover from a pool-master failure. Please refer to the `XenServer documentation <http://docs.vmd.citrix.com/XenServer/6.5.0/1.0/en_gb/>`_.
+   .. note:: It is now required to enable HA on the XenServer pool in order to recover from a pool-master failure. Please refer to the `XenServer documentation <http://docs.vmd.citrix.com/XenServer/6.5.0/1.0/en_gb/>`_.
 
 -  VMware versions 5.0 Update 3a, 5.1 Update 2a, and 5.5 Update 2
 -  Bare metal hosts are supported, which have no hypervisor. These hosts
@@ -62,7 +62,7 @@ and VMware with vSphere.
    -  Ubuntu 12.04
 
 For more information, see the Hypervisor Compatibility Matrix in the
-CloudStack Installation Guide.
+`CloudStack Installation Guide`_.
 
 
 Supported External Devices

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/upgrade/_xenserver_upg.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_xenserver_upg.rst b/source/upgrade/_xenserver_upg.rst
new file mode 100644
index 0000000..abeb43e
--- /dev/null
+++ b/source/upgrade/_xenserver_upg.rst
@@ -0,0 +1,57 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+.. sub-section included in upgrade notes pre 4.4.
+
+XenServer HA
+^^^^^^^^^^^^
+
+As of Apache CloudStack 4.4, CloudStack is not responsible to promote a new pool
+master on a Citrix XenServer pool. In case of failure of the pool master host,
+the responsability of electing a new pool master as been delegated back to the
+HA feature of XenServer. CloudStack remain responsible to honored HA capability
+for Compute Offerings of instances. The XenServer HA feature must be enabled
+only for the pool master, not for virtual-machines.
+
+
+Make sure XenServer has enabled HA on the pool.
+
+To test if poolHA is currently turned on:
+
+.. sourcecode:: bash
+
+   xe pool-list params=all | grep -E "ha-enabled|ha-config"
+
+Output when poolHA is ON:
+
+.. sourcecode:: bash
+
+   ha-enabled ( RO): true
+   ha-configuration ( RO): timeout: 180
+
+Output when poolHA is OFF:
+
+.. sourcecode:: bash
+
+   ha-enabled ( RO): false
+   ha-configuration ( RO):
+
+To enable poolHA, use something like this:
+
+.. sourcecode:: bash
+
+   xe pool-enable-ha heartbeat-sr-uuids={SR-UUID} ha-config:timeout=180
+
+Please refer to the `XenServer documentation <http://docs.vmd.citrix.com/XenServer/>`_, as there are multiple ways of configuring it either on NFS, iSCSI or Fibre Channel. Be aware though, that the timeout setting is not documented. The default is 30 seconds so you may want to bump that towards 120-180 seconds.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/upgrade/upgrade-4.2.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.2.rst b/source/upgrade/upgrade-4.2.rst
index c1be13e..399dbcd 100644
--- a/source/upgrade/upgrade-4.2.rst
+++ b/source/upgrade/upgrade-4.2.rst
@@ -127,29 +127,29 @@ be necessary for hosts that are running VMware or Xen.)
 CloudStack apt repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-   Start by opening ``/etc/apt/sources.list.d/cloudstack.list`` on
-   any systems that have CloudStack packages installed.
+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:
+This file should have one line, which contains:
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      deb http://cloudstack.apt-get.eu/ubuntu precise 4.2
+   deb http://cloudstack.apt-get.eu/ubuntu precise 4.2
 
-   We'll change it to point to the new package repository:
+We'll change it to point to the new package repository:
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      deb http://packages.shapeblue.com/cloudstack/upstream/debian/4.5/ ./
+   deb http://cloudstack.apt-get.eu/ubuntu precise 4.6
 
-   Setup the public key for the above repository:
+Setup the public key for the above repository:
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      wget -qO - http://packages.shapeblue.com/release.asc | sudo apt-key add -
+   wget -qO - http://cloudstack.apt-get.eu/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.
+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:
 
@@ -190,39 +190,36 @@ packages. If not, skip to hypervisors section, then :ref:`upg-sysvm42`.
 CloustStack RPM repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-   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.
+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.)
+(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.
+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:
+This file should have content similar to the following:
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      [apache-cloudstack]
-      name=Apache CloudStack
-      baseurl=http://cloudstack.apt-get.eu/rhel/4.2/
-      enabled=1
-      gpgcheck=0
+   [apache-cloudstack]
+   name=Apache CloudStack
+   baseurl=http://cloudstack.apt-get.eu/rhel/4.2/
+   enabled=1
+   gpgcheck=0
 
-   If you are using the community provided package repository, change
-   the base url to ``http://packages.shapeblue.com/cloudstack/upstream/centos/4.5/``
-   If you want to use the CentOS7 repository use the url ``http://packages.shapeblue.com/cloudstack/upstream/centos7/4.5/``
+If you are using the community provided package repository, change
+the baseurl to ``http://cloudstack.apt-get.eu/rhel/4.6/``.
 
-   Setup the GPG public key if you wish to enable ``gpgcheck=1``:
+Setup the GPG public key if you wish to enable ``gpgcheck=1``:
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      wget http://packages.shapeblue.com/release.asc
-      rpm --import release.asc
+   rpm --import http://cloudstack.apt-get.eu/RPM-GPG-KEY
 
-   If you're using your own package repository, change this line to
-   read as appropriate for your |version| repository.
+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``.
@@ -241,57 +238,29 @@ CloustStack RPM repository
 Hypervisor: Xen/XenServer
 -------------------------
 
-   **(XenServer only)** Copy vhd-utils file on CloudStack management servers.
-   Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ 
-   to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
-
-   .. sourcecode:: bash
-
-      wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \
-      http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
-
-   Make sure XenServer has enabled HA on the pool.
-
-   To test if poolHA is currently turned on:
-
-   .. sourcecode:: bash
-
-      xe pool-list params=all | grep -E "ha-enabled|ha-config"
-
-   Output when poolHA is ON:
+**(XenServer only)** Copy vhd-utils file on CloudStack management servers.
+Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ 
+to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
 
-   .. sourcecode:: bash
-
-      ha-enabled ( RO): true
-      ha-configuration ( RO): timeout: 180
-
-   Output when poolHA is OFF:
-
-   .. sourcecode:: bash
-
-      ha-enabled ( RO): false
-      ha-configuration ( RO):
-
-   To enable poolHA, use something like this:
+.. sourcecode:: bash
 
-   .. sourcecode:: bash
-
-      xe pool-enable-ha heartbeat-sr-uuids={SR-UUID} ha-config:timeout=180
+   wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \
+   http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
 
-   Please refer to the `XenServer documentation <http://docs.vmd.citrix.com/XenServer/>`_, as there are multiple ways of configuring it either on NFS, iSCSI or Fibre Channel. Be aware though, that the timeout setting is not documented. The default is 30 seconds so you may want to bump that towards 120-180 seconds.
+.. include:: _xenserver_upg.rst
 
 
 Hypervisor: VMware
 ------------------
 
-   .. warning::
-      For VMware hypervisor CloudStack management server packages must be 
-      build using "noredist". Refer to `Building from Source 
-      <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/building_from_source.html>`_.
+.. warning::
+   For VMware hypervisor CloudStack management server packages must be 
+   build using "noredist". Refer to `Building from Source 
+   <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/building_from_source.html>`_.
 
-   **(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:
+**(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:
 
@@ -439,6 +408,22 @@ Restart management services
       $ sudo service cloudstack-usage start
 
 
+Settings Changes
+----------------
+
+After upgrading to 4.2 and later, Settings ``mem.overporvisioning.factor`` and 
+``cpu.overporvisioning.factor`` are now at the cluster level and be set to 1 
+which is the default.
+
+If Global Settings ``mem.overporvisioning.factor`` and 
+``cpu.overporvisioning.factor`` have been changed prior the upgrade to 4.2 and 
+later, the upgrade process will be reset them to 1. Values can be changed by 
+editing clusters settings.
+
+All clusters created after the upgrade will get created with the Global Settings 
+values for ``mem.overporvisioning.factor`` and ``cpu.overporvisioning.factor``.
+
+
 .. _upg-sysvm42:
 
 System-VMs and Virtual-Routers

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/upgrade/upgrade-4.3.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.3.rst b/source/upgrade/upgrade-4.3.rst
index e1ea9f3..5dcfe6b 100644
--- a/source/upgrade/upgrade-4.3.rst
+++ b/source/upgrade/upgrade-4.3.rst
@@ -130,29 +130,29 @@ be necessary for hosts that are running VMware or Xen.)
 CloudStack apt repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-   Start by opening ``/etc/apt/sources.list.d/cloudstack.list`` on
-   any systems that have CloudStack packages installed.
+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:
+This file should have one line, which contains:
    
-   .. sourcecode:: bash
+.. sourcecode:: bash
    
-      deb http://cloudstack.apt-get.eu/ubuntu precise 4.3
+   deb http://cloudstack.apt-get.eu/ubuntu precise 4.3
    
-   We'll change it to point to the new package repository:
+We'll change it to point to the new package repository:
    
-   .. sourcecode:: bash
+.. sourcecode:: bash
    
-      deb http://packages.shapeblue.com/cloudstack/upstream/debian/4.5/ ./
+   deb http://cloudstack.apt-get.eu/ubuntu precise 4.6
 
-   Setup the public key for the above repository:
+Setup the public key for the above repository:
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      wget -qO - http://packages.shapeblue.com/release.asc | sudo apt-key add -
+   wget -qO - http://cloudstack.apt-get.eu/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.
+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:
 
@@ -193,39 +193,36 @@ packages. If not, skip to hypervisors section, then :ref:`upg-sysvm43`.
 CloudStack RPM repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-   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.
+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.)
+(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.
+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:
+This file should have content similar to the following:
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      [apache-cloudstack]
-      name=Apache CloudStack
-      baseurl=http://cloudstack.apt-get.eu/rhel/4.3/
-      enabled=1
-      gpgcheck=0
+   [apache-cloudstack]
+   name=Apache CloudStack
+   baseurl=http://cloudstack.apt-get.eu/rhel/4.3/
+   enabled=1
+   gpgcheck=0
 
-   If you are using the community provided package repository, change
-   the base url to ``http://packages.shapeblue.com/cloudstack/upstream/centos/4.5/``
-   If you want to use the CentOS7 repository use the url ``http://packages.shapeblue.com/cloudstack/upstream/centos7/4.5/``
+If you are using the community provided package repository, change
+the base url to ``http://cloudstack.apt-get.eu/rhel/4.6/``.
 
-   Setup the GPG public key if you wish to enable ``gpgcheck=1``:
+Setup the GPG public key if you wish to enable ``gpgcheck=1``:
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      wget http://packages.shapeblue.com/release.asc
-      rpm --import release.asc
+   rpm --import http://cloudstack.apt-get.eu/RPM-GPG-KEY
 
-   If you're using your own package repository, change this line to
-   read as appropriate for your |version| repository.
+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 
@@ -245,57 +242,29 @@ CloudStack RPM repository
 Hypervisor: XenServer
 ---------------------
 
-   **(XenServer only)** Copy vhd-utils file on CloudStack management servers.
-   Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ 
-   to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
-
-   .. sourcecode:: bash
-
-      wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \
-      http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
-
-   Make sure XenServer has enabled HA on the pool.
-
-   To test if poolHA is currently turned on:
-
-   .. sourcecode:: bash
-
-      xe pool-list params=all | grep -E "ha-enabled|ha-config"
-
-   Output when poolHA is ON:
-
-   .. sourcecode:: bash
-
-      ha-enabled ( RO): true
-      ha-configuration ( RO): timeout: 180
-
-   Output when poolHA is OFF:
+**(XenServer only)** Copy vhd-utils file on CloudStack management servers.
+Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ 
+to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
 
-   .. sourcecode:: bash
-
-      ha-enabled ( RO): false
-      ha-configuration ( RO):
-
-   To enable poolHA, use something like this:
+.. sourcecode:: bash
 
-   .. sourcecode:: bash
-
-      xe pool-enable-ha heartbeat-sr-uuids={SR-UUID} ha-config:timeout=180
+   wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \
+   http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
 
-   Please refer to the `XenServer documentation <http://docs.vmd.citrix.com/XenServer/>`_, as there are multiple ways of configuring it either on NFS, iSCSI or Fibre Channel. Be aware though, that the timeout setting is not documented. The default is 30 seconds so you may want to bump that towards 120-180 seconds.
+.. include:: _xenserver_upg.rst
 
 
 Hypervisor: VMware
 ------------------
 
-   .. warning::
-      For VMware hypervisor CloudStack management server packages must be 
-      build using "noredist". Refer to `Building from Source 
-      <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/building_from_source.html>`_.
+.. warning::
+   For VMware hypervisor CloudStack management server packages must be 
+   build using "noredist". Refer to `Building from Source 
+   <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/building_from_source.html>`_.
 
-   **(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:
+**(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:
 
@@ -401,6 +370,7 @@ hosts.
 
 KVM on CentOS/RHEL
 ^^^^^^^^^^^^^^^^^^
+
 For KVM hosts, upgrade the ``cloudstack-agent`` package
 
 #. Configure the :ref:`rpm-repo43` as detailed above.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/upgrade/upgrade-4.4.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.4.rst b/source/upgrade/upgrade-4.4.rst
index 569a731..09eaec7 100644
--- a/source/upgrade/upgrade-4.4.rst
+++ b/source/upgrade/upgrade-4.4.rst
@@ -67,43 +67,43 @@ Database Preparation
 Backup current database
 
 #. Stop your management server or servers. Run this on all management
-    server hosts:
+   server hosts:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo service cloudstack-management stop
+      $ sudo service cloudstack-management stop
 
 #. If you are running a usage server or usage servers, stop those as well:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo service cloudstack-usage stop
+      $ 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.
+   need to roll back the upgrade, this will assist in debugging or
+   restoring your existing environment. You'll be prompted for your
+   password.
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ 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
+      $ 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:
+   path for this storage needs to be verified to ensure it passes new
+   validation. Check local storage by querying the cloud.storage\_pool
+   table:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ mysql -u cloud -p -e "select id,name,path from cloud.storage_pool where pool_type='Filesystem'"
+      $ 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:
+   If local storage paths are found to have a trailing forward slash,
+   remove it:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
+      $ mysql -u cloud -p -e 'update cloud.storage_pool set path="/var/lib/libvirt/images" where path="/var/lib/libvirt/images/"';
 
 
 .. _ubuntu44:
@@ -115,9 +115,9 @@ If you are using Ubuntu, follow this procedure to upgrade your packages. If
 not, skip to step :ref:`rhel44`.
 
 .. 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.
+   **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
@@ -130,42 +130,42 @@ be necessary for hosts that are running VMware or Xen.)
 CloudStack apt repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-    Start by opening ``/etc/apt/sources.list.d/cloudstack.list`` on
-    any systems that have CloudStack packages installed.
+   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:
+   This file should have one line, which contains:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        deb http://cloudstack.apt-get.eu/ubuntu precise 4.4
+      deb http://cloudstack.apt-get.eu/ubuntu precise 4.4
 
-    We'll change it to point to the new package repository:
+   We'll change it to point to the new package repository:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-      deb http://packages.shapeblue.com/cloudstack/upstream/debian/4.5/ ./
+      deb http://cloudstack.apt-get.eu/ubuntu precise 4.5
 
    Setup the public key for the above repository:
 
    .. sourcecode:: bash
 
-      wget -qO - http://packages.shapeblue.com/release.asc | sudo apt-key add -
+      wget -qO - http://cloudstack.apt-get.eu/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.
+   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:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo apt-get update
+      $ sudo apt-get update
 
 #. Now that you have the repository configured, it's time to upgrade
     the ``cloudstack-management`` package.
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo apt-get upgrade cloudstack-management
+      $ sudo apt-get upgrade cloudstack-management
 
 #. If you use CloudStack usage server
 
@@ -183,9 +183,9 @@ If you are using CentOS or RHEL, follow this procedure to upgrade your
 packages. If not, skip to hypervisors section, then :ref:`upg-sysvm44`.
 
 .. 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.
+   **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.
 
 
 .. _rpm-repo44:
@@ -193,169 +193,139 @@ packages. If not, skip to hypervisors section, then :ref:`upg-sysvm44`.
 CloudStack RPM repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-    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.
+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.)
+(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.
+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:
-
-    .. sourcecode:: bash
+This file should have content similar to the following:
 
-        [apache-cloudstack]
-        name=Apache CloudStack
-        baseurl=http://cloudstack.apt-get.eu/rhel/4.4/
-        enabled=1
-        gpgcheck=0
+.. sourcecode:: bash
 
-   If you are using the community provided package repository, change
-   the base url to ``http://packages.shapeblue.com/cloudstack/upstream/centos/4.5/``
-   If you want to use the CentOS7 repository use the url ``http://packages.shapeblue.com/cloudstack/upstream/centos7/4.5/``
+   [apache-cloudstack]
+   name=Apache CloudStack
+   baseurl=http://cloudstack.apt-get.eu/rhel/4.4/
+   enabled=1
+   gpgcheck=0
 
-   Setup the GPG public key if you wish to enable ``gpgcheck=1``:
+If you are using the community provided package repository, change
+the base url to ``http://cloudstack.apt-get.eu/rhel/4.6/``.
 
-   .. sourcecode:: bash
+Setup the GPG public key if you wish to enable ``gpgcheck=1``:
 
-      wget http://packages.shapeblue.com/release.asc
-      rpm --import release.asc
+.. sourcecode:: bash
 
+   rpm --import http://cloudstack.apt-get.eu/RPM-GPG-KEY
 
 
-    If you're using your own package repository, change this line to
-    read as appropriate for your |version| repository.
+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``.
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo yum upgrade cloudstack-management
+      $ sudo yum upgrade cloudstack-management
 
 #. If you use CloudStack usage server
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo yum upgrade cloudstack-usage
+      $ sudo yum upgrade cloudstack-usage
 
 
 Hypervisor: XenServer
 ---------------------
 
-    **(XenServer only)** Copy vhd-utils file on CloudStack management servers.
-    Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_
-    to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
-
-    .. sourcecode:: bash
-
-        wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \
-        http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
-
-   Make sure XenServer has enabled HA on the pool.
-
-   To test if poolHA is currently turned on:
-
-   .. sourcecode:: bash
-
-      xe pool-list params=all | grep -E "ha-enabled|ha-config"
-
-   Output when poolHA is ON:
-
-   .. sourcecode:: bash
-
-      ha-enabled ( RO): true
-      ha-configuration ( RO): timeout: 180
-
-   Output when poolHA is OFF:
-
-   .. sourcecode:: bash
-
-      ha-enabled ( RO): false
-      ha-configuration ( RO):
-
-   To enable poolHA, use something like this:
+**(XenServer only)** Copy vhd-utils file on CloudStack management servers.
+Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_
+to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
 
-   .. sourcecode:: bash
+.. sourcecode:: bash
 
-      xe pool-enable-ha heartbeat-sr-uuids={SR-UUID} ha-config:timeout=180
+   wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \
+   http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
 
-   Please refer to the `XenServer documentation <http://docs.vmd.citrix.com/XenServer/>`_, as there are multiple ways of configuring it either on NFS, iSCSI or Fibre Channel. Be aware though, that the timeout setting is not documented. The default is 30 seconds so you may want to bump that towards 120-180 seconds.
+.. include:: _xenserver_upg.rst
 
 
 Hypervisor: VMware
 ------------------
 
-    .. warning::
-        For VMware hypervisor CloudStack management server packages must be
-        build using "noredist". Refer to `Building from Source
-        <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/building_from_source.html>`_.
+.. warning::
+    For VMware hypervisor CloudStack management server packages must be
+    build using "noredist". Refer to `Building from Source
+    <http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/latest/building_from_source.html>`_.
 
-    **(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:
+**(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:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo service cloudstack-management stop
+      $ sudo service cloudstack-management stop
 
 #. Generate the encrypted equivalent of your vCenter password:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
+      $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.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
+   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:
+   update:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ mysql -u <username> -p<password>
+      $ mysql -u <username> -p<password>
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        select * from cloud.cluster_details;
+      select * from cloud.cluster_details;
 
 #. Update the plain text password with the encrypted one
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        update cloud.cluster_details set value = '_ciphertext_from_step_1_' where id = _id_from_step_2_;
+      update cloud.cluster_details set value = '_ciphertext_from_step_1_' where id = _id_from_step_2_;
 
 #. Confirm that the table is updated:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        select * from cloud.cluster_details;
+      select * from cloud.cluster_details;
 
 #. Find the ID of the correct row of vmware\_data\_center that you
     want to update
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        select * from cloud.vmware_data_center;
+      select * from cloud.vmware_data_center;
 
 #. update the plain text password with the encrypted one:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        update cloud.vmware_data_center set password = '_ciphertext_from_step_1_' where id = _id_from_step_5_;
+      update cloud.vmware_data_center set password = '_ciphertext_from_step_1_'
+      where id = _id_from_step_5_;
 
 #. Confirm that the table is updated:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        select * from cloud.vmware_data_center;
+      select * from cloud.vmware_data_center;
 
 
 .. _kvm44:
@@ -375,30 +345,30 @@ hosts.
 
 #. Stop the running agent.
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo service cloudstack-agent stop
+      $ sudo service cloudstack-agent stop
 
 #. Update the agent software.
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo apt-get upgrade cloudstack-agent
+      $ sudo apt-get upgrade cloudstack-agent
 
 #. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a 
     line that reads:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        paths.script=/usr/share/cloudstack-common
+      paths.script=/usr/share/cloudstack-common
 
-    If not, add the line.
+   If not, add the line.
 
 #. Start the agent.
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo service cloudstack-agent start
+      $ sudo service cloudstack-agent start
 
 
 KVM on CentOS/RHEL
@@ -407,26 +377,26 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
 
 #. Configure the :ref:`rpm-repo44` as detailed above.
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo yum upgrade cloudstack-agent
+      $ sudo yum upgrade cloudstack-agent
 
 #. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a 
-    line that reads:
+   line that reads:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        paths.script=/usr/share/cloudstack-common
+      paths.script=/usr/share/cloudstack-common
 
-    If not, add the line.
+   If not, add the line.
 
 #. Restart the agent:
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo service cloudstack-agent stop
-        $ sudo killall jsvc
-        $ sudo service cloudstack-agent start
+      $ sudo service cloudstack-agent stop
+      $ sudo killall jsvc
+      $ sudo service cloudstack-agent start
 
 
 Restart management services
@@ -445,15 +415,15 @@ Restart management services
 
 #. Now it's time to start the management server
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo service cloudstack-management start
+      $ sudo service cloudstack-management start
 
 #. If you use it, start the usage server
 
-    .. sourcecode:: bash
+   .. sourcecode:: bash
 
-        $ sudo service cloudstack-usage start
+      $ sudo service cloudstack-usage start
 
 
 .. _upg-sysvm44:

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/upgrade/upgrade-4.5.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade-4.5.rst b/source/upgrade/upgrade-4.5.rst
index c2d4943..fcf7595 100644
--- a/source/upgrade/upgrade-4.5.rst
+++ b/source/upgrade/upgrade-4.5.rst
@@ -143,13 +143,13 @@ We'll change it to point to the new package repository:
 
 .. sourcecode:: bash
 
-   deb http://packages.shapeblue.com/cloudstack/upstream/debian/4.5/ ./
+   deb http://cloudstack.apt-get.eu/ubuntu precise 4.6
 
 Setup the public key for the above repository:
 
 .. sourcecode:: bash
 
-   wget -qO - http://packages.shapeblue.com/release.asc | sudo apt-key add -
+   wget -qO - http://cloudstack.apt-get.eu/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.
@@ -214,15 +214,14 @@ This file should have content similar to the following:
    gpgcheck=0
 
 If you are using the community provided package repository, change
-the base url to ``http://packages.shapeblue.com/cloudstack/upstream/centos/4.5/``
-If you want to use the CentOS7 repository use the url ``http://packages.shapeblue.com/cloudstack/upstream/centos7/4.5/``
+the base url to ``http://cloudstack.apt-get.eu/rhel/4.6/``. If you want to use
+the CentOS7 repository use the url ``http://cloudstack.apt-get.eu/centos7/4.6/``
 
 Setup the GPG public key if you wish to enable ``gpgcheck=1``:
 
 .. sourcecode:: bash
 
-   wget http://packages.shapeblue.com/release.asc
-   rpm --import release.asc
+   rpm --import http://cloudstack.apt-get.eu/RPM-GPG-KEY
 
 
 If you're using your own package repository, change this line to
@@ -255,36 +254,6 @@ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
    wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \
    http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
 
-Make sure XenServer has enabled HA on the pool.
-
-To test if poolHA is currently turned on:
-
-.. sourcecode:: bash
-
-   xe pool-list params=all | grep -E "ha-enabled|ha-config"
-
-Output when poolHA is ON:
-
-.. sourcecode:: bash
-
-   ha-enabled ( RO): true
-   ha-configuration ( RO): timeout: 180
-
-Output when poolHA is OFF:
-
-.. sourcecode:: bash
-
-   ha-enabled ( RO): false
-   ha-configuration ( RO):
-
-To enable poolHA, use something like this:
-
-.. sourcecode:: bash
-
-   xe pool-enable-ha heartbeat-sr-uuids={SR-UUID} ha-config:timeout=180
-
-Please refer to the `XenServer documentation <http://docs.vmd.citrix.com/XenServer/>`_, as there are multiple ways of configuring it either on NFS, iSCSI or Fibre Channel. Be aware though, that the timeout setting is not documented. The default is 30 seconds so you may want to bump that towards 120-180 seconds.
-
 
 Hypervisor: VMware
 ------------------
@@ -329,7 +298,8 @@ the plain text password
 
    .. sourcecode:: bash
 
-      update cloud.cluster_details set value = '_ciphertext_from_step_1_' where id = _id_from_step_2_;
+      update cloud.cluster_details set value = '_ciphertext_from_step_1_'
+      where id = _id_from_step_2_;
 
 #. Confirm that the table is updated:
 
@@ -348,7 +318,8 @@ the plain text password
 
    .. sourcecode:: bash
 
-      update cloud.vmware_data_center set password = '_ciphertext_from_step_1_' where id = _id_from_step_5_;
+      update cloud.vmware_data_center set password = '_ciphertext_from_step_1_'
+      where id = _id_from_step_5_;
 
 #. Confirm that the table is updated:
 
@@ -411,13 +382,13 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
       $ sudo yum upgrade cloudstack-agent
 
 #. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a 
-    line that reads:
+   line that reads:
 
    .. sourcecode:: bash
 
       paths.script=/usr/share/cloudstack-common
 
-    If not, add the line.
+   If not, add the line.
 
 #. Restart the agent:
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/80a33ed2/source/upgrade/upgrade_notes.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/upgrade_notes.rst b/source/upgrade/upgrade_notes.rst
index 50e77de..ae26db4 100644
--- a/source/upgrade/upgrade_notes.rst
+++ b/source/upgrade/upgrade_notes.rst
@@ -24,33 +24,6 @@ As of Apache CloudStack 4.4, Java version required is 1.7 for the
 management-server, cloudstack-usage, KVM agent and system-VMs.
 
 
-Depreciation of realhostip.com 
-------------------------------
-   
-The realhostip.com dynamic DNS resolution service is being retired on
-September 30th, 2014. In advance of that, CloudStack 4.3 and later no longer uses 
-realhostip.com DNS domains or SSL certificates to encrypt Console Proxy or 
-file copy communications.
-
-For latest update about realhostip.com follow `Apache CloudStack Blog <https://blogs.apache.org/cloudstack/>`_.
-
-
-Settings Changes
-----------------
-
-After upgrading to 4.2 and later, Settings ``mem.overporvisioning.factor`` and 
-``cpu.overporvisioning.factor`` are now at the cluster level and be set to 1 
-which is the default.
-
-If Global Settings ``mem.overporvisioning.factor`` and 
-``cpu.overporvisioning.factor`` have been changed prior the upgrade to 4.2 and 
-later, the upgrade process will be reset them to 1. Values can be changed by 
-editing clusters settings.
-
-All clusters created after the upgrade will get created with the Global Settings 
-values for ``mem.overporvisioning.factor`` and ``cpu.overporvisioning.factor``.
-
-
 OVS plug-in
 -----------
 


Mime
View raw message