Updated Branches:
refs/heads/master ed757f24a -> 2327831f7
cloudstack-991
Signed-off-by: Radhika PC <ra...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2327831f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2327831f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2327831f
Branch: refs/heads/master
Commit: 2327831f7f2177894397dfc7265ffb4d8b77872a
Parents: ed757f2
Author: Radhika PC <ra...@citrix.com>
Authored: Mon Feb 18 15:07:05 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon Feb 18 18:03:39 2013 +0530
----------------------------------------------------------------------
docs/en-US/console-proxy.xml | 6 +-
docs/en-US/working-with-system-vm.xml | 56 +++++++++++++++------------
2 files changed, 34 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2327831f/docs/en-US/console-proxy.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/console-proxy.xml b/docs/en-US/console-proxy.xml
index 3dd7b9f..697ee2e 100644
--- a/docs/en-US/console-proxy.xml
+++ b/docs/en-US/console-proxy.xml
@@ -24,11 +24,11 @@
console view via the web UI. It connects the user’s browser to the VNC port made available via
the hypervisor for the console of the guest. Both the administrator and end user web UIs offer a
console connection.</para>
- <para>Clicking on a console icon brings up a new window. The AJAX code downloaded into that window
+ <para>Clicking a console icon brings up a new window. The AJAX code downloaded into that window
refers to the public IP address of a console proxy VM. There is exactly one public IP address
allocated per console proxy VM. The AJAX application connects to this IP. The console proxy then
- proxies the connection to the VNC port for the requested VM on the Host hosting the guest.
- .</para>
+ proxies the connection to the VNC port for the requested VM on the Host hosting the
+ guest.</para>
<note>
<para>The hypervisors will have many ports assigned to VNC usage so that multiple VNC sessions
can occur simultaneously.</para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2327831f/docs/en-US/working-with-system-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-system-vm.xml b/docs/en-US/working-with-system-vm.xml
index 97459f9..70f7dd1 100644
--- a/docs/en-US/working-with-system-vm.xml
+++ b/docs/en-US/working-with-system-vm.xml
@@ -1,33 +1,39 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
-
<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- 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
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ 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
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-
<chapter id="working-with-system-vm">
- <title>Working with System Virtual Machines</title>
- <para>&PRODUCT; uses several types of system virtual machines to perform tasks in the cloud. In general &PRODUCT; manages these system VMs and creates, starts, and stops them as needed based on scale and immediate needs. However, the administrator should be aware of them and their roles to assist in debugging issues.</para>
- <xi:include href="system-vm-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="multiple-system-vm-vmware.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="console-proxy.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="virtual-router.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="secondary-storage-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <title>Working with System Virtual Machines</title>
+ <para>&PRODUCT; uses several types of system virtual machines to perform tasks in the cloud. In
+ general &PRODUCT; manages these system VMs and creates, starts, and stops them as needed based
+ on scale and immediate needs. However, the administrator should be aware of them and their roles
+ to assist in debugging issues.</para>
+ <note>
+ <para>You can configure the system.vm.random.password parameter to create a random system VM
+ password to ensure higher security. If you reset the value for system.vm.random.password to
+ true and restart the Management Server, a random password is generated and stored encrypted in
+ the database. You can view the decrypted password under the system.vm.password global
+ parameter on the &PRODUCT; UI or by calling the listConfigurations API.</para>
+ </note>
+ <xi:include href="system-vm-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="multiple-system-vm-vmware.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="console-proxy.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="virtual-router.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="secondary-storage-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</chapter>