diff --git a/docs/en-US/management-server-install-client.xml b/docs/en-US/management-server-install-client.xml
index 7e81ec735fc..b5329e3442a 100644
--- a/docs/en-US/management-server-install-client.xml
+++ b/docs/en-US/management-server-install-client.xml
@@ -1,5 +1,5 @@
-
%BOOK_ENTITIES;
]>
@@ -11,9 +11,7 @@
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
@@ -31,16 +29,6 @@
The &PRODUCT; Management server can be installed using either RPM or DEB packages. These
packages will depend on everything you need to run the Management server.
-
- Downloading vhd-util
- This procedure is required only for installations where XenServer is installed on the hypervisor hosts.
- Before setting up the Management Server, download vhd-util from vhd-util.
- If the Management Server is RHEL or CentOS, copy vhd-util to
- /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver.
- If the Management Server is Ubuntu, copy vhd-util to
- /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver/vhd-util.
-
Install on CentOS/RHEL
We start by installing the required packages:
@@ -50,4 +38,16 @@
Install on Ubuntu
apt-get install cloud-client
-
\ No newline at end of file
+
+
+ Downloading vhd-util
+ This procedure is required only for installations where XenServer is installed on the
+ hypervisor hosts.
+ Before setting up the Management Server, download vhd-util from vhd-util.
+ If the Management Server is RHEL or CentOS, copy vhd-util to
+ /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver.
+ If the Management Server is Ubuntu, copy vhd-util to
+ /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver.
+
+
diff --git a/docs/en-US/management-server-install-db-local.xml b/docs/en-US/management-server-install-db-local.xml
index 242249040b1..918cdc0a265 100644
--- a/docs/en-US/management-server-install-db-local.xml
+++ b/docs/en-US/management-server-install-db-local.xml
@@ -11,9 +11,7 @@
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
@@ -29,19 +27,23 @@
MySQL. See .
- Install MySQL from the package repository from your distribution:
+ Install MySQL from the package repository of your distribution:
On RHEL or CentOS:
yum install mysql-server
On Ubuntu:
apt-get install mysql-server
- Edit the MySQL configuration (/etc/my.cnf or /etc/mysql/my.cnf, depending on your OS)
- and insert the following lines in the [mysqld] section. You can put these lines below the
- datadir line. The max_connections parameter should be set to 350 multiplied by the number of
- Management Servers you are deploying. This example assumes one Management Server.
+ Open the MySQL configuration file. The configuration file is /etc/my.cnf or
+ /etc/mysql/my.cnf, depending on your OS.
+
+
+ Insert the following lines in the [mysqld] section.
+ You can put these lines below the datadir line. The max_connections parameter should be
+ set to 350 multiplied by the number of Management Servers you are deploying. This example
+ assumes one Management Server.
- On Ubuntu, you can also create a file /etc/mysql/conf.d/cloudstack.cnf and add these
+ On Ubuntu, you can also create a file /etc/mysql/conf.d/cloudstack.cnf and add these
directives there. Don't forget to add [mysqld] on the first line of the file.
innodb_rollback_on_timeout=1
@@ -68,6 +70,36 @@ binlog-format = 'ROW'
questions.
mysql_secure_installation
+
+ &PRODUCT; can be blocked by security mechanisms, such as SELinux. Disable SELinux to
+ ensure + that the Agent has all the required permissions.
+ Configure SELinux (RHEL and CentOS):
+
+
+ Check whether SELinux is installed on your machine. If not, you can skip this
+ section.
+ In RHEL or CentOS, SELinux is installed and enabled by default. You can verify this
+ with:
+ $ rpm -qa | grep selinux
+
+
+ Set the SELINUX variable in /etc/selinux/config to
+ "permissive". This ensures that the permissive setting will be maintained after a system
+ reboot.
+ In RHEL or CentOS:
+ vi /etc/selinux/config
+ Change the following line
+ SELINUX=enforcing
+ to this:
+ SELINUX=permissive
+
+
+ Set SELinux to permissive starting immediately, without requiring a system
+ reboot.
+ $ setenforce permissive
+
+
+
Set up the database. The following command creates the "cloud" user on the
database.
@@ -98,10 +130,10 @@ binlog-format = 'ROW'
recommended that you replace this with a more secure value. See .
-
- (Optional) For management_server_ip, you may explicitly specify cluster management
- server node IP. If not specified, the local IP address will be used.
-
+
+ (Optional) For management_server_ip, you may explicitly specify cluster management
+ server node IP. If not specified, the local IP address will be used.
+
cloud-setup-databases cloud:<dbpassword>@localhost \
--deploy-as=root:<password> \
@@ -116,9 +148,6 @@ binlog-format = 'ROW'
If you are running the KVM hypervisor on the same machine with the Management Server,
edit /etc/sudoers and add the following line:
Defaults:cloud !requiretty
-
- This type of single-machine setup is recommended only for a trial installation.
-
Now that the database is set up, you can finish configuring the OS for the Management
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade410to420.java b/server/src/com/cloud/upgrade/dao/Upgrade410to420.java
index a0592579a43..9000e15f7aa 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -59,6 +59,20 @@ public class Upgrade410to420 implements DbUpgrade {
@Override
public void performDataMigration(Connection conn) {
+ PreparedStatement sql = null;
+ try {
+ sql = conn.prepareStatement("update vm_template set image_data_store_id = 1 where type = 'SYSTEM' or type = 'BUILTIN'");
+ sql.executeUpdate();
+ } catch (SQLException e) {
+ throw new CloudRuntimeException("Failed to upgrade vm template data store uuid: " + e.toString());
+ } finally {
+ if (sql != null) {
+ try {
+ sql.close();
+ } catch (SQLException e) {
+ }
+ }
+ }
}
@Override