diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index 36dd9a55be7..aa78088f72b 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -217,8 +217,10 @@ under the License.
- Support for KVMVPC is now supported on KVM
- hypervisors.
+
+ Support for KVM
+ VPC is now supported on KVM hypervisors.
+
Load Balancing Support for VPC
In a VPC, you can configure two types of load balancing—external LB and
@@ -1039,7 +1041,7 @@ under the License.
Upgrade Instructions for 4.2
This section contains upgrade instructions from prior versions of CloudStack to Apache
CloudStack 4.2.0. We include instructions on upgrading to Apache CloudStack from pre-Apache
- versions of Citrix CloudStack (last version prior to Apache is 3.0.2) and from the releases
+ versions of Citrix &PRODUCT; (last version prior to Apache is 3.0.2) and from the releases
made while CloudStack was in the Apache Incubator.
If you run into any issues during upgrades, please feel free to ask questions on
users@cloudstack.apache.org or dev@cloudstack.apache.org.
@@ -1071,11 +1073,11 @@ under the License.
Stop your management server or servers. Run this on all management server
hosts:
- # service cloud-management stop
+ # service cloudstack-management stop
If you are running a usage server or usage servers, stop those as well:
- # service cloud-usage stop
+ # service cloudstack-usage stop
Make a backup of your MySQL database. If you run into any issues or need to roll
@@ -1092,7 +1094,7 @@ under the License.
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 &PRODUCT; packages. This means all management servers, and any hosts that have
@@ -1138,28 +1140,11 @@ under the License.
Restart the agent:
-service cloud-agent stop
+service cloudstack-agent stop
killall jsvc
service cloudstack-agent start
-
- During the upgrade, log4j-cloud.xml was simply copied over,
- so the logs will continue to be added to
- /var/log/cloud/agent/agent.log. There's nothing
- wrong with this, but if you prefer to be consistent, you can
- change this by copying over the sample configuration file:
-
-cd /etc/cloudstack/agent
-mv log4j-cloud.xml.dpkg-dist log4j-cloud.xml
-service cloudstack-agent restart
-
-
-
- Once the agent is running, you can uninstall the old cloud-* packages from your
- system:
- sudo dpkg --purge cloud-agent
-
@@ -1247,7 +1232,7 @@ service cloudstack-agent restart
If you've created your own packages and yum repository, substitute your own URL for
the ones used in these examples.
-
+
The first order of business will be to change the yum repository for each system
with &PRODUCT; packages. This means all management servers, and any hosts that have
@@ -1272,31 +1257,25 @@ gpgcheck=0
Now that you have the repository configured, it's time to install the
cloudstack-management package by upgrading the older
- cloud-client package.
- $ sudo yum upgrade cloud-client
+ cloudstack-management package.
+ $ sudo yum upgrade cloudstack-management
For KVM hosts, you will need to upgrade the cloud-agent
package, similarly installing the new version as
cloudstack-agent.
- $ sudo yum upgrade cloud-agent
- During the installation of cloudstack-agent, the RPM will
- copy your agent.properties,
- log4j-cloud.xml, and
- environment.properties from
- /etc/cloud/agent to
- /etc/cloudstack/agent.
+ $ sudo yum upgrade cloudstack-agent
For CentOS 5.5, perform the following:
-
+
Run the following command:
rpm -Uvh http://download.cloud.com/support/jsvc/jakarta-commons-daemon-jsvc-1.0.1-8.9.el6.x86_64.rpm
Upgrade the Usage server.
- sudo yum upgrade cloud-usage
+ sudo yum upgrade cloudstack-usage
@@ -1310,7 +1289,7 @@ gpgcheck=0
Restart the agent:
-service cloud-agent stop
+service cloudstack-agent stop
killall jsvc
service cloudstack-agent start
@@ -1383,54 +1362,60 @@ Done restarting router(s).
- Field
- Value
+ Hypervisor
+ Description
- Name
- systemvm-vmware-4.2
+ XenServer
+ Name: systemvm-xenserver-4.2.0
+ Description: systemvm-xenserver-4.2.0
+ URL:http://download.cloud.com/templates/4.2/systemvmtemplate-2013-07-12-master-xen.vhd.bz2
+ Zone: Choose the zone where this hypervisor is used
+ Hypervisor: XenServer
+ Format: VHD
+ OS Type: Debian GNU/Linux 7.0 (32-bit) (or the highest Debian release
+ number available in the dropdown)
+ Extractable: no
+ Password Enabled: no
+ Public: no
+ Featured: no
+
- Description
- systemvm-vmware-4.2
+ KVM
+ Name: systemvm-kvm-4.2.0
+ Description: systemvm-kvm-4.2.0
+ URL:
+ http://download.cloud.com/templates/4.2/systemvmtemplate-2013-06-12-master-kvm.qcow2.bz2
+ Zone: Choose the zone where this hypervisor is used
+ Hypervisor: KVM
+ Format: QCOW2
+ OS Type: Debian GNU/Linux 7.0 (32-bit) (or the highest Debian release
+ number available in the dropdown)
+ Extractable: no
+ Password Enabled: no
+ Public: no
+ Featured: no
+
- URL
- http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova
-
-
- Zone
- Choose the zone where this hypervisor is used
-
-
- Hypervisor
VMware
-
-
- Format
- OVA
-
-
- OS Type
- Debian GNU/Linux 5.0 (32-bit)
-
-
- Extractable
- no
-
-
- Password Enabled
- no
-
-
- Public
- no
-
-
- Featured
- no
+ Name: systemvm-vmware-4.2.0
+ Description: systemvm-vmware-4.2.0
+ URL:
+ http://download.cloud.com/templates/4.2/systemvmtemplate-4.2-vh7.ova
+ Zone: Choose the zone where this hypervisor is used
+ Hypervisor: VMware
+ Format: OVA
+ OS Type: Debian GNU/Linux 7.0 (32-bit) (or the highest Debian release
+ number available in the dropdown)
+ Extractable: no
+ Password Enabled: no
+ Public: no
+ Featured: no
+
@@ -1442,7 +1427,47 @@ Done restarting router(s).
-
+
+ (KVM on RHEL 6.0/6.1 only) If your existing &PRODUCT; deployment includes one or
+ more clusters of KVM hosts running RHEL 6.0 or RHEL 6.1, perform the following:
+
+
+ Ensure that you upgrade the operating system version on those hosts before
+ upgrading &PRODUCT;
+ To do that, change the yum repository for each system with &PRODUCT; packages,
+ that implies that all the Management Servers and any hosts that have the KVM agent.
+
+
+
+ Open /etc/yum.repos.d/cloudstack.repo on any systems that
+ have &PRODUCT; packages installed.
+
+
+ Edit as follows:
+
+ [upgrade]
+ name=rhel63
+ baseurl=url-of-your-rhel6.3-repo
+ enabled=1
+ gpgcheck=0
+ [apache CloudStack]
+ name= Apache CloudStack
+ baseurl= http://cloudstack.apt-get.eu/rhel/4.0/
+ enabled=1
+ gpgcheck=0
+ If you are using the community provided package repository, change the baseurl
+ to http:// cloudstack.apt-get.eu/rhel/4.2/
+ If you are using your own package repository, change this line to read as
+ appropriate for your 4.2.0 repository.
+
+
+ Now that you have the repository configured, upgrade the host operating system
+ from RHEL 6.0 to 6.3:
+ # yum upgrade
+
+
+
+
Stop all Usage Servers if running. Run this on all Usage Server hosts.
# service cloud-usage stop
@@ -1544,32 +1569,6 @@ service cloudstack-agent restart
-
- (KVM only) Additional steps are required for each KVM host. These steps will not
- affect running guests in the cloud. These steps are required only for clouds using KVM
- as hosts and only on the KVM hosts.
-
-
- Copy the CloudPlatform 4.2 tar file to the host, untar it, and change directory
- to the resulting directory.
-
-
- Stop the running agent.
- # service cloud-agent stop
-
-
- Update the agent software.
- # ./install.sh
-
-
- Choose "U" to update the packages.
-
-
- Start the agent.
- # service cloudstack-agent start
-
-
-
If you are using CentOS or RHEL, follow this procedure to upgrade your packages. If
not, skip to step .
@@ -1579,7 +1578,7 @@ service cloudstack-agent restart
If you've created your own packages and yum repository, substitute your own URL for
the ones used in these examples.
-
+
The first order of business will be to change the yum repository for each system
with &PRODUCT; packages. This means all management servers, and any hosts that have
@@ -1728,11 +1727,26 @@ service cloudstack-agent start
"com.cloud.hypervisor.kvm.resource.LibvirtComputingResource".
- Start the cloud agent and cloud management services.
+ Upgrade all the existing bridge names to new bridge names by running this
+ script:
+ # cloudstack-agent-upgrade
+
+
+ Install a libvirt hook with the following commands:
+ # mkdir /etc/libvirt/hooks
+ # cp /usr/share/cloudstack-agent/lib/libvirtqemuhook /etc/libvirt/hooks/qemu
+ # chmod +x /etc/libvirt/hooks/qemu
+
+
+ Restart libvirtd.
+ # service libvirtd restart
+
+
+ Start the agent.
# service cloudstack-agent start
- When the Management Server is up and running, log in to the CloudStack UI and
+ When the Management Server is up and running, log in to the &PRODUCT; UI and
restart the virtual router for proper functioning of all the features.
@@ -1767,13 +1781,13 @@ service cloudstack-agent start
- Run the cloud-sysvmadm script to stop, then start, all Secondary
- Storage VMs, Console Proxy VMs, and virtual routers. Run the script once on each
- management server. Substitute your own IP address of the MySQL instance, the MySQL user
- to connect as, and the password to use for that user. In addition to those parameters,
- provide the -c and -r arguments. For
+ Run the cloudstack-sysvmadm script to stop, then start, all
+ Secondary Storage VMs, Console Proxy VMs, and virtual routers. Run the script once on
+ each management server. Substitute your own IP address of the MySQL instance, the MySQL
+ user to connect as, and the password to use for that user. In addition to those
+ parameters, provide the -c and -r arguments. For
example:
- # nohup cloud-sysvmadm -d 192.168.1.5 -u cloud -p password -c -r >
+ # nohup cloudstack-sysvmadm -d 192.168.1.5 -u cloud -p password -c -r >
sysvm.log 2>&1 &
# tail -f sysvm.log
This might take up to an hour or more to run, depending on the number of accounts in
@@ -2002,7 +2016,8 @@ service cloudstack-agent start
Zone: Choose the zone where this hypervisor is used
Hypervisor: XenServer
Format: VHD
- OS Type: Debian GNU/Linux 6.0 (32-bit)
+ OS Type: Debian GNU/Linux 7.0 (32-bit) (or the highest Debian release
+ number available in the dropdown)
Extractable: no
Password Enabled: no
Public: no
@@ -2018,7 +2033,8 @@ service cloudstack-agent start
Zone: Choose the zone where this hypervisor is used
Hypervisor: KVM
Format: QCOW2
- OS Type: Debian GNU/Linux 5.0 (32-bit)
+ OS Type: Debian GNU/Linux 7.0 (32-bit) (or the highest Debian release
+ number available in the dropdown)
Extractable: no
Password Enabled: no
Public: no
@@ -2034,7 +2050,8 @@ service cloudstack-agent start
Zone: Choose the zone where this hypervisor is used
Hypervisor: VMware
Format: OVA
- OS Type: Debian GNU/Linux 5.0 (32-bit)
+ OS Type: Debian GNU/Linux 7.0 (32-bit) (or the highest Debian release
+ number available in the dropdown)
Extractable: no
Password Enabled: no
Public: no
@@ -2056,6 +2073,46 @@ service cloudstack-agent start
hypervisor in your cloud, be sure you have repeated these steps to download the system
VM template for each hypervisor type. Otherwise, the upgrade will fail.
+
+ (KVM on RHEL 6.0/6.1 only) If your existing &PRODUCT; deployment includes one or
+ more clusters of KVM hosts running RHEL 6.0 or RHEL 6.1, perform the following:
+
+
+ Ensure that you upgrade the operating system version on those hosts before
+ upgrading &PRODUCT;
+ To do that, change the yum repository for each system with &PRODUCT; packages,
+ that implies that all the Management Servers and any hosts that have the KVM agent.
+
+
+
+ Open /etc/yum.repos.d/cloudstack.repo on any systems that
+ have &PRODUCT; packages installed.
+
+
+ Edit as follows:
+
+ [upgrade]
+ name=rhel63
+ baseurl=url-of-your-rhel6.3-repo
+ enabled=1
+ gpgcheck=0
+ [apache CloudStack]
+ name= Apache CloudStack
+ baseurl= http://cloudstack.apt-get.eu/rhel/4.0/
+ enabled=1
+ gpgcheck=0
+ If you are using the community provided package repository, change the baseurl
+ to http:// cloudstack.apt-get.eu/rhel/4.2/
+ If you are using your own package repository, change this line to read as
+ appropriate for your 4.2.0 repository.
+
+
+ Now that you have the repository configured, upgrade the host operating system
+ from RHEL 6.0 to 6.3:
+ # yum upgrade
+
+
+
Stop all Usage Servers if running. Run this on all Usage Server hosts.
# service cloud-usage stop
@@ -2089,7 +2146,7 @@ service cloudstack-agent start
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 &PRODUCT; packages. This means all management servers, and any hosts that have
@@ -2168,7 +2225,7 @@ service cloudstack-agent restart
If you've created your own packages and yum repository, substitute your own URL for
the ones used in these examples.
-
+
The first order of business will be to change the yum repository for each system
with &PRODUCT; packages. This means all management servers, and any hosts that have
@@ -2249,7 +2306,7 @@ service cloudstack-agent start
Merge your changes from the backup file into the new components.xml file.
- # vi /etc/cloud/management/components.xml
+ # vi /etc/cloudstack/management/components.xml
@@ -2281,7 +2338,7 @@ service cloudstack-agent start
CloudStack installation, the changes will be preserved in the upgrade. However, you need
to do the following steps to place these changes in a new version of the file which is
compatible with version 4.0.0-incubating.
-
+
Make a backup copy of your file
/etc/cloud/management/db.properties. For example:
@@ -2294,7 +2351,7 @@ service cloudstack-agent start
Merge your changes from the backup file into the new db.properties file.
- # vi /etc/cloud/management/db.properties
+ # vi /etc/cloudstack/management/db.properties
@@ -2339,32 +2396,6 @@ service cloudstack-agent start
this on each Usage Server host.
# service cloudstack-usage start
-
- (KVM only) Additional steps are required for each KVM host. These steps will not
- affect running guests in the cloud. These steps are required only for clouds using KVM
- as hosts and only on the KVM hosts.
-
-
- Copy the CloudPlatform 4.2 tar file to the host, untar it, and change directory
- to the resulting directory.
-
-
- Stop the running agent.
- # service cloud-agent stop
-
-
- Update the agent software.
- # ./install.sh
-
-
- Choose "U" to update the packages.
-
-
- Start the agent.
- # service cloudstack-agent start
-
-
-
(KVM only) Perform the following additional steps on each KVM host.
These steps will not affect running guests in the cloud. These steps are required
@@ -2383,21 +2414,33 @@ service cloudstack-agent start
appropriate.
# yum update cloud-*
- # apt-get update
- # apt-get upgrade cloud-*
+ # apt-get update
+ # apt-get upgrade cloud-*
-
- Start the agent.
- # service cloudstack-agent start
-
Copy the contents of the agent.properties file to the new
agent.properties file by using the following command
- sed -i 's/com.cloud.agent.resource.computing.LibvirtComputingResource/com.cloud.hypervisor.kvm.resource.LibvirtComputingResource/g' /etc/cloud/agent/agent.properties
+ sed -i 's/com.cloud.agent.resource.computing.LibvirtComputingResource/com.cloud.hypervisor.kvm.resource.LibvirtComputingResource/g' /etc/cloudstack/agent/agent.properties
- Start the cloud agent and cloud management services.
+ Upgrade all the existing bridge names to new bridge names by running this
+ script:
+ # cloudstack-agent-upgrade
+
+
+ Install a libvirt hook with the following commands:
+ # mkdir /etc/libvirt/hooks
+ # cp /usr/share/cloudstack-agent/lib/libvirtqemuhook /etc/libvirt/hooks/qemu
+ # chmod +x /etc/libvirt/hooks/qemu
+
+
+ Restart libvirtd.
+ # service libvirtd restart
+
+
+ Start the agent.
+ # service cloudstack-agent start
When the Management Server is up and running, log in to the CloudStack UI and
@@ -2421,8 +2464,8 @@ service cloudstack-agent start
the MySQL instance, the MySQL user to connect as, and the password to use for that
user. In addition to those parameters, provide the "-c" and "-r" arguments. For
example:
- # nohup cloud-sysvmadm -d 192.168.1.5 -u cloud -p password -c -r > sysvm.log 2>&1 &
- # tail -f sysvm.log
+ # nohup cloudstack-sysvmadm -d 192.168.1.5 -u cloud -p password -c -r > sysvm.log 2>&1 &
+# tail -f sysvm.log
This might take up to an hour or more to run, depending on the number of
accounts in the system.