Closes #5: fixed merge issue Signed-off-by: Sebastien Goasguen <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/001aaa18 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/001aaa18 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/001aaa18 Branch: refs/heads/master Commit: 001aaa183eaa8a1092066d7d14a09cb77622b7b5 Parents: 20dc97e Author: Pierre-Luc Dion <[email protected]> Authored: Fri Mar 21 11:13:17 2014 -0400 Committer: Sebastien Goasguen <[email protected]> Committed: Mon Mar 24 18:16:31 2014 -0400 ---------------------------------------------------------------------- source/events.rst | 14 +++++++++----- source/management.rst | 14 +++++++------- source/troubleshooting.rst | 7 ++++--- 3 files changed, 20 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/001aaa18/source/events.rst ---------------------------------------------------------------------- diff --git a/source/events.rst b/source/events.rst index 18a38f6..5093e02 100644 --- a/source/events.rst +++ b/source/events.rst @@ -281,8 +281,8 @@ parameters have been added: day). .. note:: Archived alerts or events cannot be viewed in the UI or by using the -API. They are maintained in the database for auditing or compliance -purposes. + API. They are maintained in the database for auditing or compliance + purposes. Permissions ~~~~~~~~~~~ @@ -344,9 +344,10 @@ database activities for diagnostics purposes in messages. We recommend this command to find the problematic output in the Management Server log:. -.. note:: When copying and pasting a command, be sure the command has pasted as a -single line before executing. Some document viewers may introduce -unwanted line breaks in copied text. +.. note:: + When copying and pasting a command, be sure the command has pasted as a + single line before executing. Some document viewers may introduce + unwanted line breaks in copied text. .. code:: bash @@ -548,8 +549,11 @@ Solution Create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function. +<<<<<<< HEAD ======= Click OK. >>>>>>> 8475ba5... fix merge to upstream +======= +>>>>>>> caa1183... fixed sphinx warnings http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/001aaa18/source/management.rst ---------------------------------------------------------------------- diff --git a/source/management.rst b/source/management.rst index 9b7b346..a5f7266 100644 --- a/source/management.rst +++ b/source/management.rst @@ -159,7 +159,7 @@ add the encrypted password to management server and the usage engine if you've deployed that component. - .. code:: screen + .. code:: bash # service cloudstack-management stop # service cloudstack-usage stop @@ -169,13 +169,13 @@ add the encrypted password to Next, you'll update the password for the CloudStack user on the MySQL server. - .. code:: screen + .. code:: bash # mysql -u root -p At the MySQL shell, you'll change the password and flush privileges: - .. code:: screen + .. code:: bash update mysql.user set password=PASSWORD("newpassword123") where User='cloud'; flush privileges; @@ -187,12 +187,12 @@ add the encrypted password to password to CloudStack's database configuration (``/etc/cloudstack/management/db.properties``). - .. code:: screen + .. code:: bash # java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar \ org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ input="newpassword123" password="`cat /etc/cloudstack/management/key`" \ verbose=false - File encryption type - -------------------- +File encryption type +-------------------- Note that this is for the file encryption type. If you're using the web encryption type then you'll use @@ -214,7 +214,7 @@ add the encrypted password to After copying the new password over, you can now start CloudStack (and the usage engine, if necessary). - .. code:: screen + .. code:: bash # service cloudstack-management start # service cloud-usage start http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/001aaa18/source/troubleshooting.rst ---------------------------------------------------------------------- diff --git a/source/troubleshooting.rst b/source/troubleshooting.rst index b457322..db3ca0d 100644 --- a/source/troubleshooting.rst +++ b/source/troubleshooting.rst @@ -25,9 +25,10 @@ database activities for diagnostics purposes in messages. We recommend this command to find the problematic output in the Management Server log:. -.. note:: When copying and pasting a command, be sure the command has pasted as a -single line before executing. Some document viewers may introduce -unwanted line breaks in copied text. +.. note:: + When copying and pasting a command, be sure the command has pasted as a + single line before executing. Some document viewers may introduce + unwanted line breaks in copied text. .. code:: bash
