diff --git a/docs/en-US/about-password-encryption.xml b/docs/en-US/about-password-encryption.xml
index 3f7c4c84350..3cd84d19508 100644
--- a/docs/en-US/about-password-encryption.xml
+++ b/docs/en-US/about-password-encryption.xml
@@ -54,8 +54,8 @@
external source during Management Server startup. This key can be provided in one of two ways:
loaded from a file or provided by the &PRODUCT; administrator. The &PRODUCT; database has a new
configuration setting that lets it know which of these methods will be used. If the encryption
- type is set to “file,” the key must be in a file in a known location. If the encryption type is
- set to “web,” the administrator runs the utility
+ type is set to "file," the key must be in a file in a known location. If the encryption type is
+ set to "web," the administrator runs the utility
com.cloud.utils.crypt.EncryptionSecretKeySender, which relays the key to the Management Server
over a known port.
The encryption type, database secret key, and Management Server secret key are set during
diff --git a/docs/en-US/change-database-config.xml b/docs/en-US/change-database-config.xml
index fadb64c27e7..34e767251e0 100644
--- a/docs/en-US/change-database-config.xml
+++ b/docs/en-US/change-database-config.xml
@@ -24,5 +24,5 @@
Changing the Database Configuration
- The &PRODUCT; Management Server stores database configuration information (e.g., hostname, port, credentials) in the file /etc/cloud/management/db.properties. To effect a change, edit this file on each Management Server, then restart the Management Server.
-
\ No newline at end of file
+ The &PRODUCT; Management Server stores database configuration information (e.g., hostname, port, credentials) in the file /etc/cloud/management/db.properties. To effect a change, edit this file on each Management Server, then restart the Management Server.
+
diff --git a/docs/en-US/change-database-password.xml b/docs/en-US/change-database-password.xml
new file mode 100644
index 00000000000..9041ade9f26
--- /dev/null
+++ b/docs/en-US/change-database-password.xml
@@ -0,0 +1,74 @@
+
+
+%BOOK_ENTITIES;
+]>
+
+
+
+
+ Changing the Database Password
+ You may need to change the password for the MySQL account used by CloudStack. If so, you'll need to change the password in MySQL, and then add the encrypted password to /etc/cloud/management/db.properties.
+
+ Before changing the password, you'll need to stop CloudStack's management server and the usage engine if you've deployed that component.
+
+# service cloud-management stop
+# service cloud-usage stop
+
+
+
+ Next, you'll update the password for the CloudStack user on the MySQL server.
+
+# mysql -u root -p
+
+ At the MySQL shell, you'll change the password and flush privileges:
+
+update mysql.user set password=PASSWORD("newpassword123") where User='cloud';
+flush privileges;
+quit;
+
+
+
+ The next step is to encrypt the password and copy the encrypted password to CloudStack's database configuration (/etc/cloud/management/db.properties).
+
+# java -classpath /usr/share/java/cloud-jasypt-1.8.jar \
+org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \
+input="newpassword123" password="`cat /etc/cloud/management/key`" \
+verbose=false
+
+
+File encryption type
+ Note that this is for the file encryption type. If you're using the web encryption type (see ) then you'll use password="management_server_secret_key"
+
+
+
+ Now, you'll update /etc/cloud/management/db.properties with the new ciphertext. Open /etc/cloud/management/db.properties in a text editor, and update these parameters:
+
+db.cloud.password=ENC(encrypted_password_from_above)
+db.usage.password=ENC(encrypted_password_from_above)
+
+
+
+ After copying the new password over, you can now start CloudStack (and the usage engine, if necessary).
+
+ # service cloud-management start
+ # service cloud-usage start
+
+
+
diff --git a/docs/en-US/manage-cloud.xml b/docs/en-US/manage-cloud.xml
index 3e29d09cdc1..f5df2c62325 100644
--- a/docs/en-US/manage-cloud.xml
+++ b/docs/en-US/manage-cloud.xml
@@ -26,7 +26,8 @@
Managing the Cloud
+
-
\ No newline at end of file
+
diff --git a/docs/en-US/management-server-install-systemvm.xml b/docs/en-US/management-server-install-systemvm.xml
index 6cd1ef7a0ff..df2c3738abf 100644
--- a/docs/en-US/management-server-install-systemvm.xml
+++ b/docs/en-US/management-server-install-systemvm.xml
@@ -37,8 +37,7 @@
If your secondary storage mount point is not named /mnt/secondary, substitute your own
mount point name.
If you set the &PRODUCT; database encryption type to "web" when you set up the database,
- you must now add the parameter -s <management-server-secret-key>. See About Password
- and Key Encryption.
+ you must now add the parameter -s <management-server-secret-key>. See .
This process will require approximately 5 GB of free space on the local file system and
up to 30 minutes each time it runs.