diff --git a/docs/en-US/release-notes.xml b/docs/en-US/release-notes.xml
index 593d2f652e1..feb8c356a33 100644
--- a/docs/en-US/release-notes.xml
+++ b/docs/en-US/release-notes.xml
@@ -143,8 +143,8 @@
In the following commands, it is assumed that you have set the root password on the
database, which is a CloudStack recommended best practice. Substitute your own MySQL
root password.
- # mysqldump -u root -p<mysql_password> cloud >> cloud-backup.dmp
-# mysqldump -u root -p<mysql_password> cloud_usage > cloud-usage-backup.dmp
+ # mysqldump -u root -pmysql_password cloud > cloud-backup.dmp
+# mysqldump -u root -pmysql_password cloud_usage > cloud-usage-backup.dmp
Download CloudStack 4.0.0-incubating onto management server host where it will run. Get the
@@ -153,20 +153,20 @@
CloudStack.
- Upgrade the CloudStack packages. You should have a file in the form of
- “CloudStack-4.0-N-OSVERSION.tar.gz”. Untar the file, then run the install.sh script
- inside it. Replace the file and directory names below with those you are using:
- # tar xzf CloudStack-4.0-N-OSVERSION.tar.gz
-# cd CloudStack-4.0-N-OSVERSION
-# ./install.sh
- You should see a few messages as the installer prepares, followed by a list of
- choices.
+
+ Either build RPM/DEB packages as detailed in the Installation Guide, or use one of
+ the community provided yum/apt repositories to gain access to the &PRODUCT; binaries.
+
- Choose "U" to upgrade the package
- >U
- You should see some output as the upgrade proceeds, ending with a message like
- "Complete! Done."
+
+ After you have configured an appropriate yum or apt repository, you
+ may execute the one of the following commands as appropriate for your
+ environment in order to upgrade &PRODUCT;:
+ # yum update cloud-*
+ # apt-get update
+# apt-get upgrade cloud-*
+
If you have made changes to your existing copy of the file components.xml in your
@@ -223,19 +223,25 @@
as hosts and only on the KVM hosts.
- Copy the CloudStack 4.0.0-incubating tar file to the host, untar it, and change directory to
- the resulting directory.
+
+ Configure a yum or apt respository containing the &PRODUCT; packages as outlined
+ in the Installation Guide.
+
Stop the running agent.
# service cloud-agent stop
- Update the agent software.
- # ./install.sh
-
-
- Choose "U" to update the packages.
+
+ Update the agent software with one of the following command
+ sets as appropriate for your environment.
+
+ # yum update cloud-*
+ # apt-get update
+# apt-get upgrade cloud-*
+
+
Start the agent.
@@ -244,7 +250,9 @@
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/cloud/agent/agent.properties
+
Start the cloud agent and cloud management services.
@@ -350,7 +358,7 @@
# xe vm-list
Then use this command to migrate each VM. Replace the example host name and VM
name with your own:
- # xe vm-migrate live=true host=<host-name> vm=<VM-name>
+ # xe vm-migrate live=true host=ghost-name vm=VM-name
Troubleshooting: If you see a message like "You
attempted an operation on a VM which requires PV drivers to be installed but the
drivers were not detected," run /opt/xensource/bin/make_migratable.sh
@@ -363,7 +371,7 @@
UUID with the current host ID, and replace the hotfix UUID with the output from the
patch-upload command you ran on this machine earlier. You can also get the hotfix
UUID by running xe patch-list.
- xe patch-apply host-uuid=<host-uuid> uuid=<hotfix-uuid>
+ xe patch-apply host-uuid=ghost-uuid uuid=hotfix-uuid
Copy the following files from the CloudStack Management Server to the
@@ -585,8 +593,8 @@
In the following commands, it is assumed that you have set the root password on the
database, which is a CloudStack recommended best practice. Substitute your own MySQL
root password.
- # mysqldump -u root -p<mysql_password> cloud >> cloud-backup.dmp
-# mysqldump -u root -p<mysql_password> cloud_usage > cloud-usage-backup.dmp
+ # mysqldump -u root -pgmysql_password cloud > cloud-backup.dmp
+# mysqldump -u root -pmysql_password cloud_usage > cloud-usage-backup.dmp
@@ -636,30 +644,32 @@
Merge your changes from the backup file into the new components.xml file.
- # vi /etc/cloud/management/components.xml
+
+ # vi /etc/cloud/management/components.xml
+
If you have made changes to your existing copy of the
- /etc/cloud/management/db.properties file in your previous-version CloudStack
+ /etc/cloud/management/db.properties file in your previous-version 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
+ Make a backup copy of your file /etc/cloud/management/db.properties. For
example:
- # mv /etc/cloud/management/db.properties /etc/cloud/management/db.properties-backup
+ # mv /etc/cloud/management/db.properties /etc/cloud/management/db.properties-backup
- Copy /etc/cloud/management/db.properties.rpmnew to create a new
- /etc/cloud/management/db.properties:
- # cp -ap /etc/cloud/management/db.properties.rpmnew etc/cloud/management/db.properties
+ Copy /etc/cloud/management/db.properties.rpmnew to create a new
+ /etc/cloud/management/db.properties:
+ # cp -ap /etc/cloud/management/db.properties.rpmnew etc/cloud/management/db.properties
Merge your changes from the backup file into the new db.properties file.
- # vi /etc/cloud/management/db.properties
+ # vi /etc/cloud/management/db.properties
@@ -667,7 +677,7 @@
On the management server node, run the following command. It is recommended that you
use the command-line flags to provide your own encryption keys. See Password and Key
Encryption in the Installation Guide.
- # cloud-setup-encryption -e <encryption_type> -m <management_server_key> -k <database_key>
+ # cloud-setup-encryption -e encryption_type -m management_server_key -k database_key
When used without arguments, as in the following example, the default encryption
type and keys will be used:
@@ -710,28 +720,33 @@
as hosts and only on the KVM hosts.
- Copy the CloudStack 4.0.0-incubating .tgz download to the host, untar it,
- and cd into the resulting directory.
+
+ Configure your CloudStack package repositories as outlined
+ in the Installation Guide
+
Stop the running agent.
# service cloud-agent stop
- Update the agent software.
- # ./install.sh
-
-
- Choose "U" to update the packages.
+ Update the agent software with one of the following command sets as appropriate.
+ # yum update cloud-*
+
+ # apt-get update
+# apt-get upgrade cloud-*
+
Start the agent.
# service cloud-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
+
+ 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
Start the cloud agent and cloud management services.
@@ -758,14 +773,14 @@
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 cloud-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.
After the script terminates, check the log to verify correct execution:
- # tail -f sysvm.log
+ # tail -f sysvm.log
The content should be like the following:
Stopping and starting 1 secondary storage vm(s)...
@@ -791,7 +806,7 @@ Done restarting router(s).
Run the following commands on the XenServer or KVM host on which the system VM is
present:
- # ssh -i <private-key-path> <link-local-ip> -p 3922
+ # ssh -i private-key-path link-local-ip -p 3922
# cat /etc/cloudstack-release
The output should be like the following:
Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012
@@ -802,8 +817,8 @@ Done restarting router(s).
your own private IP.
Run the following commands on the Management Server:
- # ssh -i <private-key-path> <private-ip> -p 3922
-# cat /etc/cloudstack-release
+ # ssh -i gprivate-key-path private-ip -p 3922
+# cat /etc/cloudstack-release
The output should be like the following:
Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012
@@ -859,10 +874,10 @@ Done restarting router(s).
# xe vm-list
Then use this command to migrate each VM. Replace the example host name and VM
name with your own:
- # xe vm-migrate live=true host=<host-name> vm=<VM-name>
+ # xe vm-migrate live=true host=ghost-name vm=VM-name
Troubleshooting: If you see a message like "You
attempted an operation on a VM which requires PV drivers to be installed but the
- drivers were not detected," run /opt/xensource/bin/make_migratable.sh
+ drivers were not detected," run /opt/xensource/bin/make_migratable.sh
b6cf79c8-02ee-050b-922f-49583d9f1a14.
@@ -872,7 +887,7 @@ Done restarting router(s).
UUID with the current host ID, and replace the hotfix UUID with the output from the
patch-upload command you ran on this machine earlier. You can also get the hotfix
UUID by running xe patch-list.
- xe patch-apply host-uuid=<host-uuid> uuid=<hotfix-uuid>
+ xe patch-apply host-uuid=ghost-uuid uuid=hotfix-uuid
Copy the following files from the CloudStack Management Server to the
@@ -2073,7 +2088,7 @@ Done restarting router(s).
CS-15789
Invalid global setting prevents management server to restart. For
example, if you configure the "project.invite.timeout" parameter to
- "300<space> and attempt to restart management server, it fails without
+ "300" and attempt to restart management server, it fails without
throwing a warning or setting the value to the default.
@@ -2099,9 +2114,10 @@ Done restarting router(s).
CS-15664
A typo in the component.xml file that blocks Nicira NVP
- integration:<pluggableservice name="NiciraNvpElementService" key="com.coud.network.element.NiciraNvpElementService" class="com.cloud.network.element.NiciraNvpElement"/>
+ integration:
+ pluggableservice name="NiciraNvpElementService" key="com.coud.network.element.NiciraNvpElementService" class="com.cloud.network.element.NiciraNvpElement"/>
The line should
- be:<pluggableservice name="NiciraNvpElementService" key="com.cloud.network.element.NiciraNvpElementService" class="com.cloud.network.element.NiciraNvpElement"/>
+ be:pluggableservice name="NiciraNvpElementService" key="com.cloud.network.element.NiciraNvpElementService" class="com.cloud.network.element.NiciraNvpElement"/>
CS-15634
@@ -2296,7 +2312,7 @@ Done restarting router(s).
Remove the NICs count for the virtual network IDs returned in step
(a), and set the NIC count to 0:
- UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = <enter id of virtual network>
+ UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = enter id of virtual network
Restart the Management Server, and wait for all the networks to shut