date:20140909

[15/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/usage.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/usage.po 
b/source/locale/zh_CN/LC_MESSAGES/usage.po
new file mode 100644
index 000..ae8f954
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/usage.po
@@ -0,0 +1,1656 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-24 18:31+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 0337566b79334160ac7120790c9d0ac7
+#: ../../usage.rst:18
+msgid "Working with Usage"
+msgstr "ä½¿ç¨æå¡"
+
+# ef6eee68a2ab4c3eb31cb3115bab6062
+#: ../../usage.rst:20
+msgid ""
+"The Usage Server is an optional, separately-installed part of CloudStack "
+"that provides aggregated usage records which you can use to create billing "
+"integration for CloudStack. The Usage Server works by taking data from the "
+"events log and creating summary usage records that you can access using the "
+"listUsageRecords API call."
+msgstr "ä½¿ç¨æå¡å¨æ¯CloudStackä¸ä¸ªå¯éé¡¹,åå«å®è£
äº§åçä¸é¨å,æä¾äºèåä½¿ç¨è®°å½æ¨å¯ä»¥ä½¿ç¨å®æ¥åå»ºè®¡è´¹éæäº§åãä½¿ç¨æå¡å¨éè¿ä½¿ç¨æ°æ®ä»äºä»¶æ¥å¿ååå»ºæ±æ»ä½¿ç¨è®°å½,æ¨å¯ä»¥è®¿é®ä½¿ç¨listUsageRecords
 APIè°ç¨ã"
+
+# 3f5a5a7bc4cc4528840d66c404992c64
+#: ../../usage.rst:26
+msgid ""
+"The usage records show the amount of resources, such as VM run time or "
+"template storage space, consumed by guest instances."
+msgstr 
"ä½¿ç¨è®°å½æ¾ç¤ºæ°éçèµæº,æ¯å¦èææºè¿è¡æ¶é´ææ¨¡æ¿åå¨ç©ºé´ï¼ä»¥è¢«å®¢äººæ¶èä¸ºä¾ã"
+
+# 7534ac8e2cf443e7801e747d7e156ec4
+#: ../../usage.rst:29
+msgid ""
+"The Usage Server runs at least once per day. It can be configured to run "
+"multiple times per day."
+msgstr "ä½¿ç¨æå¡å¨è¿è¡è³å°æ¯å¤©ä¸æ¬¡ãå®å¯ä»¥è¢«é
ç½®ä¸ºæ¯å¤©å¤æ¬¡è¿è¡ã"
+
+# ea7f343f907540088f49db087d846e0c
+#: ../../usage.rst:33
+msgid "Configuring the Usage Server"
+msgstr "éç½®ä½¿ç¨æå¡å¨"
+
+# 5aa6afef926b456384cf8fe5fef33e85
+#: ../../usage.rst:35
+msgid "To configure the usage server:"
+msgstr "éç½®ä½¿ç¨æå¡å¨"
+
+# 4a2672643b7e4281babb6fa1f2c8f5c6
+#: ../../usage.rst:39
+msgid ""
+"Be sure the Usage Server has been installed. This requires extra steps "
+"beyond just installing the CloudStack software. See Installing the Usage "
+"Server (Optional) in the Advanced Installation Guide."
+msgstr "ç¡®å®ä½¿ç¨æå¡å¨å·²ç»è¢«å®è£ãå®è¦æ±å®è£
é¢å¤çCloudStackè½¯ä»¶æ¥éª¤ãåè§é«çº§å®è£
æåä¸çä½¿ç¨æå¡å¨ï¼å¯éï¼ã"
+
+# b81ee209e7eb43f2b4440774ee120d74
+#: ../../usage.rst:45
+msgid "Log in to the CloudStack UI as administrator."
+msgstr "ä½ä¸ºç®¡çåç»å½å°CloudStackç¨æ·çé¢ã"
+
+# b71109d7bf9b4edd8cb8b8b3c62c7375
+#: ../../usage.rst:49
+msgid "Click Global Settings."
+msgstr "åå»å¨å±è®¾ç½®"
+
+# d97b663ae09745498728fffc03e2f754
+#: ../../usage.rst:53
+msgid ""
+"In Search, type usage. Find the configuration parameter that controls the "
+"behavior you want to set. See the table below for a description of the "
+"available parameters."
+msgstr "å¨æç´¢æ è¾å¥ usageãæ¾å°noéè¦æ¹åçé
ç½®åæ°ãä¸è¡¨æ¯è¿äºåæ°çè¯¦ç»æè¿°ã"
+
+# b0484803860b4b1a99bb5c37475c7246
+#: ../../usage.rst:59
+msgid "In Actions, click the Edit icon."
+msgstr "å¨æä½æ ç¹å»ç¼è¾å¾æ ã"
+
+# 704d9670a22a4b81b84bd8f2aa97bb9a
+#: ../../usage.rst:63
+msgid "Type the desired value and click the Save icon."
+msgstr "è¾å¥æ°å¼ç¹å»ä¿åå¾æ ã"
+
+# f01266ae6922418997f31eb79d697cab
+#: ../../usage.rst:67
+msgid ""
+"Restart the Management Server (as usual with any global configuration "
+"change) and also the Usage Server:"
+msgstr "éæ°å¯å¨ç®¡çæå¡å¨ï¼éå¸¸å¨æ¹åäºå¨å±é
ç½®ä¹åé½è¦è¿è¡è¿æ¥ï¼å¹¶éå¯ä½¿ç¨æå¡å¨ã"
+
+# 7b5da1780fc444d2b67d97b1a97eabb7
+#: ../../usage.rst:75
+msgid ""
+"The following table shows the global configuration settings that control the"
+" behavior of the Usage Server."
+msgstr "ä¸è¡¨ååºäºå¨å±éç½®ä¸æ§å¶ä½¿ç¨æå¡å¨çéç½®é¡¹ã"
+
+# 0ca8d699a2cd4e91b01369666cbcb2ca
+#: ../../usage.rst:78
+msgid "Parameter Name  Description"
+msgstr "åæ°åæè¿°"
+
+# a6789ec8fc34419ba8e0cc40f94d7f67
+#: ../../usage.rst:80
+msgid "enable

[28/40] git commit: Adding logo to 4.3 index page

2014-09-09 Thread rajani

Adding logo to 4.3 index page


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/a55b0dbc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/a55b0dbc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/a55b0dbc

Branch: refs/heads/4.4
Commit: a55b0dbcf3c56bb856bc3243ec36ef7025af2204
Parents: e54cd24
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:30:12 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:30:12 2014 +0200

--
 source/_static/images/acslogo.png | Bin 0 -> 135394 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a55b0dbc/source/_static/images/acslogo.png
--
diff --git a/source/_static/images/acslogo.png 
b/source/_static/images/acslogo.png
new file mode 100644
index 000..a938231
Binary files /dev/null and b/source/_static/images/acslogo.png differ

[12/40] git commit: Fixed formatting by Will stevens

2014-09-09 Thread rajani

Fixed formatting by Will stevens


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/68c20df4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/68c20df4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/68c20df4

Branch: refs/heads/4.4
Commit: 68c20df481a0bc13e1794a4a897686977139a17c
Parents: 72a3a7c
Author: Will Stevens 
Authored: Tue May 20 12:33:17 2014 -0400
Committer: Sebastien Goasguen 
Committed: Wed May 21 08:25:06 2014 +0200

--
 source/accounts.rst |  76 +-
 source/administration.rst   |  18 +-
 source/api.rst  |  34 +-
 source/events.rst   | 189 ++--
 source/hosts.rst| 245 ++---
 source/index.rst|  34 +
 source/management.rst   | 381 
 source/networking.rst   | 232 ++---
 .../networking/global_server_load_balancing.rst |  20 +-
 source/networking/portable_ips.rst  |   4 +-
 source/networking/security_groups.rst   |   3 +-
 source/projects.rst | 261 ++
 source/reliability.rst  |  65 +-
 source/service_offerings.rst| 311 ++-
 source/storage.rst  | 326 +++
 source/systemvm.rst | 381 +++-
 source/templates.rst| 908 +++
 source/troubleshooting.rst  | 231 ++---
 source/tuning.rst   |  39 +-
 source/ui.rst   |  76 +-
 source/usage.rst| 734 +--
 source/virtual_machines.rst | 781 ++--
 22 files changed, 1942 insertions(+), 3407 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 5367743..e5d4b6d 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -27,6 +27,7 @@ An account typically represents a customer of the service 
provider or a
 department in a large organization. Multiple users can exist in an
 account.
 
+
 Domains
 ~~~
 
@@ -40,6 +41,7 @@ For each account created, the Cloud installation creates 
three different
 types of user accounts: root administrator, domain administrator, and
 user.
 
+
 Users
 ~
 
@@ -59,6 +61,7 @@ may be multiple administrators in the system. Administrators 
can create
 or delete other administrators, and change the password for any user in
 the system.
 
+
 Domain Administrators
 ~
 
@@ -66,6 +69,7 @@ Domain administrators can perform administrative operations 
for users
 who belong to that domain. Domain administrators do not have visibility
 into physical servers or other domains.
 
+
 Root Administrator
 ~~
 
@@ -73,6 +77,7 @@ Root administrators have complete access to the system, 
including
 managing templates, service offerings, customer care administrators, and
 domains
 
+
 Resource Ownership
 ~~
 
@@ -86,6 +91,7 @@ account by using the assignVirtualMachine API. A domain or 
sub-domain
 administrator can do the same for VMs within the domain from one account
 to any other account in the domain or any of its sub-domains.
 
+
 Dedicating Resources to Accounts and Domains
 
 
@@ -99,26 +105,21 @@ that domain.
 
 There are several types of dedication available:
 
--
-
-   Explicit dedication. A zone, pod, cluster, or host is dedicated to an
+-  Explicit dedication. A zone, pod, cluster, or host is dedicated to an
account or domain by the root administrator during initial deployment
and configuration.
 
--
-
-   Strict implicit dedication. A host will not be shared across multiple
+-  Strict implicit dedication. A host will not be shared across multiple
accounts. For example, strict implicit dedication is useful for
deployment of certain types of applications, such as desktops, where
no host can be shared between different accounts without violating
the desktop software's terms of license.
 
--
-
-   Preferred implicit dedication. The VM will be deployed in dedicated
+-  Preferred implicit dedication. The VM will be deployed in dedicated
infrastructure if possible. Otherwise, the VM can be deployed in
shared infrastructure.
 
+
 How to Dedicate a Zone, Cluster, Pod, or Host to an Account or Domain
 --
 
@@ -138,6

[37/40] git commit: moved ldap.firstname.attribute to the correct section.

2014-09-09 Thread rajani

moved ldap.firstname.attribute to the correct section.

Signed-off-by: Rajani Karuturi 

closes #17


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/33566771
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/33566771
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/33566771

Branch: refs/heads/4.4
Commit: 3356677127398157ab265a98f08c1cf89b406bea
Parents: d92feaf
Author: Rajani Karuturi 
Authored: Wed Aug 27 10:00:36 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Aug 27 10:06:15 2014 +0530

--
 source/accounts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/33566771/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 06a1660..83d7329 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -218,6 +218,9 @@ default values are for openldap)
 -  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
Default value for AD and openldap is **givenname**.
 
+-  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
+   Default value for AD and openldap is **sn**.
+
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
Default value is **SAMAccountName** for AD and **uid** for openldap.
 
@@ -232,9 +235,6 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
-   Default value for AD and openldap is **sn**.
-
 -  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
to use for LDAP SSL.

[32/40] git commit: add make.sh for lazy doc build

2014-09-09 Thread rajani

add make.sh for lazy doc build


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/1732dae7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/1732dae7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/1732dae7

Branch: refs/heads/4.4
Commit: 1732dae7bed038a4871003c927860e4926a00fa8
Parents: fce127e
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:04:30 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:41 2014 -0400

--
 make.sh | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/1732dae7/make.sh
--
diff --git a/make.sh b/make.sh
new file mode 100755
index 000..d4e96fd
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,3 @@
+rm -fr build
+mkdir build
+sphinx-build -b html source build

[01/40] git commit: CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: This closes #9

2014-09-09 Thread rajani

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/4.4 00c90ec09 -> 6507638ec


CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: 
This closes #9

Signed-off-by: Sebastien Goasguen 


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/ba544d2a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/ba544d2a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/ba544d2a

Branch: refs/heads/4.4
Commit: ba544d2ad6f075325d28e80049a4dc6b80082341
Parents: 8ba
Author: Will Stevens 
Authored: Mon May 12 12:56:36 2014 -0400
Committer: Sebastien Goasguen 
Committed: Thu May 15 16:56:41 2014 +0200

--
 source/networking2.rst  |   2 +
 source/palo_alto_config.rst | 282 +++
 2 files changed, 284 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/networking2.rst
--
diff --git a/source/networking2.rst b/source/networking2.rst
index b020a19..b3743fc 100644
--- a/source/networking2.rst
+++ b/source/networking2.rst
@@ -6952,6 +6952,8 @@ To create a persistent network, perform the following:
 
Click OK.
 
+.. include:: palo_alto_config.rst
+
 .. |guest-traffic-setup.png| image:: _static/images/guest-traffic-setup.png
:alt: Depicts a guest traffic setup
 .. |networksinglepod.png| image:: _static/images/network-singlepod.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/palo_alto_config.rst
--
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
new file mode 100644
index 000..6c0aa46
--- /dev/null
+++ b/source/palo_alto_config.rst
@@ -0,0 +1,282 @@
+.. 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.
+
+
+
+Setup a Palo Alto Networks Firewall
+---
+
+
+Functionality Provided
+~~
+
+This implementation enable the orchestration of a Palo Alto Networks Firewall 
from within CloudStack UI and API.  
+
+**The following features are supported**:
+
+- List/Add/Delete Palo Alto Networks service provider
+- List/Add/Delete Palo Alto Networks network service offering
+- List/Add/Delete Palo Alto Networks network using the above service offering
+- Add an instance to a Palo Alto Networks network
+- Source NAT management on network create and delete
+- List/Add/Delete Ingress Firewall rule
+- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules 
supported)
+- List/Add/Delete Port Forwarding rule
+- List/Add/Delete Static NAT rule
+- Apply a Threat Profile to all firewall rules (more details in the Additional 
Features section)
+- Apply a Log Forwarding profile to all firewall rules (more details in the 
Additional Features section)
+
+
+
+Initial Palo Alto Networks Firewall Configuration
+~
+
+Anatomy of the Palo Alto Networks Firewall
+^^
+
+- In **'Network > Interfaces'** there is a list of physical interfaces as well 
as aggregated physical interfaces which are used for managing traffic in and 
out of the Palo Alto Networks Firewall device.
+- In **'Network > Zones'** there is a list of the different configuration 
zones.  This implementation will use two zones; a public (defaults to 
'untrust') and private (defaults to 'trust') zone.
+- In **'Network > Virtual Routers'** there is a list of VRs which handle 
traffic routing for the Palo Alto Firewall.  We only use a single Virtual 
Router on the firewall and it is used to handle all the routing to the next 
network hop.
+- In **'Objects > Security Profile Groups'** there is a list of profiles which 
can be applied to firewall rules.  These profiles are used to better understand 
the types of traffic that is flowing through your network.  Configured when you 
add the firewall provider to C

[13/40] git commit: Fix conf.py for localization setup

2014-09-09 Thread rajani

Fix conf.py for localization setup


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/a209573e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/a209573e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/a209573e

Branch: refs/heads/4.4
Commit: a209573e23085f013d41dec87d4147c05983f56c
Parents: 68c20df
Author: Sebastien Goasguen 
Authored: Tue May 27 10:56:03 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue May 27 10:56:03 2014 +0200

--
 source/conf.py | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a209573e/source/conf.py
--
diff --git a/source/conf.py b/source/conf.py
index d8ef428..517956a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -35,6 +35,10 @@ extensions = []
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
+# Localization
+locale_dirs = ['./locale/']
+gettext_compact = False
+
 # The suffix of source filenames.
 source_suffix = '.rst'

[33/40] git commit: CLOUDSTACK-5879: Updated rabbitmq eventbus path

2014-09-09 Thread rajani

CLOUDSTACK-5879: Updated rabbitmq eventbus path

Signed-off-by: Pierre-Luc Dion 


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/e0bbecbe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/e0bbecbe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/e0bbecbe

Branch: refs/heads/4.4
Commit: e0bbecbec09357577ae3395f65d28e8148405138
Parents: 1732dae
Author: Erik Weber 
Authored: Tue Aug 19 19:57:13 2014 +0200
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:48 2014 -0400

--
 source/events.rst | 30 +-
 1 file changed, 21 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e0bbecbe/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index cbba93b..d500a5c 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -95,7 +95,9 @@ As a CloudStack administrator, perform the following one-time
 configuration to enable event notification framework. At run time no
 changes can control the behaviour.
 
-#. Open ``'componentContext.xml``.
+#. Create the folder ``/etc/cloudstack/management/META-INF/cloudstack/core``
+
+#. Inside that folder, open ``spring-event-bus-context.xml``.
 
 #. Define a bean named ``eventNotificationBus`` as follows:
 
@@ -118,14 +120,24 @@ changes can control the behaviour.
 
   .. code:: bash
 
- 
-   
-   
-   
-   
-   
-   
- 
+ http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
+
+   
+   
+   
+   
+   
+   
+
+ 
 
   The ``eventNotificationBus`` bean represents the
   ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.

[39/40] git commit: ignoring .po and .mo files during merge

2014-09-09 Thread rajani

ignoring .po and .mo files during merge


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/5d59a37d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/5d59a37d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/5d59a37d

Branch: refs/heads/4.4
Commit: 5d59a37d0d2ca0f6ee6d5193fcdf4bb8a42e5e43
Parents: fe5b65d
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:02:31 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:02:31 2014 +0530

--
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5d59a37d/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..a4cfe93
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.po merge=ours
+*.mo merge=ours

[36/43] git commit: fix ldap section typo

2014-09-09 Thread rajani

fix ldap section typo


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/343b43d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/343b43d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/343b43d6

Branch: refs/heads/master
Commit: 343b43d63e5480085702cccae43a3622ecbcbd73
Parents: 75828eb
Author: Pierre-Luc Dion 
Authored: Wed Aug 20 07:43:05 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Wed Aug 20 07:44:03 2014 -0400

--
 source/accounts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/343b43d6/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index b555742..06a1660 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -219,7 +219,7 @@ default values are for openldap)
Default value for AD and openldap is **givenname**.
 
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
-  Default value is **SAMAccountName** for AD and **uid** for openldap.
+   Default value is **SAMAccountName** for AD and **uid** for openldap.
 
 
 Restricting LDAP users to a group:

[03/43] git commit: Fixing typo in creating affinity group

2014-09-09 Thread rajani

Fixing typo in creating affinity group


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/5a4a44d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/5a4a44d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/5a4a44d2

Branch: refs/heads/master
Commit: 5a4a44d23edd5b55768c0e4836a2dca0b8461b99
Parents: a49d204
Author: Sebastien Goasguen 
Authored: Fri May 16 22:18:59 2014 +0200
Committer: Sebastien Goasguen 
Committed: Fri May 16 22:18:59 2014 +0200

--
 source/virtual_machines.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5a4a44d2/source/virtual_machines.rst
--
diff --git a/source/virtual_machines.rst b/source/virtual_machines.rst
index 568735a..2c9e8a3 100644
--- a/source/virtual_machines.rst
+++ b/source/virtual_machines.rst
@@ -400,7 +400,7 @@ To add an affinity group:
 
   Type. The only supported type shipped with CloudStack is Host
   Anti-Affinity. This indicates that the VMs in this group should
-  avoid being placed on the same VM with each other. If you see
+  avoid being placed on the same host with each other. If you see
   other types in this list, it means that your installation of
   CloudStack has been extended with customized affinity group
   plugins.

[32/43] git commit: add make.sh for lazy doc build

2014-09-09 Thread rajani

add make.sh for lazy doc build


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/1732dae7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/1732dae7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/1732dae7

Branch: refs/heads/master
Commit: 1732dae7bed038a4871003c927860e4926a00fa8
Parents: fce127e
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:04:30 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:41 2014 -0400

--
 make.sh | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/1732dae7/make.sh
--
diff --git a/make.sh b/make.sh
new file mode 100755
index 000..d4e96fd
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,3 @@
+rm -fr build
+mkdir build
+sphinx-build -b html source build

[12/43] git commit: Fixed formatting by Will stevens

2014-09-09 Thread rajani

Fixed formatting by Will stevens


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/68c20df4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/68c20df4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/68c20df4

Branch: refs/heads/master
Commit: 68c20df481a0bc13e1794a4a897686977139a17c
Parents: 72a3a7c
Author: Will Stevens 
Authored: Tue May 20 12:33:17 2014 -0400
Committer: Sebastien Goasguen 
Committed: Wed May 21 08:25:06 2014 +0200

--
 source/accounts.rst |  76 +-
 source/administration.rst   |  18 +-
 source/api.rst  |  34 +-
 source/events.rst   | 189 ++--
 source/hosts.rst| 245 ++---
 source/index.rst|  34 +
 source/management.rst   | 381 
 source/networking.rst   | 232 ++---
 .../networking/global_server_load_balancing.rst |  20 +-
 source/networking/portable_ips.rst  |   4 +-
 source/networking/security_groups.rst   |   3 +-
 source/projects.rst | 261 ++
 source/reliability.rst  |  65 +-
 source/service_offerings.rst| 311 ++-
 source/storage.rst  | 326 +++
 source/systemvm.rst | 381 +++-
 source/templates.rst| 908 +++
 source/troubleshooting.rst  | 231 ++---
 source/tuning.rst   |  39 +-
 source/ui.rst   |  76 +-
 source/usage.rst| 734 +--
 source/virtual_machines.rst | 781 ++--
 22 files changed, 1942 insertions(+), 3407 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 5367743..e5d4b6d 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -27,6 +27,7 @@ An account typically represents a customer of the service 
provider or a
 department in a large organization. Multiple users can exist in an
 account.
 
+
 Domains
 ~~~
 
@@ -40,6 +41,7 @@ For each account created, the Cloud installation creates 
three different
 types of user accounts: root administrator, domain administrator, and
 user.
 
+
 Users
 ~
 
@@ -59,6 +61,7 @@ may be multiple administrators in the system. Administrators 
can create
 or delete other administrators, and change the password for any user in
 the system.
 
+
 Domain Administrators
 ~
 
@@ -66,6 +69,7 @@ Domain administrators can perform administrative operations 
for users
 who belong to that domain. Domain administrators do not have visibility
 into physical servers or other domains.
 
+
 Root Administrator
 ~~
 
@@ -73,6 +77,7 @@ Root administrators have complete access to the system, 
including
 managing templates, service offerings, customer care administrators, and
 domains
 
+
 Resource Ownership
 ~~
 
@@ -86,6 +91,7 @@ account by using the assignVirtualMachine API. A domain or 
sub-domain
 administrator can do the same for VMs within the domain from one account
 to any other account in the domain or any of its sub-domains.
 
+
 Dedicating Resources to Accounts and Domains
 
 
@@ -99,26 +105,21 @@ that domain.
 
 There are several types of dedication available:
 
--
-
-   Explicit dedication. A zone, pod, cluster, or host is dedicated to an
+-  Explicit dedication. A zone, pod, cluster, or host is dedicated to an
account or domain by the root administrator during initial deployment
and configuration.
 
--
-
-   Strict implicit dedication. A host will not be shared across multiple
+-  Strict implicit dedication. A host will not be shared across multiple
accounts. For example, strict implicit dedication is useful for
deployment of certain types of applications, such as desktops, where
no host can be shared between different accounts without violating
the desktop software's terms of license.
 
--
-
-   Preferred implicit dedication. The VM will be deployed in dedicated
+-  Preferred implicit dedication. The VM will be deployed in dedicated
infrastructure if possible. Otherwise, the VM can be deployed in
shared infrastructure.
 
+
 How to Dedicate a Zone, Cluster, Pod, or Host to an Account or Domain
 --
 
@@ -13

[29/43] git commit: Add local RTD theme default

2014-09-09 Thread rajani

Add local RTD theme default


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/018c1ad5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/018c1ad5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/018c1ad5

Branch: refs/heads/master
Commit: 018c1ad50ccd31f25234ff1b1fec73dd3ee012e1
Parents: a55b0db
Author: Sebastien Goasguen 
Authored: Mon Jun 30 12:49:17 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 12:49:17 2014 +0200

--
 source/conf.py | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/018c1ad5/source/conf.py
--
diff --git a/source/conf.py b/source/conf.py
index 517956a..b181590 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -17,6 +17,8 @@
 import sys
 import os
 
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -105,6 +107,13 @@ pygments_style = 'sphinx'
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 html_theme = 'default'
+if not on_rtd:
+try:
+import sphinx_rtd_theme
+html_theme = 'sphinx_rtd_theme'
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+except ImportError:
+pass
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

[06/43] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/remote_access_vpn.rst
--
diff --git a/source/networking/remote_access_vpn.rst 
b/source/networking/remote_access_vpn.rst
new file mode 100644
index 000..94e9733
--- /dev/null
+++ b/source/networking/remote_access_vpn.rst
@@ -0,0 +1,696 @@
+.. 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.
+   
+
+Remote Access VPN
+-
+
+CloudStack account owners can create virtual private networks (VPN) to
+access their virtual machines. If the guest network is instantiated from
+a network offering that offers the Remote Access VPN service, the
+virtual router (based on the System VM) is used to provide the service.
+CloudStack provides a L2TP-over-IPsec-based remote access VPN service to
+guest virtual networks. Since each network gets its own virtual router,
+VPNs are not shared across the networks. VPN clients native to Windows,
+Mac OS X and iOS can be used to connect to the guest networks. The
+account owner can create and manage users for their VPN. CloudStack does
+not use its account database for this purpose but uses a separate table.
+The VPN user database is shared across all the VPNs created by the
+account owner. All VPN users get access to all VPNs created by the
+account owner.
+
+.. note:: 
+   Make sure that not all traffic goes through the VPN. That is, the route
+   installed by the VPN should be only for the guest network and not for
+   all traffic.
+
+-  **Road Warrior / Remote Access**. Users want to be able to connect
+   securely from a home or office to a private network in the cloud.
+   Typically, the IP address of the connecting client is dynamic and
+   cannot be preconfigured on the VPN server.
+
+-  **Site to Site**. In this scenario, two private subnets are connected
+   over the public Internet with a secure VPN tunnel. The cloud user's
+   subnet (for example, an office network) is connected through a
+   gateway to the network in the cloud. The address of the user's
+   gateway must be preconfigured on the VPN server in the cloud. Note
+   that although L2TP-over-IPsec can be used to set up Site-to-Site
+   VPNs, this is not the primary intent of this feature. For more
+   information, see ":ref:`setting-s2s-vpn-conn`".
+
+
+Configuring Remote Access VPN
+~
+
+To set up VPN for the cloud:
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, click Global Settings.
+
+#. Set the following global configuration parameters.
+
+   -  remote.access.vpn.client.ip.range - The range of IP addresses to
+  be allocated to remote access VPN clients. The first IP in the
+  range is used by the VPN server.
+
+   -  remote.access.vpn.psk.length - Length of the IPSec key.
+
+   -  remote.access.vpn.user.limit - Maximum number of VPN users per
+  account.
+
+To enable VPN for a particular network:
+
+#. Log in as a user or administrator to the CloudStack UI.
+
+#. In the left navigation, click Network.
+
+#. Click the name of the network you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click one of the displayed IP address names.
+
+#. Click the Enable VPN button. |vpn-icon.png|
+
+   The IPsec key is displayed in a popup window.
+
+
+Configuring Remote Access VPN in VPC
+
+
+On enabling Remote Access VPN on a VPC, any VPN client present outside
+the VPC can access VMs present in the VPC by using the Remote VPN
+connection. The VPN client can be present anywhere except inside the VPC
+on which the user enabled the Remote Access VPN service.
+
+To enable VPN for a VPC:
+
+#. Log in as a user or administrator to the CloudStack UI.
+
+#. In the left navigation, click Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  P

[24/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/hosts.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/hosts.po 
b/source/locale/zh_CN/LC_MESSAGES/hosts.po
new file mode 100644
index 000..4d900c2
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/hosts.po
@@ -0,0 +1,1059 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-10 06:42+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 592d97db5d074967b8037886828bbbf7
+#: ../../hosts.rst:18
+msgid "Working with Hosts"
+msgstr "ä½¿ç¨ä¸»æº"
+
+# eb6157eff5a24266a1934dce1cc5c38e
+#: ../../hosts.rst:21
+msgid "Adding Hosts"
+msgstr "æ·»å ä¸»æº"
+
+# 8278623233e349e2bbe063bea7e23268
+#: ../../hosts.rst:23
+msgid ""
+"Additional hosts can be added at any time to provide more capacity for guest"
+" VMs. For requirements and instructions, see `âAdding a Hostâ "
+"`_."
+msgstr "æ·»å 
ä¸»æºè½ä¸ºæ¥å®¾VMsæä¾æ´å¤çæ§è½ãæ´å¤éæ±ä¸è¯´æè¯·åé 
`âæ·»å ä¸»æºâ 
`_ã"
+
+# d13936e89f4e4d9ea480d52a5c693cab
+#: ../../hosts.rst:28
+msgid "Scheduled Maintenance and Maintenance Mode for Hosts"
+msgstr "ä¸»æºçç»´æ¤è®¡åä¸ç»´æ¤æ¨¡å¼"
+
+# c80faa4e959d4bf6a547b8898e582f71
+#: ../../hosts.rst:30
+msgid ""
+"You can place a host into maintenance mode. When maintenance mode is "
+"activated, the host becomes unavailable to receive new guest VMs, and the "
+"guest VMs already running on the host are seamlessly migrated to another "
+"host not in maintenance mode. This migration uses live migration technology "
+"and does not interrupt the execution of the guest."
+msgstr "ä½ å¯ä»¥ä½¿ä¸å°ä¸»æºè¿å
¥ç»´æ¤æ¨¡å¼ãå½æ¿æ´»ç»´æ¤æ¨¡å¼æ¶ï¼è¿å°ä¸»æºå°ä¸ä¼æ¥çº³æ°çæ¥å®¾VMsï¼åæ¶ä¸é¢çVMsä¼æ
 ç¼å°è¿ç§»å°å
¶ä»éç»´æ¤æ¨¡å¼çä¸»æºä¸ãè¿ä¸ªè¿ç§»ä½¿ç¨å¨çº¿è¿ç§»ææ¯å¹¶ä¸ä¸ä¼ä¸æç¨æ·çæä½ã"
+
+# 050155d6fe2d4fe9bfb03ae737991f51
+#: ../../hosts.rst:37
+msgid "vCenter and Maintenance Mode"
+msgstr "vCenterä¸ç»´æ¤æ¨¡å¼"
+
+# 6e6dd514ac534a609dbba7282dd7d14e
+#: ../../hosts.rst:39
+msgid ""
+"To enter maintenance mode on a vCenter host, both vCenter and CloudStack "
+"must be used in concert. CloudStack and vCenter have separate maintenance "
+"modes that work closely together."
+msgstr "è¦ä½¿vCenterä¸»æºè¿å¥ç»´æ¤æ¨¡å¼ï¼vCenteråCloudStackä¸é½å¿
é¡»è¿è¡æ¤æä½ãCloudStackåvCenteræåèªçç»´æ¤æ¨¡å¼ï¼ä»ä»¬éè¦ç´§å¯åä½ã"
+
+# 1e1a327f506545d588b5c2dac6a6be66
+#: ../../hosts.rst:45
+msgid ""
+"Place the host into CloudStack's \"scheduled maintenance\" mode. This does "
+"not invoke the vCenter maintenance mode, but only causes VMs to be migrated "
+"off the host"
+msgstr "å¨CloudStackä¸ï¼å°ä¸»æºè¿å
¥\"ç»´æ¤è®¡å\"æ¨¡å¼ãè¿ä¸ªæä½ä¸ä¼è°ç¨vCenterçç»´æ¤æ¨¡å¼ï¼ä½æ¯ä¼å°VMsè¿ç¦»è¯¥ä¸»æºã"
+
+# 10b6ab6a7f494f5e8df3db13ccfd3af8
+#: ../../hosts.rst:49
+msgid ""
+"When the CloudStack maintenance mode is requested, the host first moves into"
+" the Prepare for Maintenance state. In this state it cannot be the target of"
+" new guest VM starts. Then all VMs will be migrated off the server. Live "
+"migration will be used to move VMs off the host. This allows the guests to "
+"be migrated to other hosts with no disruption to the guests. After this "
+"migration is completed, the host will enter the Ready for Maintenance mode."
+msgstr "å½CloudStackç»´æ¤æ¨¡å¼å¯ç¨åï¼ä¸»æºé¦åä¼è¿å
¥åå¤ç»´æ¤ç¶æãå¨è¿ä¸ªé¶æ®µå®ä¸è½è¿è¡æ°çæ¥å®¾VMsãç¶åææçVMså°ä¼è¢«è¿ç¦»è¯¥ä¸»æºãä¸»æºä½¿ç¨å¨çº¿è¿ç§»æ¥è¿ç§»VMsãè¿ç§æ¹å¼è½å¤ä½¿æ¥å®¾VMså¨è¿ç§»å°å
¶ä»ä¸»æºçè¿ç¨ä¸ä¸ä¼ä¸æç¨æ·çæä½ã"
+
+# 1628c924f80a4f4e9f5becf74ad3f0ee
+#: ../../hosts.rst:59
+msgid "Wait for the \"Ready for Maintenance\" indicator to appear in the UI."
+msgstr "ç\"åå¤å¥½ç»´æ¤\"æç¤ºç¯åºç°å¨UIä¸ã"
+
+# 4adef7c4df77454e8bd00237cd21e93c
+#: ../../hosts.rst:63
+msgid ""
+"Now use vCenter to perform whatever actions are necessary to maintain the "
+"host.

[38/43] git commit: moved ldap.firstname.attribute to the correct section.

2014-09-09 Thread rajani

moved ldap.firstname.attribute to the correct section.

Signed-off-by: Rajani Karuturi 

closes #17


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/33566771
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/33566771
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/33566771

Branch: refs/heads/master
Commit: 3356677127398157ab265a98f08c1cf89b406bea
Parents: d92feaf
Author: Rajani Karuturi 
Authored: Wed Aug 27 10:00:36 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Aug 27 10:06:15 2014 +0530

--
 source/accounts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/33566771/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 06a1660..83d7329 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -218,6 +218,9 @@ default values are for openldap)
 -  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
Default value for AD and openldap is **givenname**.
 
+-  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
+   Default value for AD and openldap is **sn**.
+
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
Default value is **SAMAccountName** for AD and **uid** for openldap.
 
@@ -232,9 +235,6 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
-   Default value for AD and openldap is **sn**.
-
 -  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
to use for LDAP SSL.

[30/43] git commit: CLOUDSTACK-6634

2014-09-09 Thread rajani

CLOUDSTACK-6634

updated the ldap section in admin guide

Signed-off-by: Pierre-Luc Dion 


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/733b8665
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/733b8665
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/733b8665

Branch: refs/heads/master
Commit: 733b8665968f1b4b9d4efde58579b09260c89b7e
Parents: 018c1ad
Author: Rajani Karuturi 
Authored: Tue Aug 19 16:27:43 2014 +0530
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:14:37 2014 -0400

--
 .../_static/images/CloudStack-ldap-screen1.png  | Bin 0 -> 23243 bytes
 source/accounts.rst | 172 ---
 2 files changed, 33 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/733b8665/source/_static/images/CloudStack-ldap-screen1.png
--
diff --git a/source/_static/images/CloudStack-ldap-screen1.png 
b/source/_static/images/CloudStack-ldap-screen1.png
new file mode 100644
index 000..46032a4
Binary files /dev/null and b/source/_static/images/CloudStack-ldap-screen1.png 
differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/733b8665/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index e5d4b6d..a4d95a2 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -186,160 +186,54 @@ Using an LDAP Server for User Authentication
 
 
 You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. Just map CloudStack
-accounts to the corresponding LDAP accounts using a query filter. The
-query filter is written using the query syntax of the particular LDAP
-server, and can include special wildcard characters provided by
-CloudStack for matching common values such as the userâs email address
-and name. CloudStack will search the external LDAP directory tree
-starting at a specified base directory and return the distinguished name
-(DN) and password of the matching user. This information along with the
-given password is used to authenticate the user..
+or ApacheDS to authenticate CloudStack end-users. 
+CloudStack will search the external LDAP directory tree
+starting at a specified base directory and gets user info such as first name, 
last name, email and username. 
 
-To set up LDAP authentication in CloudStack, call the CloudStack API
-command ldapConfig and provide the following:
-
--  Hostname or IP address and listening port of the LDAP server
-
--  Base directory and query filter
-
--  Search user DN credentials, which give CloudStack permission to
-   search on the LDAP server
-
--  SSL keystore and password, if SSL is used
-
-
-Example LDAP Configuration Commands
-~~~
-
-To understand the examples in this section, you need to know the basic
-concepts behind calling the CloudStack API, which are explained in the
-Developerâs Guide.
-
-The following shows an example invocation of ldapConfig with an ApacheDS
-LDAP server
-
-.. code:: bash
-
-   
http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
-
-The command must be URL-encoded. Here is the same example without the
-URL encoding:
-
-.. code:: bash
-   
-   http://127.0.0.1:8080/client/api?command=ldapConfig
-   &hostname=127.0.0.1
-   &searchbase=ou=testing,o=project
-   &queryfilter=(&(%uid=%u))
-   &binddn=cn=John+Singh,ou=testing,o=project
-   &bindpass=secret
-   &port=10389
-   &ssl=true
-   &truststore=C:/company/info/trusted.ks
-   &truststorepass=secret
-   &response=json
-   &apiKey=YourAPIKey&signature=YourSignatureHash
-
-The following shows a similar command for Active Directory. Here, the
-search base is the testing group within a company, and the users are
-matched up based on email address.
-
-.. code:: bash
+To authenticate, username and password entered by the user are used.
+Cloudstack does a search for a user with the given username. If it exists, it 
does a bind request with DN and password
 
-   
http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%28mail%3D%25e%29%29
 
&binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&bindpass=_&port=389&response=

[18/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/systemvm.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/systemvm.po 
b/source/locale/zh_CN/LC_MESSAGES/systemvm.po
new file mode 100644
index 000..eb4b95e
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/systemvm.po
@@ -0,0 +1,958 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# morgan wang , 2014
+# mushroom_rain , 2014
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 06:32+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 8be3f4aab5e948cf9ebc392ede63eb61
+#: ../../systemvm.rst:18
+msgid "Working with System Virtual Machines"
+msgstr "ä½¿ç¨ç³»ç»èææº"
+
+# 9b5d8dc94fe14b1188a4787951b5b7c1
+#: ../../systemvm.rst:20
+msgid ""
+"CloudStack uses several types of system virtual machines to perform tasks in"
+" the cloud. In general CloudStack 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."
+msgstr "CloudStackä½¿ç¨å 
ç±»ç³»ç»èææºæ¥å®æäºä¸çä»»å¡ãæ»çæ¥è¯´ï¼CloudStackç®¡çè¿äºç³»ç»èææºï¼å¹¶æ
 ¹æ®æäºèå´å
æå¿«ééè¦åå»ºãå¯å¨ååæ¢å®ä»¬ãç¶èï¼ç®¡çåéè¦æè¯å°ä»ä»¬å¨è°è¯ä¸çä½ç¨ã"
+
+# e59d13f8791c445b80132078609fc486
+#: ../../systemvm.rst:27
+msgid "The System VM Template"
+msgstr "ç³»ç»VMæ¨¡æ¿"
+
+# 6f29f33ed8a249eba1387f295bc684c4
+#: ../../systemvm.rst:29
+msgid ""
+"The System VMs come from a single template. The System VM has the following "
+"characteristics:"
+msgstr "ç³»ç»VMæ¥èªäºä¸ä¸ªåç¬çæ¨¡æ¿ï¼ç³»ç»VMå·æä»¥ä¸ç¹æ§ï¼"
+
+# 9ce666c19d774839b1f8cb4590445c4c
+#: ../../systemvm.rst:34
+msgid ""
+"Debian 6.0 (\"Squeeze\"), 2.6.32 kernel with the latest security patches "
+"from the Debian security APT repository"
+msgstr "Debian 6.0(âSqueezeâ)ï¼2.6.32åæ ¸å
·æææ°çæ¥èªDebianå®å¨APTåå¨åºçå®å¨è¡¥ä¸"
+
+# 63fe9d9aeac34acdaa94ec25235705a7
+#: ../../systemvm.rst:39
+msgid ""
+"Has a minimal set of packages installed thereby reducing the attack surface"
+msgstr "å·æä¸ç³»åæå°åå®è£çåï¼å¯ä»¥éä½å®å
¨æ»å»é£é©ã"
+
+# 8180871802ba4e12bb9ad0c90bfcc6b4
+#: ../../systemvm.rst:44
+msgid "32-bit for enhanced performance on Xen/VMWare"
+msgstr "åºäº Xen/VMWare ç32ä½å¢å¼ºæ§è½"
+
+# efa0ecb7d9b340aa94a5b3d97c5df6e2
+#: ../../systemvm.rst:48
+msgid ""
+"pvops kernel with Xen PV drivers, KVM virtio drivers, and VMware tools for "
+"optimum performance on all hypervisors"
+msgstr "åå«Xen PV é©±å¨ï¼KVM virtio é©±å¨åVMware toolsçpvops åæ 
¸å¯ä»¥ä½¿ææhypervisorå¾å°æä½³æ§è½ã"
+
+# 94cc7872776443ce9c1e37cfda94a603
+#: ../../systemvm.rst:53
+msgid "Xen tools inclusion allows performance monitoring"
+msgstr "Xen tools åå«æ§è½çæ§"
+
+# 285ca06aefd5405aa00784ffa1cada94
+#: ../../systemvm.rst:57
+msgid ""
+"Latest versions of HAProxy, iptables, IPsec, and Apache from debian "
+"repository ensures improved security and speed"
+msgstr 
"ææ°çæ¬çHAProxy,ipè¡¨ï¼IPsecåæ¥èªdebianåºçApacheä¿è¯äºæé«å®å
¨æ§åéåº¦ã"
+
+# b0c807016df746d99783c98f27b847fd
+#: ../../systemvm.rst:62
+msgid ""
+"Latest version of JRE from Sun/Oracle ensures improved security and speed"
+msgstr "ä» Sun/Oracle å®è£ææ°çæ¬çJREå¯ä»¥ä¿è¯å®å
¨æ§ä¸éåº¦çæé«"
+
+# 980ff8d24ffa4282b0253bd5dced0af0
+#: ../../systemvm.rst:66
+msgid "Changing the Default System VM Template"
+msgstr "æ¹åé»è®¤ç³»ç»VMæ¨¡æ¿"
+
+# bfb28a5b9b2e40cd8ffe8f6283a4e11b
+#: ../../systemvm.rst:68
+msgid ""
+"CloudStack allows you to change the default 32-bit System VM template to "
+"64-bit one. Using the 64-bit template, upgrade the virtual router to manage "
+"larger number of connection in your network."
+msgstr "CloudStackåè®¸ä½ 
å°é»è®¤ç32ä½ç³»ç»æ¨¡æ¿åä¸º64ä½ï¼ä½¿ç¨64ä½æ¨¡æ¿ï¼å¯ä»¥åçº§èæè·¯ç±å¨ï¼ä½¿å¾ç½ç»æ¯ææ´å¤§çè¿æ¥æ°ã"
+
+# a3da003f69c948a283852316ca9ffa82
+#: ../../systemvm.rst:74
+msgid ""
+"Based on the hypervisor you use, download the 64-bit template from the "
+"following location:"
+msgstr "åºäºä½ æä½¿ç¨çhypervisorï¼ä»ä»¥ä¸å°åä¸è½½64ä½æ¨¡æ¿ï¼"
+
+# b74fdcb62bef47078

[13/43] git commit: Fix conf.py for localization setup

2014-09-09 Thread rajani

Fix conf.py for localization setup


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/a209573e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/a209573e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/a209573e

Branch: refs/heads/master
Commit: a209573e23085f013d41dec87d4147c05983f56c
Parents: 68c20df
Author: Sebastien Goasguen 
Authored: Tue May 27 10:56:03 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue May 27 10:56:03 2014 +0200

--
 source/conf.py | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a209573e/source/conf.py
--
diff --git a/source/conf.py b/source/conf.py
index d8ef428..517956a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -35,6 +35,10 @@ extensions = []
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
+# Localization
+locale_dirs = ['./locale/']
+gettext_compact = False
+
 # The suffix of source filenames.
 source_suffix = '.rst'

[15/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/usage.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/usage.po 
b/source/locale/zh_CN/LC_MESSAGES/usage.po
new file mode 100644
index 000..ae8f954
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/usage.po
@@ -0,0 +1,1656 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-24 18:31+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 0337566b79334160ac7120790c9d0ac7
+#: ../../usage.rst:18
+msgid "Working with Usage"
+msgstr "ä½¿ç¨æå¡"
+
+# ef6eee68a2ab4c3eb31cb3115bab6062
+#: ../../usage.rst:20
+msgid ""
+"The Usage Server is an optional, separately-installed part of CloudStack "
+"that provides aggregated usage records which you can use to create billing "
+"integration for CloudStack. The Usage Server works by taking data from the "
+"events log and creating summary usage records that you can access using the "
+"listUsageRecords API call."
+msgstr "ä½¿ç¨æå¡å¨æ¯CloudStackä¸ä¸ªå¯éé¡¹,åå«å®è£
äº§åçä¸é¨å,æä¾äºèåä½¿ç¨è®°å½æ¨å¯ä»¥ä½¿ç¨å®æ¥åå»ºè®¡è´¹éæäº§åãä½¿ç¨æå¡å¨éè¿ä½¿ç¨æ°æ®ä»äºä»¶æ¥å¿ååå»ºæ±æ»ä½¿ç¨è®°å½,æ¨å¯ä»¥è®¿é®ä½¿ç¨listUsageRecords
 APIè°ç¨ã"
+
+# 3f5a5a7bc4cc4528840d66c404992c64
+#: ../../usage.rst:26
+msgid ""
+"The usage records show the amount of resources, such as VM run time or "
+"template storage space, consumed by guest instances."
+msgstr 
"ä½¿ç¨è®°å½æ¾ç¤ºæ°éçèµæº,æ¯å¦èææºè¿è¡æ¶é´ææ¨¡æ¿åå¨ç©ºé´ï¼ä»¥è¢«å®¢äººæ¶èä¸ºä¾ã"
+
+# 7534ac8e2cf443e7801e747d7e156ec4
+#: ../../usage.rst:29
+msgid ""
+"The Usage Server runs at least once per day. It can be configured to run "
+"multiple times per day."
+msgstr "ä½¿ç¨æå¡å¨è¿è¡è³å°æ¯å¤©ä¸æ¬¡ãå®å¯ä»¥è¢«é
ç½®ä¸ºæ¯å¤©å¤æ¬¡è¿è¡ã"
+
+# ea7f343f907540088f49db087d846e0c
+#: ../../usage.rst:33
+msgid "Configuring the Usage Server"
+msgstr "éç½®ä½¿ç¨æå¡å¨"
+
+# 5aa6afef926b456384cf8fe5fef33e85
+#: ../../usage.rst:35
+msgid "To configure the usage server:"
+msgstr "éç½®ä½¿ç¨æå¡å¨"
+
+# 4a2672643b7e4281babb6fa1f2c8f5c6
+#: ../../usage.rst:39
+msgid ""
+"Be sure the Usage Server has been installed. This requires extra steps "
+"beyond just installing the CloudStack software. See Installing the Usage "
+"Server (Optional) in the Advanced Installation Guide."
+msgstr "ç¡®å®ä½¿ç¨æå¡å¨å·²ç»è¢«å®è£ãå®è¦æ±å®è£
é¢å¤çCloudStackè½¯ä»¶æ¥éª¤ãåè§é«çº§å®è£
æåä¸çä½¿ç¨æå¡å¨ï¼å¯éï¼ã"
+
+# b81ee209e7eb43f2b4440774ee120d74
+#: ../../usage.rst:45
+msgid "Log in to the CloudStack UI as administrator."
+msgstr "ä½ä¸ºç®¡çåç»å½å°CloudStackç¨æ·çé¢ã"
+
+# b71109d7bf9b4edd8cb8b8b3c62c7375
+#: ../../usage.rst:49
+msgid "Click Global Settings."
+msgstr "åå»å¨å±è®¾ç½®"
+
+# d97b663ae09745498728fffc03e2f754
+#: ../../usage.rst:53
+msgid ""
+"In Search, type usage. Find the configuration parameter that controls the "
+"behavior you want to set. See the table below for a description of the "
+"available parameters."
+msgstr "å¨æç´¢æ è¾å¥ usageãæ¾å°noéè¦æ¹åçé
ç½®åæ°ãä¸è¡¨æ¯è¿äºåæ°çè¯¦ç»æè¿°ã"
+
+# b0484803860b4b1a99bb5c37475c7246
+#: ../../usage.rst:59
+msgid "In Actions, click the Edit icon."
+msgstr "å¨æä½æ ç¹å»ç¼è¾å¾æ ã"
+
+# 704d9670a22a4b81b84bd8f2aa97bb9a
+#: ../../usage.rst:63
+msgid "Type the desired value and click the Save icon."
+msgstr "è¾å¥æ°å¼ç¹å»ä¿åå¾æ ã"
+
+# f01266ae6922418997f31eb79d697cab
+#: ../../usage.rst:67
+msgid ""
+"Restart the Management Server (as usual with any global configuration "
+"change) and also the Usage Server:"
+msgstr "éæ°å¯å¨ç®¡çæå¡å¨ï¼éå¸¸å¨æ¹åäºå¨å±é
ç½®ä¹åé½è¦è¿è¡è¿æ¥ï¼å¹¶éå¯ä½¿ç¨æå¡å¨ã"
+
+# 7b5da1780fc444d2b67d97b1a97eabb7
+#: ../../usage.rst:75
+msgid ""
+"The following table shows the global configuration settings that control the"
+" behavior of the Usage Server."
+msgstr "ä¸è¡¨ååºäºå¨å±éç½®ä¸æ§å¶ä½¿ç¨æå¡å¨çéç½®é¡¹ã"
+
+# 0ca8d699a2cd4e91b01369666cbcb2ca
+#: ../../usage.rst:78
+msgid "Parameter Name  Description"
+msgstr "åæ°åæè¿°"
+
+# a6789ec8fc34419ba8e0cc40f94d7f67
+#: ../../usage.rst:80
+msgid "enable

[27/43] git commit: Adding mo files as the build seems to break otherwise

2014-09-09 Thread rajani

Adding mo files as the build seems to break otherwise


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/e54cd248
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/e54cd248
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/e54cd248

Branch: refs/heads/master
Commit: e54cd2489c1be37d43ef825fc1752e480eb4364f
Parents: 19e54c2
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:23:26 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:23:26 2014 +0200

--
 source/locale/zh_CN/LC_MESSAGES/accounts.mo   | Bin 0 -> 21351 bytes
 source/locale/zh_CN/LC_MESSAGES/administration.mo | Bin 0 -> 4620 bytes
 source/locale/zh_CN/LC_MESSAGES/api.mo| Bin 0 -> 5134 bytes
 source/locale/zh_CN/LC_MESSAGES/events.mo | Bin 0 -> 14137 bytes
 source/locale/zh_CN/LC_MESSAGES/hosts.mo  | Bin 0 -> 37120 bytes
 source/locale/zh_CN/LC_MESSAGES/index.mo  | Bin 0 -> 1581 bytes
 source/locale/zh_CN/LC_MESSAGES/management.mo | Bin 0 -> 21220 bytes
 source/locale/zh_CN/LC_MESSAGES/networking.mo | Bin 0 -> 28699 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.mo| Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/projects.mo   | Bin 0 -> 26456 bytes
 source/locale/zh_CN/LC_MESSAGES/reliability.mo| Bin 0 -> 17965 bytes
 .../locale/zh_CN/LC_MESSAGES/service_offerings.mo | Bin 0 -> 40909 bytes
 source/locale/zh_CN/LC_MESSAGES/storage.mo| Bin 0 -> 54484 bytes
 source/locale/zh_CN/LC_MESSAGES/systemvm.mo   | Bin 0 -> 31949 bytes
 source/locale/zh_CN/LC_MESSAGES/templates.mo  | Bin 0 -> 53480 bytes
 .../locale/zh_CN/LC_MESSAGES/troubleshooting.mo   | Bin 0 -> 17278 bytes
 source/locale/zh_CN/LC_MESSAGES/tuning.mo | Bin 0 -> 6792 bytes
 source/locale/zh_CN/LC_MESSAGES/ui.mo | Bin 0 -> 17237 bytes
 source/locale/zh_CN/LC_MESSAGES/usage.mo  | Bin 0 -> 42805 bytes
 .../locale/zh_CN/LC_MESSAGES/virtual_machines.mo  | Bin 0 -> 65215 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/accounts.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/accounts.mo 
b/source/locale/zh_CN/LC_MESSAGES/accounts.mo
new file mode 100644
index 000..8cb6d09
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/accounts.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/administration.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/administration.mo 
b/source/locale/zh_CN/LC_MESSAGES/administration.mo
new file mode 100644
index 000..aaf0abf
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/administration.mo 
differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/api.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/api.mo 
b/source/locale/zh_CN/LC_MESSAGES/api.mo
new file mode 100644
index 000..cbe1413
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/api.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/events.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/events.mo 
b/source/locale/zh_CN/LC_MESSAGES/events.mo
new file mode 100644
index 000..a461140
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/events.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/hosts.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/hosts.mo 
b/source/locale/zh_CN/LC_MESSAGES/hosts.mo
new file mode 100644
index 000..913f8c4
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/hosts.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/index.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/index.mo 
b/source/locale/zh_CN/LC_MESSAGES/index.mo
new file mode 100644
index 000..6c034c7
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/index.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/management.mo
--
diff --git a/source/locale/zh_CN/

[10/43] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/templates.rst
--
diff --git a/source/templates.rst b/source/templates.rst
index c4d33b2..bc55aa2 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -12,7 +12,8 @@
KIND, either express or implied.  See the License for the
specific language governing permissions and limitations
under the License.
-   
+
+
 Working with Templates
 ==
 
@@ -30,6 +31,7 @@ CloudStack ships with a default template. In order to present 
more
 choices to users, CloudStack administrators and users can create
 templates and add them to CloudStack.
 
+
 Creating Templates: Overview
 
 
@@ -38,18 +40,12 @@ system. There are a variety of ways to add more templates.
 Administrators and end users can add templates. The typical sequence of
 events is:
 
-#. 
-
-   Launch a VM instance that has the operating system you want. Make any
+#. Launch a VM instance that has the operating system you want. Make any
other desired configuration changes to the VM.
 
-#. 
-
-   Stop the VM.
-
-#. 
+#. Stop the VM.
 
-   Convert the volume into a template.
+#. Convert the volume into a template.
 
 There are other ways to add templates to CloudStack. For example, you
 can take a snapshot of the VM's volume and create a template from the
@@ -58,19 +54,17 @@ snapshot, or import a VHD from another system into 
CloudStack.
 The various techniques for creating templates are described in the next
 few sections.
 
+
 Requirements for Templates
 --
 
--  
-
-   For XenServer, install PV drivers / Xen tools on each template that
+-  For XenServer, install PV drivers / Xen tools on each template that
you create. This will enable live migration and clean guest shutdown.
 
--  
-
-   For vSphere, install VMware Tools on each template that you create.
+-  For vSphere, install VMware Tools on each template that you create.
This will enable console view to work properly.
 
+
 Best Practices for Templates
 
 
@@ -78,6 +72,7 @@ If you plan to use large templates (100 GB or larger), be 
sure you have
 a 10-gigabit network to support the large templates. A slower network
 can lead to timeouts and other errors when large templates are used.
 
+
 The Default Template
 
 
@@ -98,30 +93,31 @@ block most access to the template excluding ssh.
 
 .. code:: bash
 
-# iptables --list
-Chain INPUT (policy ACCEPT)
-target prot opt source   destination
-RH-Firewall-1-INPUT  all  --  anywhere anywhere
-
-Chain FORWARD (policy ACCEPT)
-target prot opt source   destination
-RH-Firewall-1-INPUT  all  --  anywhere anywhere
-
-Chain OUTPUT (policy ACCEPT)
-target prot opt source   destination
-
-Chain RH-Firewall-1-INPUT (2 references)
-target prot opt source   destination
-ACCEPT all  --  anywhere anywhere
-ACCEPT icmp --  anywhereanywhere   icmp any
-ACCEPT esp  --  anywhereanywhere
-ACCEPT ah   --  anywhereanywhere
-ACCEPT udp  --  anywhere224.0.0.251udp dpt:mdns
-ACCEPT udp  --  anywhereanywhere   udp dpt:ipp
-ACCEPT tcp  --  anywhereanywhere   tcp dpt:ipp
-ACCEPT all  --  anywhereanywhere   state 
RELATED,ESTABLISHED
-ACCEPT tcp  --  anywhereanywhere   state NEW tcp dpt:ssh
-REJECT all  --  anywhereanywhere   reject-with icmp-host-
+   # iptables --list
+   Chain INPUT (policy ACCEPT)
+   target prot opt source   destination
+   RH-Firewall-1-INPUT  all  --  anywhere anywhere
+
+   Chain FORWARD (policy ACCEPT)
+   target prot opt source   destination
+   RH-Firewall-1-INPUT  all  --  anywhere anywhere
+
+   Chain OUTPUT (policy ACCEPT)
+   target prot opt source   destination
+
+   Chain RH-Firewall-1-INPUT (2 references)
+   target prot opt source   destination
+   ACCEPT all  --  anywhere anywhere
+   ACCEPT icmp --  anywhereanywhere   icmp any
+   ACCEPT esp  --  anywhereanywhere
+   ACCEPT ah   --  anywhereanywhere
+   ACCEPT udp  --  anywhere224.0.0.251udp dpt:mdns
+   ACCEPT udp  --  anywhereanywhere   udp dpt:ipp
+   ACCEPT tcp  --  anywhereanywhere   tcp dpt:ipp
+   ACCEPT all  --  anywhereanywhere   state RELATED,ESTABLISHED
+   ACCEPT tcp  --  anywhereanywhere   state NEW tcp dpt:ssh
+   REJECT all  --  anywhereanywhere   reject-with icmp-host-
+
 
 Private and Public Templates
 
@@ -141,92 +1

[05/43] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking2.rst
--
diff --git a/source/networking2.rst b/source/networking2.rst
deleted file mode 100644
index b3743fc..000
--- a/source/networking2.rst
+++ /dev/null
@@ -1,7033 +0,0 @@
-.. 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.
-   
-
-Managing Networks and Traffic
-=
-
-In a CloudStack, guest VMs can communicate with each other using shared
-infrastructure with the security and user perception that the guests
-have a private LAN. The CloudStack virtual router is the main component
-providing networking features for guest traffic.
-
-Guest Traffic
--
-
-A network can carry guest traffic only between VMs within one zone.
-Virtual machines in different zones cannot communicate with each other
-using their IP addresses; they must communicate with each other by
-routing through a public IP address.
-
-See a typical guest traffic setup given below:
-
-|guest-traffic-setup.png| 
-
-Typically, the Management Server automatically creates a virtual router
-for each network. A virtual router is a special virtual machine that
-runs on the hosts. Each virtual router in an isolated network has three
-network interfaces. If multiple public VLAN is used, the router will
-have multiple public interfaces. Its eth0 interface serves as the
-gateway for the guest traffic and has the IP address of 10.1.1.1. Its
-eth1 interface is used by the system to configure the virtual router.
-Its eth2 interface is assigned a public IP address for public traffic.
-If multiple public VLAN is used, the router will have multiple public
-interfaces.
-
-The virtual router provides DHCP and will automatically assign an IP
-address for each guest VM within the IP range assigned for the network.
-The user can manually reconfigure guest VMs to assume different IP
-addresses.
-
-Source NAT is automatically configured in the virtual router to forward
-outbound traffic for all guest VMs
-
-Networking in a Pod

-
-The figure below illustrates network setup within a single pod. The
-hosts are connected to a pod-level switch. At a minimum, the hosts
-should have one physical uplink to each switch. Bonded NICs are
-supported as well. The pod-level switch is a pair of redundant gigabit
-switches with 10 G uplinks.
-
-|networksinglepod.png| 
-
-Servers are connected as follows:
-
--  
-
-   Storage devices are connected to only the network that carries
-   management traffic.
-
--  
-
-   Hosts are connected to networks for both management traffic and
-   public traffic.
-
--  
-
-   Hosts are also connected to one or more networks carrying guest
-   traffic.
-
-We recommend the use of multiple physical Ethernet cards to implement
-each network interface as well as redundant switch fabric in order to
-maximize throughput and improve reliability.
-
-Networking in a Zone
-
-
-The following figure illustrates the network setup within a single zone.
-
-|networksetupzone.png|
-
-A firewall for management traffic operates in the NAT mode. The network
-typically is assigned IP addresses in the 192.168.0.0/16 Class B private
-address space. Each pod is assigned IP addresses in the 192.168.\*.0/24
-Class C private address space.
-
-Each zone has its own set of public IP addresses. Public IP addresses
-from different zones do not overlap.
-
-Basic Zone Physical Network Configuration
--
-
-In a basic network, configuring the physical network is fairly
-straightforward. You only need to configure one guest network to carry
-traffic that is generated by guest VMs. When you first add a zone to
-CloudStack, you set up the guest network through the Add Zone screens.
-
-Advanced Zone Physical Network Configuration
-
-
-Within a zone that uses advanced networking, you need to tell the
-Management Server how the physical network is set up to carry different
-kinds of traffic in isolation.
-
-Configure Guest Traffic in an Advanced Zone
-~~~
-
-These steps assume you have al

[01/43] git commit: CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: This closes #9

2014-09-09 Thread rajani

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/master 26cd1b738 -> 36e506009


CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: 
This closes #9

Signed-off-by: Sebastien Goasguen 


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/ba544d2a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/ba544d2a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/ba544d2a

Branch: refs/heads/master
Commit: ba544d2ad6f075325d28e80049a4dc6b80082341
Parents: 8ba
Author: Will Stevens 
Authored: Mon May 12 12:56:36 2014 -0400
Committer: Sebastien Goasguen 
Committed: Thu May 15 16:56:41 2014 +0200

--
 source/networking2.rst  |   2 +
 source/palo_alto_config.rst | 282 +++
 2 files changed, 284 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/networking2.rst
--
diff --git a/source/networking2.rst b/source/networking2.rst
index b020a19..b3743fc 100644
--- a/source/networking2.rst
+++ b/source/networking2.rst
@@ -6952,6 +6952,8 @@ To create a persistent network, perform the following:
 
Click OK.
 
+.. include:: palo_alto_config.rst
+
 .. |guest-traffic-setup.png| image:: _static/images/guest-traffic-setup.png
:alt: Depicts a guest traffic setup
 .. |networksinglepod.png| image:: _static/images/network-singlepod.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/palo_alto_config.rst
--
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
new file mode 100644
index 000..6c0aa46
--- /dev/null
+++ b/source/palo_alto_config.rst
@@ -0,0 +1,282 @@
+.. 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.
+
+
+
+Setup a Palo Alto Networks Firewall
+---
+
+
+Functionality Provided
+~~
+
+This implementation enable the orchestration of a Palo Alto Networks Firewall 
from within CloudStack UI and API.  
+
+**The following features are supported**:
+
+- List/Add/Delete Palo Alto Networks service provider
+- List/Add/Delete Palo Alto Networks network service offering
+- List/Add/Delete Palo Alto Networks network using the above service offering
+- Add an instance to a Palo Alto Networks network
+- Source NAT management on network create and delete
+- List/Add/Delete Ingress Firewall rule
+- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules 
supported)
+- List/Add/Delete Port Forwarding rule
+- List/Add/Delete Static NAT rule
+- Apply a Threat Profile to all firewall rules (more details in the Additional 
Features section)
+- Apply a Log Forwarding profile to all firewall rules (more details in the 
Additional Features section)
+
+
+
+Initial Palo Alto Networks Firewall Configuration
+~
+
+Anatomy of the Palo Alto Networks Firewall
+^^
+
+- In **'Network > Interfaces'** there is a list of physical interfaces as well 
as aggregated physical interfaces which are used for managing traffic in and 
out of the Palo Alto Networks Firewall device.
+- In **'Network > Zones'** there is a list of the different configuration 
zones.  This implementation will use two zones; a public (defaults to 
'untrust') and private (defaults to 'trust') zone.
+- In **'Network > Virtual Routers'** there is a list of VRs which handle 
traffic routing for the Palo Alto Firewall.  We only use a single Virtual 
Router on the firewall and it is used to handle all the routing to the next 
network hop.
+- In **'Objects > Security Profile Groups'** there is a list of profiles which 
can be applied to firewall rules.  These profiles are used to better understand 
the types of traffic that is flowing through your network.  Configured when you 
add the firewall provide

[37/43] git commit: fix ldap section typo

2014-09-09 Thread rajani

fix ldap section typo


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/d92feaf0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/d92feaf0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/d92feaf0

Branch: refs/heads/master
Commit: d92feaf0fdd5467734b3db654b0fa712045030b7
Parents: 6c77f69
Author: Pierre-Luc Dion 
Authored: Wed Aug 20 07:43:05 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Wed Aug 20 07:44:51 2014 -0400

--
 source/accounts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/d92feaf0/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index b555742..06a1660 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -219,7 +219,7 @@ default values are for openldap)
Default value for AD and openldap is **givenname**.
 
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
-  Default value is **SAMAccountName** for AD and **uid** for openldap.
+   Default value is **SAMAccountName** for AD and **uid** for openldap.
 
 
 Restricting LDAP users to a group:

[42/43] git commit: Merge branch '4.3' into 4.4

2014-09-09 Thread rajani

Merge branch '4.3' into 4.4

Conflicts:
source/accounts.rst
source/service_offerings.rst


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/6507638e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/6507638e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/6507638e

Branch: refs/heads/master
Commit: 6507638eccd62faa27846031cda9948fff8899b4
Parents: 00c90ec 5d59a37
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:08:26 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:08:26 2014 +0530

--
 .gitattributes |2 +
 source/accounts.rst|   10 +-
 source/locale/zh_CN/LC_MESSAGES/networking2.mo |  Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.po | 8448 +++
 4 files changed, 8457 insertions(+), 3 deletions(-)
--

[23/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/networking.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/networking.po 
b/source/locale/zh_CN/LC_MESSAGES/networking.po
new file mode 100644
index 000..81430a8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/networking.po
@@ -0,0 +1,901 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# aguncn , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-23 12:39+\n"
+"Last-Translator: aguncn \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 378fc355da2a4f7d8546a95fd9b3f5dc
+#: ../../networking.rst:18
+msgid "Setting Up Networking for Users"
+msgstr "ç¨æ·ç½ç»è®¾ç½®"
+
+# 17e4cb5cdf264aa19e3578731bf842c4
+#: ../../networking.rst:21
+msgid "Overview of Setting Up Networking for Users"
+msgstr "ç¨æ·ç½ç»è®¾ç½®æ¦è§"
+
+# 96d37a14970944b58909ecaace082018
+#: ../../networking.rst:23
+msgid ""
+"People using cloud infrastructure have a variety of needs and preferences "
+"when it comes to the networking services provided by the cloud. As a "
+"CloudStack administrator, you can do the following things to set up "
+"networking for your users:"
+msgstr "å½æ¶åå°äºè®¡ç®ææä¾çç½ç»æå¡, 
ä½¿ç¨äºåºç¡è®¾æ½çäººé½æåèªä¸åçéæ±ååå¥½. 
ä½ä¸ºCloudStackç®¡çå, ä½ å¯ä»¥ä¸ºä½ çç¨æ·åä¸é¢çäºæ
æ¥è®¾ç½®ç½ç»:"
+
+# 3db74da31e2046a8908c67bf3c665472
+#: ../../networking.rst:30
+msgid "Set up physical networks in zones"
+msgstr "å¨èµæºåéè®¾ç½®ç©çç½ç»"
+
+# 94e40111c3614cebb720933c53c016bb
+#: ../../networking.rst:34
+msgid ""
+"Set up several different providers for the same service on a single physical"
+" network (for example, both Cisco and Juniper firewalls)"
+msgstr "å¨åä¸ªç©çç½å¡ä¸ä¸ºåä¸æå¡è®¾ç½®ä¸åçæå¡æä¾è
(ä¾å¦, åæ¶è®¾ç½®CiscoåJuniperçé²ç«å¢)"
+
+# f7ee99dc067d4b129ec339cb1799e0cd
+#: ../../networking.rst:39
+msgid ""
+"Bundle different types of network services into network offerings, so users "
+"can choose the desired network services for any given virtual machine"
+msgstr "ç»å®ä¸åç±»åçç½ç»æå¡å°ç½ç»æ¹æ¡ä¸, è¿æ 
·ç¨æ·å¯ä»¥å¨ç»å®çèæºä¸ä½¿ç¨ææçç½ç»æå¡."
+
+# c5a8692df93942eca2c97aa1872928c6
+#: ../../networking.rst:45
+msgid ""
+"Add new network offerings as time goes on so end users can upgrade to a "
+"better class of service on their network"
+msgstr "éçæ¶é´çæ¨ç§», æ·»å 
æ°çç½ç»æ¹æ¡ä»¥ä¾¿æ¯æç»ç¨æ·åçº§ä»ä»¬çç½ç»æå¡."
+
+# f11d70f72e114c728425a80bf2c162c5
+#: ../../networking.rst:50
+msgid ""
+"Provide more ways for a network to be accessed by a user, such as through a "
+"project of which the user is a member"
+msgstr "æä¾æ´å¤çéå¾è®©ä¸ä¸ªç¨æ·è®¿é®ä¸ä¸ªç½ç», 
æ¯å¦éè¿ç¨æ·æå¨çä¸ä¸ªé¡¹ç®"
+
+# aa05ae98bb2a4229a3c0478a99a39fe6
+#: ../../networking.rst:54
+msgid "About Virtual Networks"
+msgstr "å³äºèæç½ç»"
+
+# a08bd43e29f54560ba910cb343eb5f53
+#: ../../networking.rst:56
+msgid ""
+"A virtual network is a logical construct that enables multi-tenancy on a "
+"single physical network. In CloudStack a virtual network can be shared or "
+"isolated."
+msgstr 
"èæç½ç»æ¯ä½¿å¤ç§æ·å¨ä¸ä¸ªç©çç½ç»ä¸çé»è¾ç»æãå¨CloudStackä¸ï¼èæç½ç»å¯ä»¥è¢«å
±äº«æéç¦»ã"
+
+# d1784c41349f444cbaaffea5119ee4bf
+#: ../../networking.rst:61
+msgid "Isolated Networks"
+msgstr "éç¦»çç½ç»"
+
+# db4418e95acd4fa69374025ca81020cb
+#: ../../networking.rst:63
+msgid ""
+"An isolated network can be accessed only by virtual machines of a single "
+"account. Isolated networks have the following properties."
+msgstr 
"ä¸ä¸ªéç¦»çç½ç»å¯ä»¥è®¿é®èææºçåä¸è´¦æ·ãéç¦»çç½ç»å
·æä¸åæ§è´¨ã"
+
+# 554e4288f8524114a4bcf6da37435d19
+#: ../../networking.rst:68
+msgid "Resources such as VLAN are allocated and garbage collected dynamically"
+msgstr "å¦VLANçèµæºè¢«å¨æåéååå¾æ¶é"
+
+# 55a8c8a3a194402a9e55453f2ec86253
+#: ../../networking.rst:73
+msgid "There is one network offering for the entire network"
+msgstr "æä¸ä¸ªç¨äºæ´ä¸ªç½ç»çç½ç»æ¹æ¡"
+
+# 6da623bb1302444ebd2054fdbf1743b7
+#: ../../networking.rst:77
+msgid ""
+"The network offering can be upgraded or downgraded but it is for the entire "
+"network"
+msgstr "ç½ç»æä¾å¯åçº§æéçº§ï¼ä½å

[39/43] git commit: moved ldap.firstname.attribute to the correct section.

2014-09-09 Thread rajani

moved ldap.firstname.attribute to the correct section.

Signed-off-by: Rajani Karuturi 

This closes #17


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/00c90ec0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/00c90ec0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/00c90ec0

Branch: refs/heads/master
Commit: 00c90ec09adb557a5c3284b87098fc32c7801377
Parents: 343b43d
Author: Rajani Karuturi 
Authored: Wed Aug 27 10:00:36 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Aug 27 10:13:15 2014 +0530

--
 source/accounts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/00c90ec0/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 06a1660..83d7329 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -218,6 +218,9 @@ default values are for openldap)
 -  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
Default value for AD and openldap is **givenname**.
 
+-  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
+   Default value for AD and openldap is **sn**.
+
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
Default value is **SAMAccountName** for AD and **uid** for openldap.
 
@@ -232,9 +235,6 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
-   Default value for AD and openldap is **sn**.
-
 -  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
to use for LDAP SSL.

[19/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/storage.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/storage.po 
b/source/locale/zh_CN/LC_MESSAGES/storage.po
new file mode 100644
index 000..dfc19da
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/storage.po
@@ -0,0 +1,1461 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-15 02:30+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 6a202e4741994470b627a504dfaa0ec4
+#: ../../storage.rst:18
+msgid "Working with Storage"
+msgstr "ä½¿ç¨åå¨"
+
+# 162dc01704434bf39297420664b52155
+#: ../../storage.rst:21
+msgid "Storage Overview"
+msgstr "åå¨æ¦è¿°"
+
+# fb6cf279ed414191933888a05da50e30
+#: ../../storage.rst:23
+msgid ""
+"CloudStack defines two types of storage: primary and secondary. Primary "
+"storage can be accessed by either iSCSI or NFS. Additionally, direct "
+"attached storage may be used for primary storage. Secondary storage is "
+"always accessed using NFS."
+msgstr "CloudStackå®ä¹äºä¸¤ç§åå¨ï¼ä¸»åå¨åè¾
å©åå¨ãä¸»åå¨å¯ä»¥ä½¿ç¨iSCSIæNFSåè®®ãå¦å¤ï¼ç´æ¥éå 
åå¨å¯è¢«ç¨äºä¸»åå¨ãè¾å©åå¨éå¸¸ä½¿ç¨NFSåè®®ã"
+
+# 3e1682b1378e44d1b6277de404cef6c9
+#: ../../storage.rst:28
+msgid ""
+"There is no ephemeral storage in CloudStack. All volumes on all nodes are "
+"persistent."
+msgstr 
"CloudStackä¸æ¯æä¸´æ¶åå¨ãææèç¹ä¸çææå·é½æ¯æä¹
åå¨ã"
+
+# 3b158cf365224a128dce4c9bf414bc05
+#: ../../storage.rst:32
+msgid "Primary Storage"
+msgstr "ä¸»åå¨"
+
+# 0182a2b8079342b0b3ceb0b29b179646
+#: ../../storage.rst:34
+msgid ""
+"This section gives concepts and technical details about CloudStack primary "
+"storage. For information about how to install and configure primary storage "
+"through the CloudStack UI, see the Installation Guide."
+msgstr "æ¬ç« èè®²è¿°çæ¯å
³äºCloudStackçä¸»åå¨æ¦å¿µåææ¯ç»èãæ´å¤å
³äºå¦ä½éè¿CloudStack UIå®è£åéç½®ä¸»åå¨çä¿¡æ¯ï¼è¯·åéå®è£
åå¯¼ã"
+
+# 6050cb5647774b9191d87c9ac4c7db00
+#: ../../storage.rst:38
+msgid ""
+"`âAbout Primary Storageâ "
+"`_"
+msgstr "`âå³äºä¸»åå¨â 
`_"
+
+# 2d5f67decc454f279ad544d95f3a200c
+#: ../../storage.rst:41
+msgid "Best Practices for Primary Storage"
+msgstr "ä¸»åå¨çæä½³å®è·µ"
+
+# a8e6b6ee46a0407d89434124df4e5829
+#: ../../storage.rst:45
+msgid ""
+"The speed of primary storage will impact guest performance. If possible, "
+"choose smaller, higher RPM drives or SSDs for primary storage."
+msgstr 
"ä¸»åå¨çéåº¦ä¼ç´æ¥å½±åæ¥å®¾èæºçæ§è½ãå¦æå¯è½ï¼ä¸ºä¸»åå¨éæ©éæ©å®¹éå°ï¼è½¬éé«çç¡¬çæSSDsã"
+
+# 25a499cd8ec24c99bfc6f0391d203d7b
+#: ../../storage.rst:51
+msgid "There are two ways CloudStack can leverage primary storage:"
+msgstr "CloudStackç¨ä¸¤ç§æ¹å¼ä½¿ç¨ä¸»åå¨ï¼"
+
+# 8c344e1829c64653b8c2a3f7fd4340c6
+#: ../../storage.rst:53
+msgid ""
+"Static: This is CloudStack's traditional way of handling storage. In this "
+"model, a preallocated amount of storage (ex. a volume from a SAN) is given "
+"to CloudStack. CloudStack then permits many of its volumes to be created on "
+"this storage (can be root and/or data disks). If using this technique, "
+"ensure that nothing is stored on the storage. Adding the storage to "
+"CloudStack will destroy any existing data."
+msgstr "éæï¼CloudStackç®¡çåå¨çä¼ 
ç»æ¹å¼ãå¨è¿ä¸ªæ¨¡å¼ä¸ï¼è¦ç»CloudStacké¢ååéå 
ä¸ªåå¨(æ¯å¦ä¸ä¸ªSANä¸çå·)ãç¶åCloudStackå¨ä¸é¢åå»ºè¥å¹²ä¸ªå·(å¯ä»¥æ¯rootå/æè

æ°æ®ç)ãå¦æä½¿ç¨è¿ç§ææ¯ï¼ç¡®ä¿åå¨ä¸æ²¡ææ°æ®ãç»CloudStackæ·»å
 åå¨ä¼éæ¯å·²åå¨çæææ°æ®ã"
+
+# 72b1dbe1653c4bfbb6de406140cd47d5
+#: ../../storage.rst:61
+msgid ""
+"Dynamic: This is a newer way for CloudStack to manage storage. In this "
+"model, a storage system (rather than a preallocated amount of storage) is "
+"given to CloudStack. CloudStack, working in concert with a storage plug-in, "
+"dynamically creates volumes on the storage system and each volume on the "
+"storage syst

[40/43] git commit: CLOUDSTACK-6634: added more details for ldap ssl

2014-09-09 Thread rajani

CLOUDSTACK-6634: added more details for ldap ssl

This closes #20


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/fe5b65de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/fe5b65de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/fe5b65de

Branch: refs/heads/master
Commit: fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618
Parents: 3356677
Author: Rajani Karuturi 
Authored: Wed Sep 10 11:08:56 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 11:24:26 2014 +0530

--
 source/accounts.rst | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fe5b65de/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 83d7329..be8f457 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -235,9 +235,13 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
-   to use for LDAP SSL.
- 
+| If the LDAP server requires SSL, you need to enable the below configurations.
+Before enabling SSL for LDAP, you need to get the certificate which the LDAP 
server is using and add it to a trusted keystore.
+You will need to know the path to the keystore and the password.
+
+-  ``ldap.truststore`` : truststore path
+-  ``ldap.truststore.password`` : truststore password
+
 
 LDAP groups:

[21/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/projects.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/projects.po 
b/source/locale/zh_CN/LC_MESSAGES/projects.po
new file mode 100644
index 000..63db2ef
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/projects.po
@@ -0,0 +1,756 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# mushroom_rain , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-16 07:45+\n"
+"Last-Translator: mushroom_rain \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 67b9f51612cb496d9701fcd2c24d9cb5
+#: ../../projects.rst:18
+msgid "Using Projects to Organize Users and Resources"
+msgstr "ä½¿ç¨é¡¹ç®æ¥ç®¡çç¨æ·åèµæºã"
+
+# 1cb3a4ccdca349788ea29a615f989e93
+#: ../../projects.rst:21
+msgid "Overview of Projects"
+msgstr "é¡¹ç®æ¦è§"
+
+# f06b8f1572294f1c9e8567167df9a4c5
+#: ../../projects.rst:23
+msgid ""
+"Projects are used to organize people and resources. CloudStack users within "
+"a single domain can group themselves into project teams so they can "
+"collaborate and share virtual resources such as VMs, snapshots, templates, "
+"data disks, and IP addresses. CloudStack tracks resource usage per project "
+"as well as per user, so the usage can be billed to either a user account or "
+"a project. For example, a private cloud within a software company might have"
+" all members of the QA department assigned to one project, so the company "
+"can track the resources used in testing while the project members can more "
+"easily isolate their efforts from other users of the same cloud"
+msgstr 
"é¡¹ç®ç¨æ¥ç®¡çç¨æ·åèµæºãå¤äºåç¬åä¸çCloudStackç¨æ·å¯ä»¥èªç»ï¼ä»ä»¬å¯ä»¥éä¸å¹¶åäº«èæèµæºï¼å¦VMãå¿«ç
§ãæ¨¡æ¿ãç£çãIPå°åçãCloudStackå¯ä»¥åè·è¸ªæ¯ä¸ªç¨æ·ä¸æ 
·è·è¸ªæ¯ä¸ªé¡¹ç®çèµæºï¼æä»¥å¯ä»¥æç§ç¨æ·æè
é¡¹ç®å¯¹èµæºä½¿ç¨æ¶è´¹ãä¾å¦ï¼ä¸ä¸ªè½¯ä»¶å
¬å¸çç§æäºå¯è½å°ææQAé¨é¨çåå·¥åé
å°ä¸ä¸ªé¡¹ç®ï¼å½éè¦å¨æµè¯ä¸åºååä¸äºä¸è¯¥é¡¹ç®ç»åå·¥çè´¡ç®æ¶ï¼æµè¯ä¸çèµæºè·è¸ªå°åçå®¹æã"
+
+# 467cabcfe9c448b784ab2c2c52560838
+#: ../../projects.rst:34
+msgid ""
+"You can configure CloudStack to allow any user to create a new project, or "
+"you can restrict that ability to just CloudStack administrators. Once you "
+"have created a project, you become that projectâs administrator, and you 
can"
+" add others within your domain to the project. CloudStack can be set up "
+"either so that you can add people directly to a project, or so that you have"
+" to send an invitation which the recipient must accept. Project members can "
+"view and manage all virtual resources created by anyone in the project (for "
+"example, share VMs). A user can be a member of any number of projects and "
+"can switch views in the CloudStack UI to show only project-related "
+"information, such as project VMs, fellow project members, project-related "
+"alerts, and so on."
+msgstr "ä½ å¯ä»¥éç½® CloudStackåè®¸ä»»ä½ç¨æ·åå»ºé¡¹ç®ï¼æèä½ 
ä¹å¯ä»¥åªåè®¸CloudStackç®¡çåè¿è¡æ¤é¡¹æä½ãä¸æ¦ä½ 
åå»ºäºé¡¹ç®ï¼ä½ å°±æä¸ºé¡¹ç®ç®¡çåï¼ä½ å¯ä»¥å°åä¸çå
¶ä»ç¨æ·å å¥å°é¡¹ç®ãCloudStackå¯ä»¥è®¾ç½®æå°ç¨æ·ç´æ¥å å
¥é¡¹ç®æèåæ¥åè
åééè¯·ãé¡¹ç®ç»æåå¯ä»¥æµè§åç®¡çé¡¹ç®ä¸çææèæèµæºï¼ä¾å¦ï¼å

±äº«VMï¼ãä¸ä¸ªç¨æ·å¯ä»¥å±äºä»»ä½é¡¹ç®ç»ï¼å¹¶å¯å¨CloudStackçé¢ä¸åæ¢åªä¸é¡¹ç®ç¸å
³çä¿¡æ¯ï¼å¦é¡¹ç®VMï¼é¡¹ç®æåï¼é¡¹ç®ç¸å³è¦åçã"
+
+# 084d2df113554d86bc84fabe4777c76c
+#: ../../projects.rst:46
+msgid ""
+"The project administrator can pass on the role to another project member. "
+"The project administrator can also add more members, remove members from the"
+" project, set new resource limits (as long as they are below the global "
+"defaults set by the CloudStack administrator), and delete the project. When "
+"the administrator removes a member from the project, resources created by "
+"that user, such as VM instances, remain with the project. This brings us to "
+"the subject of resource ownership and which resources can be used by a "
+"project."
+msgstr "é¡¹ç®ç®¡çåå¯ä»¥å°è§è²ä¼ 
éç»é¡¹ç®å¦å¤çæåãé¡¹ç®ç®¡çåä¹å¯ä»¥æ·»å ãå 
é¤é¡¹ç®æåï¼è®¾ç½®æ°çèµæºé

[34/43] git commit: CLOUDSTACK-5879: added encrypted values

2014-09-09 Thread rajani

CLOUDSTACK-5879: added encrypted values

Signed-off-by: Pierre-Luc Dion 


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/0c75dcc0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/0c75dcc0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/0c75dcc0

Branch: refs/heads/master
Commit: 0c75dcc044873f4c1fee604670616b82d7aff001
Parents: e0bbecb
Author: Erik Weber 
Authored: Tue Aug 19 20:32:11 2014 +0200
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:57 2014 -0400

--
 source/events.rst | 53 ++
 1 file changed, 53 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/0c75dcc0/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index d500a5c..273435e 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -141,6 +141,59 @@ changes can control the behaviour.
 
   The ``eventNotificationBus`` bean represents the
   ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.
+  
+  If you want to use encrypted values for the username and password, you 
have to include a bean to pass those
+  as variables from a credentials file.
+  
+  A sample is given below
+  
+  .. code:: bash
+  
+ http://www.springframework.org/schema/beans";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xmlns:context="http://www.springframework.org/schema/context";
+xmlns:aop="http://www.springframework.org/schema/aop";
+xsi:schemaLocation="http://www.springframework.org/schema/beans
+ 
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ 
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
+ >
+
+
+   
+   
+   
+   
+   
+   
+
+
+
+   
+   
+
+
+
+   
+
+
+
+   
+   
+
+ 
+
+
+  Create a new file in the same folder called ``cred.properties`` and the 
specify the values for username and password as jascrypt encrypted strings
+
+  Sample, with ``guest`` as values for both fields:
+ 
+  .. code:: bash
+ 
+ username=nh2XrM7jWHMG4VQK18iiBQ==
+ password=nh2XrM7jWHMG4VQK18iiBQ==
+ 
 
 #. Restart the Management Server.

[04/43] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking_and_traffic.rst
--
diff --git a/source/networking_and_traffic.rst 
b/source/networking_and_traffic.rst
new file mode 100644
index 000..f29ed3b
--- /dev/null
+++ b/source/networking_and_traffic.rst
@@ -0,0 +1,82 @@
+.. 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.
+   
+
+Managing Networks and Traffic
+=
+
+In a CloudStack, guest VMs can communicate with each other using shared
+infrastructure with the security and user perception that the guests
+have a private LAN. The CloudStack virtual router is the main component
+providing networking features for guest traffic.
+
+.. include:: networking/guest_traffic.rst
+
+.. include:: networking/networking_in_pod.rst
+
+.. include:: networking/networking_in_zone.rst
+
+.. include:: networking/basic_zone_config.rst
+
+.. include:: networking/advanced_zone_config.rst
+
+.. include:: networking/multiple_guest_networks.rst
+
+.. include:: networking/ip_reservation_in_guest_networks.rst
+
+.. include:: networking/public_ips_and_vlans_for_accounts.rst
+
+.. include:: networking/multiple_ips_on_single_nic.rst
+
+.. include:: networking/multiple_ip_ranges.rst
+
+.. include:: networking/elastic_ips.rst
+
+.. include:: networking/portable_ips.rst
+
+.. include:: networking/multiple_subnets_in_shared_network.rst
+
+.. include:: networking/isolation_in_advanced_zone_with_vlan.rst
+
+.. include:: networking/security_groups.rst
+
+.. include:: networking/external_firewalls_and_load_balancers.rst
+
+.. include:: networking/global_server_load_balancing.rst
+
+.. include:: networking/guest_ip_ranges.rst
+
+.. include:: networking/acquiring_an_ip_address.rst
+
+.. include:: networking/releasing_an_ip_address.rst
+
+.. include:: networking/static_nat.rst
+
+.. include:: networking/ip_forwarding_and_firewalling.rst
+
+.. include:: networking/ip_load_balancing.rst
+
+.. include:: networking/dns_and_dhcp.rst
+
+.. include:: networking/remote_access_vpn.rst
+
+.. include:: networking/inter_vlan_routing.rst
+
+.. include:: networking/virtual_private_cloud_config.rst
+
+.. include:: networking/persistent_networks.rst
+
+.. include:: networking/palo_alto_config.rst
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/palo_alto_config.rst
--
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
deleted file mode 100644
index 6c0aa46..000
--- a/source/palo_alto_config.rst
+++ /dev/null
@@ -1,282 +0,0 @@
-.. 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.
-
-
-
-Setup a Palo Alto Networks Firewall

-
-
-Functionality Provided
-~~
-
-This implementation enable the orchestration of a Palo Alto Networks Firewall 
from within CloudStack UI and API.  
-
-**The following features are supported**:
-
-- List/Add/Delete Palo Alto Networks service provider
-- List/Add/Delete Palo Alto Networks network service offering
-- List/Add/Delete Palo Alto Networks network using the above service offering
-- Add an instance to a Palo Alto Networks network
-- Source NAT management on network create and delete
-- List/Add/Delete Ingress Firewall rule
-- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules 
supported)
-- List/Add/Delete Port Forw

[16/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po 
b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
new file mode 100644
index 000..1433054
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
@@ -0,0 +1,499 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# aguncn , 2014
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-26 14:32+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# e8bd92e93dac45f788464ab1963b20e7
+#: ../../troubleshooting.rst:17
+msgid "TroubleShooting"
+msgstr "æéææ¥"
+
+# 55d6cf3cc73d4ef5a617636942890a97
+#: ../../troubleshooting.rst:20
+msgid "Working with Server Logs"
+msgstr "ä½¿ç¨æå¡å¨æ¥å¿"
+
+# 493b26a59c724cb0b4753cf2de7729c6
+#: ../../troubleshooting.rst:22
+msgid ""
+"The CloudStack Management Server logs all web site, middle tier, and "
+"database activities for diagnostics purposes in "
+"`/var/log/cloudstack/management/`. The CloudStack logs a variety of error "
+"messages. We recommend this command to find the problematic output in the "
+"Management Server log:."
+msgstr "ä¸ºäºæ¹ä¾¿è¯æç³»ç»ï¼CloudStack 
ç®¡çæå¡å¨å¨ç®å½/var/log/cloud/management/ä¸è®°å½äºææç½ç«ãä¸é´å±åæ°æ®åºçæ´»å¨ãCloudStack
 
ä¼è®°å½åç§åºéä¿¡æ¯ãæä»¬æ¨èä½¿ç¨ä¸è¿°å½ä»¤ä»ç®¡çæå¡å¨æ¥å¿ä¸å¯»æ¾æé®é¢çè¾åºæ¥å¿ï¼"
+
+# e9110df374044f87990151358476d4c4
+#: ../../troubleshooting.rst:29
+msgid ""
+"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."
+msgstr "å½ä½ 
å¨æ·è´åç²è´´è¿ä¸ªå½ä»¤æ¶ï¼è¯·ç¡®ä¿ææçå½ä»¤é½å¨åä¸è¡éãæçææ¡£æ·è´å·¥å
·ä¼å°è¿ä¸ªå½ä»¤åå²ä¸ºå¤è¡ã"
+
+# 0650dd8f9e3042b6a0023c284e9700af
+#: ../../troubleshooting.rst:37
+msgid ""
+"The CloudStack processes requests with a Job ID. If you find an error in the"
+" logs and you are interested in debugging the issue you can grep for this "
+"job ID in the management server log. For example, suppose that you find the "
+"following ERROR message:"
+msgstr 
"CloudStackå¤çè¯·æ±æ¶ä¼çæä¸ä¸ªä»»å¡IDãå¦ææ¨åç°äºæ¥å¿ä¸çæä¸ªéè¯¯ï¼ç¶åæ³è°è¯è¯¥é®é¢ï¼æ¨å¯ä»¥å¨ç®¡çæå¡å¨æ¥å¿ä¸grepè¿ä¸ªä»»å¡IDãä¾å¦ï¼åè®¾æ¨åç°äºä»¥ä¸çERRORä¿¡æ¯ï¼"
+
+# 8311990224b84dd0b3faf4084d527b4f
+#: ../../troubleshooting.rst:46
+msgid ""
+"Note that the job ID is 1076. You can track back the events relating to job "
+"1076 with the following grep:"
+msgstr "æ³¨æå°ä»»å¡IDæ¯1076ãä½ 
å¯ä»¥è¿½è¸ªè¿åäºä»¶çç¸è¿ä»»å¡1076æç§ä»¥ä¸grep:"
+
+# e3ffc3e9a91f4bbd92acf9a582aa4f09
+#: ../../troubleshooting.rst:53
+msgid ""
+"The CloudStack Agent Server logs its activities in "
+"`/var/log/cloudstack/agent/`."
+msgstr "CloudStackä»£çæå¡å¨å¨ 
`/var/log/cloudstack/agent/`è®°å½äºå®çæ´»å¨ã"
+
+# 2e3bac54e6a44e7a916a10b1a72ae7b8
+#: ../../troubleshooting.rst:57
+msgid "Data Loss on Exported Primary Storage"
+msgstr "å¨å¯¼åºä¸»åå¨æ¶çæ°æ®ä¸¢å¤±"
+
+# 17772f3eaf854986935381edba6a08f4
+# a36bc3bf835b43ceb89eb0502f49427f
+# 5b32c5e122f34a7390b04dc584d7d8b1
+# 8c990e9835c843e0ba8e6389024c9da7
+# c07d93b58e73413caee9927f2f377a4c
+# 0210bf5ba6124daab904e885ec47d2c3
+#: ../../troubleshooting.rst:60 ../../troubleshooting.rst:94
+#: ../../troubleshooting.rst:138 ../../troubleshooting.rst:158
+#: ../../troubleshooting.rst:178 ../../troubleshooting.rst:215
+msgid "Symptom"
+msgstr "çç¶"
+
+# b8c4b40af3fd4552bdc54740a5a0fd39
+#: ../../troubleshooting.rst:62
+msgid ""
+"Loss of existing data on primary storage which has been exposed as a Linux "
+"NFS server export on an iSCSI volume."
+msgstr 
"ä¸»åå¨çå·²ææ°æ®ä¸¢å¤±ãè¯¥ä¸»åå¨æ¯ç¨iSCSIå·å¯¼åºçä¸ä¸ªLinux
 NFSæå¡å¨è¾åºã"
+
+# c0c2bc4870e74609a67d1aed2af2b411
+# 989912d8a32b45e8a4bd2c54b5a97647
+# 1b80c032e2184fad85a5b5d2321b104a
+# b3c2f63d649b4d4dbb78fe05f3e2f087
+# aa3a404aa32c48bbb850fca268ee4ac9
+# 57820682c7c44dc0b9429c160629a1eb
+#: ../../troubleshooting.rst:66 ../../troubleshooting.rst:100
+#: ../../troubleshooting.rst:143 ../../troubleshooting.rst:163
+#: ../../troubleshooting.

[28/43] git commit: Adding logo to 4.3 index page

2014-09-09 Thread rajani

Adding logo to 4.3 index page


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/a55b0dbc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/a55b0dbc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/a55b0dbc

Branch: refs/heads/master
Commit: a55b0dbcf3c56bb856bc3243ec36ef7025af2204
Parents: e54cd24
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:30:12 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:30:12 2014 +0200

--
 source/_static/images/acslogo.png | Bin 0 -> 135394 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a55b0dbc/source/_static/images/acslogo.png
--
diff --git a/source/_static/images/acslogo.png 
b/source/_static/images/acslogo.png
new file mode 100644
index 000..a938231
Binary files /dev/null and b/source/_static/images/acslogo.png differ

[41/43] git commit: ignoring .po and .mo files during merge

2014-09-09 Thread rajani

ignoring .po and .mo files during merge


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/5d59a37d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/5d59a37d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/5d59a37d

Branch: refs/heads/master
Commit: 5d59a37d0d2ca0f6ee6d5193fcdf4bb8a42e5e43
Parents: fe5b65d
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:02:31 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:02:31 2014 +0530

--
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5d59a37d/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..a4cfe93
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.po merge=ours
+*.mo merge=ours

[31/43] git commit: accounts.rst: remove trailing spaces, add highlight

2014-09-09 Thread rajani

accounts.rst: remove trailing spaces, add highlight


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/fce127ef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/fce127ef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/fce127ef

Branch: refs/heads/master
Commit: fce127ef8e6669ea72e5c9b9051f5720172125cb
Parents: 733b866
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:04:07 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:15:02 2014 -0400

--
 source/accounts.rst | 81 
 1 file changed, 54 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fce127ef/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index a4d95a2..b555742 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -186,53 +186,80 @@ Using an LDAP Server for User Authentication
 
 
 You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. 
-CloudStack will search the external LDAP directory tree
-starting at a specified base directory and gets user info such as first name, 
last name, email and username. 
+or ApacheDS to authenticate CloudStack end-users. CloudStack will search
+the external LDAP directory tree starting at a specified base directory
+and gets user info such as first name, last name, email and username.
 
 To authenticate, username and password entered by the user are used.
-Cloudstack does a search for a user with the given username. If it exists, it 
does a bind request with DN and password
+Cloudstack does a search for a user with the given username. If it
+exists, it does a bind request with DN and password.
 
 To set up LDAP authentication in CloudStack, call the CloudStack API
-command addLdapConfiguration and provide Hostname or IP address and listening 
port of the LDAP server.
-You could configure multiple servers as well. These are expected to be 
replicas. If one fails, the next one is used.
+command ``addLdapConfiguration`` and provide Hostname or IP address
+and listening port of the LDAP server. You could configure multiple
+servers as well. These are expected to be replicas. If one fails,
+the next one is used.
 
+The following global configurations should also be configured (the
+default values are for openldap)
 
-The following global configurations should also be configured (the default 
values are for openldap)
+-  ``ldap.basedn``:Sets the basedn for LDAP. Ex: 
**OU=APAC,DC=company,DC=com**
 
+-  ``ldap.bind.principal``, ``ldap.bind.password``: DN and password for a user
+   who can list all the users in the above basedn. Ex:
+   **CN=Administrator, OU=APAC, DC=company, DC=com**
+
+-  ``ldap.user.object``: object type of users within LDAP. Defaults value is
+   **user** for AD and **interorgperson** for openldap.
+
+-  ``ldap.email.attribute``: email attribute within ldap for a user. Default
+   value for AD and openldap is **mail**.
+
+-  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
+   Default value for AD and openldap is **givenname**.
+
+-  ``ldap.username.attribute``: username attribute for a user within LDAP.
+  Default value is **SAMAccountName** for AD and **uid** for openldap.
 
-- ldap.basedn: Sets the basedn for LDAP. Ex: OU=APAC,DC=company,DC=com
-- ldap.bind.principal,ldap.bind.password: DN and password for a user who can 
list all the users in the above basedn. Ex: CN=Administrator, OU=APAC, 
DC=company, DC=com
-- ldap.user.object: object type of users within LDAP. Defaults value is user 
for AD and interorgperson for openldap.
-- ldap.email.attribute: email attribute within ldap for a user. Default value 
for AD and openldap is mail.
-- ldap.firstname.attribute: firstname attribute within ldap for a user. 
Default value for AD and openldap is givenname.
-- ldap.username.attribute: username attribute for a user within LDAP. Default 
value is SAMAccountNAme  for AD and uid for openldap.
 
 Restricting LDAP users to a group:
-~
-- ldap.search.group.principle: this is optional and if set only users from 
this group are listed.  
+~~
+
+-  ``ldap.search.group.principle``: this is optional and if set only users from
+   this group are listed.
+
 
 LDAP SSL:
-~
-- ldap.lastname.attribute: lsatname attribute within ldap for a user. Default 
value for AD and openldap is sn.
-- ldap.truststore, ldap.truststore.password:   truststore,password to use for 
LDAP SSL.
- 
-LDAP groups:  
-~
-- ldap

[08/43] git commit: split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

split the networking2 file into multiple includes and renamed it to 
'networking_and_traffic': This closes #11


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/72a3a7c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/72a3a7c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/72a3a7c1

Branch: refs/heads/master
Commit: 72a3a7c109c7ef198dc1fe99d91a4dd2ff6791a7
Parents: 5a4a44d
Author: Will Stevens 
Authored: Fri May 16 17:35:52 2014 -0400
Committer: Sebastien Goasguen 
Committed: Sat May 17 09:35:01 2014 +0200

--
 source/index.rst|2 +-
 source/networking/acquiring_an_ip_address.rst   |   42 +
 source/networking/advanced_zone_config.rst  |  152 +
 source/networking/basic_zone_config.rst |   24 +
 source/networking/dns_and_dhcp.rst  |   22 +
 source/networking/elastic_ips.rst   |  104 +
 .../external_firewalls_and_load_balancers.rst   |  661 ++
 .../networking/global_server_load_balancing.rst |  453 ++
 source/networking/guest_ip_ranges.rst   |   29 +
 source/networking/guest_traffic.rst |   50 +
 source/networking/inter_vlan_routing.rst|   96 +
 .../ip_forwarding_and_firewalling.rst   |  280 +
 source/networking/ip_load_balancing.rst |   31 +
 .../ip_reservation_in_guest_networks.rst|  125 +
 .../isolation_in_advanced_zone_with_vlan.rst|  202 +
 source/networking/multiple_guest_networks.rst   |  207 +
 source/networking/multiple_ip_ranges.rst|   43 +
 .../networking/multiple_ips_on_single_nic.rst   |   98 +
 .../multiple_subnets_in_shared_network.rst  |   99 +
 source/networking/networking_in_pod.rst |   45 +
 source/networking/networking_in_zone.rst|   34 +
 source/networking/palo_alto_config.rst  |  475 ++
 source/networking/persistent_networks.rst   |   94 +
 source/networking/portable_ips.rst  |  131 +
 .../public_ips_and_vlans_for_accounts.rst   |  154 +
 source/networking/releasing_an_ip_address.rst   |   38 +
 source/networking/remote_access_vpn.rst |  696 ++
 source/networking/security_groups.rst   |  214 +
 source/networking/static_nat.rst|   56 +
 .../networking/virtual_private_cloud_config.rst | 1438 
 source/networking2.rst  | 7033 --
 source/networking_and_traffic.rst   |   82 +
 source/palo_alto_config.rst |  282 -
 source/systemvm.rst |8 +-
 34 files changed, 6180 insertions(+), 7320 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index ddfa3bb..cc25dd4 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -114,7 +114,7 @@ Managing Networks and Traffic
 .. toctree::
:maxdepth: 2
 
-   networking2
+   networking_and_traffic
 
 Managing the Cloud
 --

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/acquiring_an_ip_address.rst
--
diff --git a/source/networking/acquiring_an_ip_address.rst 
b/source/networking/acquiring_an_ip_address.rst
new file mode 100644
index 000..b6556db
--- /dev/null
+++ b/source/networking/acquiring_an_ip_address.rst
@@ -0,0 +1,42 @@
+.. 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.
+   
+
+Acquiring a New IP Address
+--
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click Acquire New IP.
+
+   The Acquire New IP window is displayed.
+
+#. Specify whether you want cross-zone IP or not.
+
+   If you want Portable IP click Yes in

[11/43] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/projects.rst
--
diff --git a/source/projects.rst b/source/projects.rst
index 7d8d766..8cdefee 100644
--- a/source/projects.rst
+++ b/source/projects.rst
@@ -68,6 +68,7 @@ project can use any service offering or disk offering 
available in its
 domain; however, you can not create private service and disk offerings
 at the project level..
 
+
 Configuring Projects
 
 
@@ -76,6 +77,7 @@ administrator must set up various systems to support them, 
including
 membership invitations, limits on project resources, and controls on who
 can create projects.
 
+
 Setting Up Invitations
 ~~
 
@@ -86,22 +88,14 @@ by email or through the userâs CloudStack account. If you 
want
 administrators to use invitations to add members to projects, turn on
 and set up the invitations feature in CloudStack.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
-
-   In the left navigation, click Global Settings.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Global Settings.
 
-   In the search box, type project and click the search button.
+#. In the search box, type project and click the search button.
|Searches projects|
 
-#. 
-
-   In the search results, you can see a few other parameters you need to
+#. In the search results, you can see a few other parameters you need to
set to control how invitations behave. The table below shows global
configuration parameters related to project invitations. Click the
edit button to set each parameter.
@@ -126,13 +120,11 @@ and set up the invitations feature in CloudStack.
| project.smtp.username  | (Optional) User name required by the SMTP 
server for authentication. You must also set project.smtp.password and set 
project.smtp.useAuth to true..   |

++---+
 
-#. 
-
-   Restart the Management Server:
+#. Restart the Management Server:
 
.. code:: bash
 
-   service cloudstack-management restart
+  service cloudstack-management restart
 
 Setting Resource Limits for Projects
 
@@ -163,53 +155,32 @@ new maximum, the resources are not affected; however, the 
project can
 not add any new resources of that type until the total drops below the
 new limit.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
+#. Log in as administrator to the CloudStack UI.
 
-   In the left navigation, click Projects.
+#. In the left navigation, click Projects.
 
-#. 
+#. In Select View, choose Projects.
 
-   In Select View, choose Projects.
+#. Click the name of the project you want to work with.
 
-#. 
-
-   Click the name of the project you want to work with.
-
-#. 
-
-   Click the Resources tab. This tab lists the current maximum amount
+#. Click the Resources tab. This tab lists the current maximum amount
that the project is allowed to own for each type of resource.
 
-#. 
+#. Type new values for one or more resources.
 
-   Type new values for one or more resources.
+#. Click Apply.
 
-#. 
-
-   Click Apply.
 
 Setting the Global Project Resource Limits
 ^^
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Global Settings.
 
-   In the left navigation, click Global Settings.
+#. In the search box, type max.projects and click the search button.
 
-#. 
-
-   In the search box, type max.projects and click the search button.
-
-#. 
-
-   In the search results, you will see the parameters you can use to set
+#. In the search results, you will see the parameters you can use to set
per-project maximum resource amounts that apply to all projects in
the cloud. No project can have more resources, but an individual
project can have lower limits. Click the edit button to set each
@@ -228,13 +199,11 @@ Setting the Global Project Resource Limits

+--+--+
 
 
-#. 
-
-   Restart the Management Server.
+#. Restart the Management Server.
 
.. code:: bash
 
-   # service cloudstack-management restart
+  # service cloudstack-management restart
 
 Setting Project Creator Permissions
 ~~~
@@ -242,21 +211,13 @@ Setting Project Creator Permissions
 You can configure CloudStack to allow any user to create a new project,
 or you can restrict that ability to just CloudStack administrators.
 
-#. 
+#. Log in as administrator to the CloudStack UI.
 
-   Log in as administrator to the

[14/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po 
b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
new file mode 100644
index 000..64d9faa
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
@@ -0,0 +1,1860 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# darrentang , 2014
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-11 12:02+\n"
+"Last-Translator: darrentang \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 2170d7c1a0e145718f15a48fdfd6376c
+#: ../../virtual_machines.rst:18
+msgid "Working with Virtual Machines"
+msgstr "ä½¿ç¨èææº"
+
+# 7b1c6837d7294d04b64fdefe3b860527
+#: ../../virtual_machines.rst:21
+msgid "About Working with Virtual Machines"
+msgstr "å³äºèææºçä½¿ç¨"
+
+# a8fcaad6e74c48de85dda47b508896ff
+#: ../../virtual_machines.rst:23
+msgid ""
+"CloudStack provides administrators with complete control over the lifecycle "
+"of all guest VMs executing in the cloud. CloudStack provides several guest "
+"management operations for end users and administrators. VMs may be stopped, "
+"started, rebooted, and destroyed."
+msgstr 
"CloudStackå¨äºä¸ä¸ºç®¡çåæä¾äºå®æ´çç®¡çæææ¥å®¾VMsæ´ä¸ªçå½å¨æçåè½ãCloudStackä¸ºç»ç«¯ç¨æ·åç®¡çåæä¾äºè®¸å¤æ¥å®¾èæºç®¡çæä½ãVMsè½è¢«å
³æºãå¼æºãéå¯åéæ¯ã"
+
+# 76072107bbd74ed58ef5e488bbc45361
+#: ../../virtual_machines.rst:28
+msgid ""
+"Guest VMs have a name and group. VM names and groups are opaque to "
+"CloudStack and are available for end users to organize their VMs. Each VM "
+"can have three names for use in different contexts. Only two of these names "
+"can be controlled by the user:"
+msgstr 
"æ¥å®¾VMsæåç§°åç»ãVMçåç§°åç»å¯¹äºCloudStackæ¯ä¸éæçï¼å¯¹ç»ç«¯ç¨æ·æ´çä»ä»¬çVMså¯ç¨ãæ¯ä¸ªVMå¯ä»¥æä¸ä¸ªç¨äºä¸åç¯å¢çåç§°ãå
¶ä¸æä¸¤ä¸ªåååç¨æ·æ§å¶ï¼"
+
+# fdf35c82059748b09618dc1b96c32958
+#: ../../virtual_machines.rst:35
+msgid ""
+"Instance name â a unique, immutable ID that is generated by CloudStack and "
+"can not be modified by the user. This name conforms to the requirements in "
+"IETF RFC 1123."
+msgstr "å®ä¾åç§° â 
ä¸ä¸ªå¯ä¸çï¼ä¸å¯åçç±CloudStackçæçIDï¼æ¤IDä¸è½è¢«ç¨æ·ä¿®æ¹ãæ¤åç§°ç¬¦å
 IETF RFC 1123ä¸çè¦æ±ã"
+
+# 35bab809b50548b78006bcf7edfd8375
+#: ../../virtual_machines.rst:41
+msgid ""
+"Display name â the name displayed in the CloudStack web UI. Can be set by "
+"the user. Defaults to instance name."
+msgstr "æ¾ç¤ºåç§° â å¨CloudStack 
UIä¸æ¾ç¤ºçåç§°ãå¯ä»¥ç±ç¨æ·è®¾ç½®ãé»è®¤è·å®ä¾åç§°ä¸è´ã"
+
+# fc95d564a6b74400bdf7cbc43166b900
+#: ../../virtual_machines.rst:46
+msgid ""
+"Name â host name that the DHCP server assigns to the VM. Can be set by the "
+"user. Defaults to instance name"
+msgstr "åç§° â ç±DHCPæå¡å¨åé
ç»VMçä¸»æºåãå¯ä»¥ç±ç¨æ·è®¾ç½®ãé»è®¤è·å®ä¾åç§°ä¸è´ã"
+
+# 29b7bc970aec4088a82cb82eac51acf2
+#: ../../virtual_machines.rst:50
+msgid ""
+"You can append the display name of a guest VM to its internal name. For more"
+" information, see `âAppending a Display Name to the Guest VMâs Internal "
+"Nameâ <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+msgstr "ä½ è½ææ¥å®¾VMçæ¾ç¤ºåéå å°å®çå
é¨åç§°ä¸ãæ´å¤ä¿¡æ¯ï¼è¯·åè `âå°æ¾ç¤ºåéå å°VMçå
é¨åç§°â <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+
+# 7776a17a323a4f91a6a4286428927bdf
+#: ../../virtual_machines.rst:52
+msgid ""
+"Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is"
+" monitored by the system. If the system detects that the VM is down, it will"
+" attempt to restart the VM, possibly on a different host. For more "
+"information, see HA-Enabled Virtual Machines on"
+msgstr "æ¥å®¾VMså¯ä»¥é
ç½®æé«å¯ç¨ï¼HAï¼ãå¯ç¨äºHAçVMç±ç³»ç»çæ§ãå¦æç³»ç»æ£æµå°æ¤VMå®æºï¼å®å¯è½å°å°è¯å¨ä¸åçä¸»æºä¸éå¯VMãæ´å¤ä¿¡æ¯ï¼è¯·åèå¨èææºä¸å¯ç¨HA"
+
+# 89d81c5e76a047d0b049cbfcc9437d7d
+#: ../../virtual_machines.rst:57
+msgid ""
+"Each new VM is allocated one public IP address. When the VM is started, "
+"CloudStack auto

[43/43] git commit: Merge branch '4.4'

2014-09-09 Thread rajani

Merge branch '4.4'

Conflicts:
source/accounts.rst


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/36e50600
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/36e50600
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/36e50600

Branch: refs/heads/master
Commit: 36e506009660e61eb6f1a704d3380889164e1c59
Parents: 26cd1b7 6507638
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:11:20 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:11:20 2014 +0530

--
 .gitattributes |2 +
 source/accounts.rst|   10 +-
 source/locale/zh_CN/LC_MESSAGES/networking2.mo |  Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.po | 8448 +++
 4 files changed, 8457 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/36e50600/source/accounts.rst
--

[17/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/templates.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/templates.po 
b/source/locale/zh_CN/LC_MESSAGES/templates.po
new file mode 100644
index 000..958ffe8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/templates.po
@@ -0,0 +1,1557 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# morgan wang , 2014
+# renoshen , 2014
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-23 11:44+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# b97982f6c7534586be38178d1c1fdcd8
+#: ../../templates.rst:17
+msgid "Working with Templates"
+msgstr "ä½¿ç¨æ¨¡æ¿"
+
+# e9dce9aaa8b14b9b8163fc28465cbca2
+#: ../../templates.rst:19
+msgid ""
+"A template is a reusable configuration for virtual machines. When users "
+"launch VMs, they can choose from a list of templates in CloudStack."
+msgstr "æ¨¡æ¿ç¸å½äºèææºçéç¨é
ç½®ãå½ç¨æ·åå»ºèææºæ¶è½ä»CloudStackçæ¨¡æ¿åè¡¨ä¸éæ©ä¸ä¸ªã"
+
+# d0a82a53c7814d2bad8709d6ea8d8243
+#: ../../templates.rst:22
+msgid ""
+"Specifically, a template is a virtual disk image that includes one of a "
+"variety of operating systems, optional additional software such as office "
+"applications, and settings such as access control to determine who can use "
+"the template. Each template is associated with a particular type of "
+"hypervisor, which is specified when the template is added to CloudStack."
+msgstr "ç¹æ®æåµä¸ï¼æ¨¡æ¿å¯ä»¥æ¯ä¸ä¸ªå
å«ä¸ä¸ªæå¤ä¸ªæä½ç³»ç»çèæç£çéåï¼ä½ 
å¯ä»¥éæ©æ§çå®è£
å¦å¤çè½¯ä»¶ï¼æ¯å¦officeåºç¨å¹¶è®¾ç½®è®¿é®æ§å¶æ¥å³å®è°è½ä½¿ç¨è¿ä¸ªæ¨¡æ¿ãæ¯ä¸ªæ¨¡æ¿å¯¹åºä¸ä¸ªç¹æ®ç±»åçèææºï¼æ¤ç±»èææºå¨å°æ¨¡æ¿æ·»å
 å¥CloudStackæ¶æå®ã"
+
+# 3cea19812ae7412c873921f3b112df2d
+#: ../../templates.rst:29
+msgid ""
+"CloudStack ships with a default template. In order to present more choices "
+"to users, CloudStack administrators and users can create templates and add "
+"them to CloudStack."
+msgstr 
"CloudStackéå¸¦ä¸ä¸ªé»è®¤æ¨¡æ¿ãä¸ºäºåç¨æ·åç°åºæ´å¤éæ©ï¼CloudStackçç®¡çååç¨æ·è½åå»ºæ¨¡æ¿å¹¶æ·»å
 å°CloudStackä¸ã"
+
+# cdd1318db7514de09ddba24875b24795
+#: ../../templates.rst:34
+msgid "Creating Templates: Overview"
+msgstr "åå»ºæ¨¡æ¿æ¦è§"
+
+# 6604bbcbda1146a8947cec849b8aacfc
+#: ../../templates.rst:36
+msgid ""
+"CloudStack ships with a default template for the CentOS operating system. "
+"There are a variety of ways to add more templates. Administrators and end "
+"users can add templates. The typical sequence of events is:"
+msgstr 
"CloudStacké»è®¤å·²ç»æäºä¸ä¸ªå¸¦CentOSç³»ç»çé»è®¤æ¨¡æ¿ãæè®¸å¤æ·»å
 æ´å¤æ¨¡æ¿çæ¹æ³ï¼ç®¡çååæ®éç¨æ·åè½æ·»å ãä¸è¬æ¯è¿æ 
·çé¡ºåºï¼"
+
+# f34378876e0d44ff800666b2d65fc180
+#: ../../templates.rst:43
+msgid ""
+"Launch a VM instance that has the operating system you want. Make any other "
+"desired configuration changes to the VM."
+msgstr "è¿è¡ä¸ä¸ªå¸¦æä½ 
éè¦çæä½ç³»ç»çèææºå®ä¾ï¼å¹¶è¿è¡ä¸äºä½ ææçè®¾ç½®ã"
+
+# 24b37b205a73458c8aa1fb8a40a568e0
+#: ../../templates.rst:48
+msgid "Stop the VM."
+msgstr "åæ¢VMã"
+
+# c64df33a7a6842908b88d0747e1af601
+#: ../../templates.rst:52
+msgid "Convert the volume into a template."
+msgstr "å°å·è½¬æ¢ä¸ºæ¨¡æ¿ã"
+
+# 59a9ab57227c474ab160737b378627a2
+#: ../../templates.rst:54
+msgid ""
+"There are other ways to add templates to CloudStack. For example, you can "
+"take a snapshot of the VM's volume and create a template from the snapshot, "
+"or import a VHD from another system into CloudStack."
+msgstr "è¿æå¶ä»æ¹æ³åCloudStackä¸æ·»å æ¨¡æ¿ãæ¯å¦ä½ 
å¯ä»¥å¯¹èæºç£çå·åä¸ªå¿«ç§ç¶åéè¿è¿ä¸ªå¿«ç
§åå»ºæ¨¡æ¿ï¼æèä»å¦ä¸ä¸ªç³»ç»å¯¼å¥ä¸ä¸ªVHDå°CloudStackã"
+
+# ed480ef0b4464b7f8970f7eab786dc96
+#: ../../templates.rst:58
+msgid ""
+"The various techniques for creating templates are described in the next few "
+"sections."
+msgstr "æ¥ä¸æ¥çå èä¸å°ç»§ç»è®²è¿°åç§åå»ºæ¨¡æ¿çææ¯ã"
+
+# af2d0bd506da45ac8de738d250325f24
+#: ../../templates.rst:62
+msgid "Requirements for Templates"
+msgstr "æ¨¡æ¿çéæ±"
+
+# fc604d7ce79041b2897e66c4616fd723
+#: ../../templates.rst:66
+msgid ""
+"For

[26/43] git commit: Fix formatting issues in README

2014-09-09 Thread rajani

Fix formatting issues in README


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/19e54c22
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/19e54c22
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/19e54c22

Branch: refs/heads/master
Commit: 19e54c228eac857ee6322170ce95714255b66cb1
Parents: fff40fc
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:10:51 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:10:51 2014 +0200

--
 README.rst | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/19e54c22/README.rst
--
diff --git a/README.rst b/README.rst
index 227a6c8..a866fbb 100644
--- a/README.rst
+++ b/README.rst
@@ -30,31 +30,37 @@ Translation
 Clean the build
 
 ::
+
make clean
 
 Generate the .pot files
 
 ::
+
make gettext
 
 Generate the .tx/config files with:
 
 ::
+
sphinx-intl update-txconfig-resources --pot-dir source/locale/pot 
--transifex-project-name apache-cloudstack-administration-rtd --locale-dir 
source/locale
 
 Push the .pot files to transifex with:
 
 ::
+
tx push -s
 
 Download the translated strings, for example Japanese (ja):
 
 ::
+
tx pull -l ja
 
 Build the translated docs:
 
 ::
+
sphinx-intl build --locale-dir source/locale
make -e SPHINXOPTS="-D language='ja'" html

[25/43] git commit: Add po files for zh_CN

2014-09-09 Thread rajani

Add po files for zh_CN


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/fff40fc1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/fff40fc1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/fff40fc1

Branch: refs/heads/master
Commit: fff40fc1966522f4355121299607f858f90a4032
Parents: a209573
Author: Sebastien Goasguen 
Authored: Tue May 27 10:59:48 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue May 27 10:59:48 2014 +0200

--
 source/locale/zh_CN/LC_MESSAGES/accounts.po |  553 ++
 .../locale/zh_CN/LC_MESSAGES/administration.po  |   96 +
 source/locale/zh_CN/LC_MESSAGES/api.po  |  155 +
 source/locale/zh_CN/LC_MESSAGES/events.po   |  414 +
 source/locale/zh_CN/LC_MESSAGES/hosts.po| 1059 +++
 source/locale/zh_CN/LC_MESSAGES/index.po|  104 +
 source/locale/zh_CN/LC_MESSAGES/management.po   |  605 ++
 source/locale/zh_CN/LC_MESSAGES/networking.po   |  901 ++
 source/locale/zh_CN/LC_MESSAGES/networking2.po  | 8448 ++
 source/locale/zh_CN/LC_MESSAGES/projects.po |  756 ++
 source/locale/zh_CN/LC_MESSAGES/reliability.po  |  486 +
 .../zh_CN/LC_MESSAGES/service_offerings.po  | 1080 +++
 source/locale/zh_CN/LC_MESSAGES/storage.po  | 1461 +++
 source/locale/zh_CN/LC_MESSAGES/systemvm.po |  958 ++
 source/locale/zh_CN/LC_MESSAGES/templates.po| 1557 
 .../locale/zh_CN/LC_MESSAGES/troubleshooting.po |  499 ++
 source/locale/zh_CN/LC_MESSAGES/tuning.po   |  166 +
 source/locale/zh_CN/LC_MESSAGES/ui.po   |  457 +
 source/locale/zh_CN/LC_MESSAGES/usage.po| 1656 
 .../zh_CN/LC_MESSAGES/virtual_machines.po   | 1860 
 20 files changed, 23271 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/accounts.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/accounts.po 
b/source/locale/zh_CN/LC_MESSAGES/accounts.po
new file mode 100644
index 000..c7f84c9
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/accounts.po
@@ -0,0 +1,553 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# darrentang , 2014
+# morgan wang , 2014
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 07:52+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 90951daa147540dab10f9d0c78d8c73b
+#: ../../accounts.rst:18
+msgid "Managing Accounts, Users and Domains"
+msgstr "ç®¡çè´¦æ·ï¼ç¨æ·åå"
+
+# 661635f04f94452db5ca9e4dd563cef7
+#: ../../accounts.rst:21
+msgid "Accounts, Users, and Domains"
+msgstr "è´¦æ·ï¼ç¨æ·ï¼å"
+
+# a7494e04f72d469a86f3c67e958ed65f
+#: ../../accounts.rst:24
+msgid "Accounts"
+msgstr "è´¦æ·"
+
+# 457dea8dff534d9aa75e2270c1e1ac6d
+#: ../../accounts.rst:26
+msgid ""
+"An account typically represents a customer of the service provider or a "
+"department in a large organization. Multiple users can exist in an account."
+msgstr "ä¸ä¸ªè´¦æ·éå¸¸ä»£è¡¨ä¸ä¸ªå®¢æ·çæå¡æä¾è
æä¸ä¸ªå¤§ç»ç»ä¸çä¸ä¸ªé¨é¨ãä¸ä¸ªè´¦æ·å¯åå¨å¤ä¸ªç¨æ·ã"
+
+# b45cd9ee7d3e478cbb3c129943ce53d5
+#: ../../accounts.rst:31
+msgid "Domains"
+msgstr "å"
+
+# 10ebf41c7dbf4e65b1be24934d043965
+#: ../../accounts.rst:33
+msgid ""
+"Accounts are grouped by domains. Domains usually contain multiple accounts "
+"that have some logical relationship to each other and a set of delegated "
+"administrators with some authority over the domain and its subdomains. For "
+"example, a service provider with several resellers could create a domain for"
+" each reseller."
+msgstr "å¸æ·éå¸¸æåè¿è¡åç»ãåä¸ç»å¸¸å
å«å¤ä¸ªè´¦æ·ï¼è¿äºè´¦æ·é´åå¨ä¸äºé»è¾ä¸å
³ç³»åä¸ç³»åè¯¥ååå
¶ååä¸çå§æ´¾çç®¡çåï¼è¿æ®µçææå°±æ¯è¯´å¨é»è¾ä¸åä¸å¯ä»¥æç®¡çåï¼ååä¸ä¹å¯ä»¥æç®¡çåï¼ãæ¯å¦ï¼ä¸ä¸ªæå¡æä¾åå¯æå¤ä¸ªåéåè¿æ
 ·çæå¡æä¾åå°±è½ä¸ºæ¯ä¸ä¸ªåéååå»ºä¸ä¸ªå"
+
+# 403c3bff584f41c6b9ee1d4ba5bc6241
+#: ../../accounts.rst:39
+msgid ""
+"For each account created, the Cloud installation creates three different "
+"types of user accounts: root administrato

[20/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/service_offerings.po 
b/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
new file mode 100644
index 000..c64d6a6
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
@@ -0,0 +1,1080 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# typuc , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 02:21+\n"
+"Last-Translator: typuc \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 620304e9ac5340aea4af6b894b131b3a
+#: ../../service_offerings.rst:18
+msgid "Service Offerings"
+msgstr "æå¡æ¹æ¡"
+
+# 748817ca8ea841e7bb071e3fd4e9b1b8
+#: ../../service_offerings.rst:20
+msgid ""
+"In addition to the physical and logical infrastructure of your cloud and the"
+" CloudStack software and servers, you also need a layer of user services so "
+"that people can actually make use of the cloud. This means not just a user "
+"UI, but a set of options and resources that users can choose from, such as "
+"templates for creating virtual machines, disk storage, and more. If you are "
+"running a commercial service, you will be keeping track of what services and"
+" resources users are consuming and charging them for that usage. Even if you"
+" do not charge anything for people to use your cloud â say, if the users 
are"
+" strictly internal to your organization, or just friends who are sharing "
+"your cloud â you can still keep track of what services they use and how 
much"
+" of them."
+msgstr "é¤äºäºä¸çç©çåé»è¾åºç¡è®¾æ½ä»¥å CloudStack 
è½¯ä»¶åæå¡å¨ï¼ä½ 
è¿éè¦ä¸ä¸ªç¨æ·æå¡å±ä»¥ä¾¿è®©äººä»¬è½å¤çæ£å©ç¨äºãè¿ä¸ä»
ä»
æå³è¿ä¸ä¸ªç¨æ·çé¢ï¼èæ¯ä¸ç»ç¨æ·å¯éæ©çéé¡¹åèµæºï¼å¦éè¿æ¨¡çåå»ºèææºï¼ç£çåå¨ççãå¦ææ¨æ£å¨è¿è¡ä¸ä¸ªåä¸æå¡ï¼æ¨å°å¯ä»¥è·è¸ªæå¡åç¨æ·èµæºçä½¿ç¨ä»¥åä½¿ç¨è®¡è´¹æ
åµãå³ä½¿ä½ ä¸å¯¹ä½¿ç¨äºçäººæ¶è´¹ï¼-æ¯å¦è¯´ï¼ç¨æ·æ¯ä½ çå
é¨ç»ç»ï¼æåªæ¯ä½ çæåå±äº«ä½ çäº - ä½ 
ä»ç¶å¯ä»¥è·è¸ªä»ä»¬æä½¿ç¨çæå¡ä»¥åæå¤å°äººã"
+
+# 89ec6965888c4194969da68934867e8f
+#: ../../service_offerings.rst:33
+msgid "Service Offerings, Disk Offerings, Network Offerings, and Templates"
+msgstr "æå¡æ¹æ¡ï¼ç£çæ¹æ¡ï¼ç½ç»æ¹æ¡åæ¨¡ç"
+
+# 39b9fb81cc4a452f932a9becc1c08318
+#: ../../service_offerings.rst:35
+msgid ""
+"A user creating a new instance can make a variety of choices about its "
+"characteristics and capabilities. CloudStack provides several ways to "
+"present users with choices when creating a new instance:"
+msgstr "ç¨æ·å¯ä»¥æ 
¹æ®ä¸åçåè½åç¹æ§æ¥åå»ºæ°çå®ä¾ï¼CloudStackæä¾äºå 
ç§æ¹æ³ä¾ç¨æ·éæ©ä»¥ä¾¿åå»ºä¸ä¸ªæ°çå®ä¾:"
+
+# a080b00346eb4c6191b4a6b1b6ede2bd
+#: ../../service_offerings.rst:39
+msgid ""
+"Service Offerings, defined by the CloudStack administrator, provide a choice"
+" of CPU speed, number of CPUs, RAM size, tags on the root disk, and other "
+"choices. See Creating a New Compute Offering."
+msgstr 
"æå¡æ¹æ¡ï¼ç±CloudStackç®¡çåå®ä¹ï¼æä¾äºå¤ç§éé¡¹ä¾éæ©ï¼CPUéçï¼CPUæ
 ¸æ°ï¼ååå¤§å°ï¼æ ¹ç£çæ ç¾çãå¯åé
åå»ºæ°çè®¡ç®æ¹æ¡ã"
+
+# 87390738e5c6421e8cb6428fd0efd434
+#: ../../service_offerings.rst:43
+msgid ""
+"Disk Offerings, defined by the CloudStack administrator, provide a choice of"
+" disk size and IOPS (Quality of Service) for primary data storage. See "
+"Creating a New Disk Offering."
+msgstr 
"ç£çæ¹æ¡ï¼ç±CloudStackç®¡çåå®ä¹ï¼éå¯¹ä¸»æ°æ®åå¨æä¾ç£çå¤§å°åIOPS(QOS)çéé¡¹ä¾éæ©ãå¯åé
åå»ºæ°çç£çæ¹æ¡ã"
+
+# 3416adb53bd2464c93a0a7de7341aa8c
+#: ../../service_offerings.rst:47
+msgid ""
+"Network Offerings, defined by the CloudStack administrator, describe the "
+"feature set that is available to end users from the virtual router or "
+"external networking devices on a given guest network. See Network Offerings."
+msgstr "ç½ç»æ¹æ¡ï¼ç± CloudStack 
ç®¡çåå®ä¹ï¼çº¦å®æ¥å®¾ç½ç»ä¸èæè·¯ç±å¨æå¤é¨ç½ç»è®¾å¤æä¾ç»ç»ç«¯ç¨æ·å¯ç¨çåè½æè¿°éã"
+
+# 7be016c225ca4b45a449e6d718fbba3e
+#: ../../service_offerings.rst:52
+msgid ""
+"Templates, defined by the CloudStack admi

[07/43] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_load_balancing.rst
--
diff --git a/source/networking/ip_load_balancing.rst 
b/source/networking/ip_load_balancing.rst
new file mode 100644
index 000..6d2edd9
--- /dev/null
+++ b/source/networking/ip_load_balancing.rst
@@ -0,0 +1,31 @@
+.. 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.
+   
+
+IP Load Balancing
+-
+
+The user may choose to associate the same public IP for multiple guests.
+CloudStack implements a TCP-level load balancer with the following
+policies.
+
+-  Round-robin
+
+-  Least connection
+
+-  Source IP
+
+This is similar to port forwarding but the destination may be multiple
+IP addresses.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_reservation_in_guest_networks.rst
--
diff --git a/source/networking/ip_reservation_in_guest_networks.rst 
b/source/networking/ip_reservation_in_guest_networks.rst
new file mode 100644
index 000..c8b8f38
--- /dev/null
+++ b/source/networking/ip_reservation_in_guest_networks.rst
@@ -0,0 +1,125 @@
+.. 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.
+
+
+IP Reservation in Isolated Guest Networks
+-
+
+In isolated guest networks, a part of the guest IP address space can be
+reserved for non-CloudStack VMs or physical servers. To do so, you
+configure a range of Reserved IP addresses by specifying the CIDR when a
+guest network is in Implemented state. If your customers wish to have
+non-CloudStack controlled VMs or physical servers on the same network,
+they can share a part of the IP address space that is primarily provided
+to the guest network.
+
+In an Advanced zone, an IP address range or a CIDR is assigned to a
+network when the network is defined. The CloudStack virtual router acts
+as the DHCP server and uses CIDR for assigning IP addresses to the guest
+VMs. If you decide to reserve CIDR for non-CloudStack purposes, you can
+specify a part of the IP address range or the CIDR that should only be
+allocated by the DHCP service of the virtual router to the guest VMs
+created in CloudStack. The remaining IPs in that network are called
+Reserved IP Range. When IP reservation is configured, the administrator
+can add additional VMs or physical servers that are not part of
+CloudStack to the same network and assign them the Reserved IP
+addresses. CloudStack guest VMs cannot acquire IPs from the Reserved IP
+Range.
+
+
+IP Reservation Considerations
+~
+
+Consider the following before you reserve an IP range for non-CloudStack
+machines:
+
+-  IP Reservation is supported only in Isolated networks.
+
+-  IP Reservation can be applied only when the network is in Implemented
+   state.
+
+-  No IP Reservation is done by default.
+
+-  Guest VM CIDR you specify must be a subset of the network CIDR.
+
+-  Specify a valid Guest VM CIDR. IP Reservation is applied only if no
+   active IPs exist outside the Guest VM CIDR.
+
+   You cannot apply IP Reservation if any VM is alloted with an IP
+   address that is outside the Guest VM CIDR.
+
+-  To reset an existing IP Reservation, apply IP reservation by
+   specifying the value of network CIDR in the CIDR field.
+
+   For example, the following table descr

[33/43] git commit: CLOUDSTACK-5879: Updated rabbitmq eventbus path

2014-09-09 Thread rajani

CLOUDSTACK-5879: Updated rabbitmq eventbus path

Signed-off-by: Pierre-Luc Dion 


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/e0bbecbe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/e0bbecbe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/e0bbecbe

Branch: refs/heads/master
Commit: e0bbecbec09357577ae3395f65d28e8148405138
Parents: 1732dae
Author: Erik Weber 
Authored: Tue Aug 19 19:57:13 2014 +0200
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:48 2014 -0400

--
 source/events.rst | 30 +-
 1 file changed, 21 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e0bbecbe/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index cbba93b..d500a5c 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -95,7 +95,9 @@ As a CloudStack administrator, perform the following one-time
 configuration to enable event notification framework. At run time no
 changes can control the behaviour.
 
-#. Open ``'componentContext.xml``.
+#. Create the folder ``/etc/cloudstack/management/META-INF/cloudstack/core``
+
+#. Inside that folder, open ``spring-event-bus-context.xml``.
 
 #. Define a bean named ``eventNotificationBus`` as follows:
 
@@ -118,14 +120,24 @@ changes can control the behaviour.
 
   .. code:: bash
 
- 
-   
-   
-   
-   
-   
-   
- 
+ http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
+
+   
+   
+   
+   
+   
+   
+
+ 
 
   The ``eventNotificationBus`` bean represents the
   ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.

[02/43] git commit: Update templates.rst: This closes #10

2014-09-09 Thread rajani

Update templates.rst: This closes #10

The right command is dpkg-reconfigure and not dpkg-reconfig.

Signed-off-by: Sebastien Goasguen 


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/a49d204c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/a49d204c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/a49d204c

Branch: refs/heads/master
Commit: a49d204cf217b5f5d78c816b30e3de33f587a1d3
Parents: ba544d2
Author: w00binda 
Authored: Thu May 15 17:58:24 2014 +0200
Committer: Sebastien Goasguen 
Committed: Fri May 16 22:08:56 2014 +0200

--
 source/templates.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a49d204c/source/templates.rst
--
diff --git a/source/templates.rst b/source/templates.rst
index 5480279..c4d33b2 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -485,7 +485,8 @@ templating.
 echo $hostname > /etc/hostname
 hostname $hostname
 # Recreate SSH2
-dpkg-reconfig openssh-server
+export DEBIAN_FRONTEND=noninteractive
+dpkg-reconfigure openssh-server
 fi
 ### End of Script ###

[35/43] git commit: remove whitespaces

2014-09-09 Thread rajani

remove whitespaces


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/6c77f697
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/6c77f697
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/6c77f697

Branch: refs/heads/master
Commit: 6c77f6970635aa39796ec17904f16137ec156271
Parents: 0c75dcc
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:19:38 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:21:04 2014 -0400

--
 source/events.rst | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/6c77f697/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index 273435e..f25f9e0 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -144,11 +144,11 @@ changes can control the behaviour.
   
   If you want to use encrypted values for the username and password, you 
have to include a bean to pass those
   as variables from a credentials file.
-  
+
   A sample is given below
-  
+
   .. code:: bash
-  
+
  http://www.springframework.org/schema/beans";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 xmlns:context="http://www.springframework.org/schema/context";
@@ -188,12 +188,12 @@ changes can control the behaviour.
   Create a new file in the same folder called ``cred.properties`` and the 
specify the values for username and password as jascrypt encrypted strings
 
   Sample, with ``guest`` as values for both fields:
- 
+
   .. code:: bash
- 
+
  username=nh2XrM7jWHMG4VQK18iiBQ==
  password=nh2XrM7jWHMG4VQK18iiBQ==
- 
+
 
 #. Restart the Management Server.

[09/40] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/usage.rst
--
diff --git a/source/usage.rst b/source/usage.rst
index 16d6e9c..6324bbb 100644
--- a/source/usage.rst
+++ b/source/usage.rst
@@ -29,48 +29,35 @@ template storage space, consumed by guest instances.
 The Usage Server runs at least once per day. It can be configured to run
 multiple times per day.
 
+
 Configuring the Usage Server
 
 
 To configure the usage server:
 
-#. 
-
-   Be sure the Usage Server has been installed. This requires extra
+#. Be sure the Usage Server has been installed. This requires extra
steps beyond just installing the CloudStack software. See Installing
the Usage Server (Optional) in the Advanced Installation Guide.
 
-#. 
-
-   Log in to the CloudStack UI as administrator.
-
-#. 
-
-   Click Global Settings.
+#. Log in to the CloudStack UI as administrator.
 
-#. 
+#. Click Global Settings.
 
-   In Search, type usage. Find the configuration parameter that controls
+#. In Search, type usage. Find the configuration parameter that controls
the behavior you want to set. See the table below for a description
of the available parameters.
 
-#. 
+#. In Actions, click the Edit icon.
 
-   In Actions, click the Edit icon.
+#. Type the desired value and click the Save icon.
 
-#. 
-
-   Type the desired value and click the Save icon.
-
-#. 
-
-   Restart the Management Server (as usual with any global configuration
+#. Restart the Management Server (as usual with any global configuration
change) and also the Usage Server:
 
.. code:: bash
 
-   # service cloudstack-management restart
-   # service cloudstack-usage restart
+  # service cloudstack-management restart
+  # service cloudstack-usage restart
 
 The following table shows the global configuration settings that control
 the behavior of the Usage Server.
@@ -88,18 +75,20 @@ for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:
 
 .. code:: bash
 
-usage.stats.job.exec.time = 00:15   
-usage.execution.timezone = PST
-usage.aggregation.timezone = GMT
+   usage.stats.job.exec.time = 00:15   
+   usage.execution.timezone = PST
+   usage.aggregation.timezone = GMT
 
-Valid values for the time zone are specified in `AppendixÂ A, *Time Zones* 
`_
+Valid values for the time zone are specified in `AppendixÂ A, *Time Zones* 
+`_
 
 Default: GMT
 
 usage.execution.timezone
 
 The time zone of usage.stats.job.exec.time. Valid values for the time
-zone are specified in `AppendixÂ A, *Time Zones* 
`_
+zone are specified in `AppendixÂ A, *Time Zones* 
+`_
 
 Default: The time zone of the management server.
 
@@ -150,33 +139,26 @@ predominantly in the East Coast of the United States, and 
you would like
 to process usage records every night at 2 AM local (EST) time. Choose
 these settings:
 
--  
-
-   enable.usage.server = true
-
--  
+-  enable.usage.server = true
 
-   usage.execution.timezone = America/New\_York
+-  usage.execution.timezone = America/New\_York
 
--  
-
-   usage.stats.job.exec.time = 07:00. This will run the Usage job at
+-  usage.stats.job.exec.time = 07:00. This will run the Usage job at
2:00 AM EST. Note that this will shift by an hour as the East Coast
of the U.S. enters and exits Daylight Savings Time.
 
--  
-
-   usage.stats.job.aggregation.range = 1440
+-  usage.stats.job.aggregation.range = 1440
 
 With this configuration, the Usage job will run every night at 2 AM EST
 and will process records for the previous dayâs midnight-midnight as
 defined by the EST (America/New\_York) time zone.
 
 .. note:: 
-Because the special value 1440 has been used for
-usage.stats.job.aggregation.range, the Usage Server will ignore the data
-between midnight and 2 AM. That data will be included in the next day's
-run.
+   Because the special value 1440 has been used for
+   usage.stats.job.aggregation.range, the Usage Server will ignore the data
+   between midnight and 2 AM. That data will be included in the next day's
+   run.
+
 
 Setting Usage Limits
 
@@ -186,6 +168,7 @@ resource usage by users. Some of these limits are global 
configuration
 parameters. Others are applied at the ROOT domain and may be overridden
 on a per-account basis.
 
+
 Globally Configured Limits
 ~~
 
@@ -241,21 +224,13 @@ classified as CPU, RAM, Primary storage, and Secondary 
storage. The root
 administrator is able to impose resource usage limit by the following
 resource types for Domain, Project, and Accou

[09/43] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/usage.rst
--
diff --git a/source/usage.rst b/source/usage.rst
index 16d6e9c..6324bbb 100644
--- a/source/usage.rst
+++ b/source/usage.rst
@@ -29,48 +29,35 @@ template storage space, consumed by guest instances.
 The Usage Server runs at least once per day. It can be configured to run
 multiple times per day.
 
+
 Configuring the Usage Server
 
 
 To configure the usage server:
 
-#. 
-
-   Be sure the Usage Server has been installed. This requires extra
+#. Be sure the Usage Server has been installed. This requires extra
steps beyond just installing the CloudStack software. See Installing
the Usage Server (Optional) in the Advanced Installation Guide.
 
-#. 
-
-   Log in to the CloudStack UI as administrator.
-
-#. 
-
-   Click Global Settings.
+#. Log in to the CloudStack UI as administrator.
 
-#. 
+#. Click Global Settings.
 
-   In Search, type usage. Find the configuration parameter that controls
+#. In Search, type usage. Find the configuration parameter that controls
the behavior you want to set. See the table below for a description
of the available parameters.
 
-#. 
+#. In Actions, click the Edit icon.
 
-   In Actions, click the Edit icon.
+#. Type the desired value and click the Save icon.
 
-#. 
-
-   Type the desired value and click the Save icon.
-
-#. 
-
-   Restart the Management Server (as usual with any global configuration
+#. Restart the Management Server (as usual with any global configuration
change) and also the Usage Server:
 
.. code:: bash
 
-   # service cloudstack-management restart
-   # service cloudstack-usage restart
+  # service cloudstack-management restart
+  # service cloudstack-usage restart
 
 The following table shows the global configuration settings that control
 the behavior of the Usage Server.
@@ -88,18 +75,20 @@ for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:
 
 .. code:: bash
 
-usage.stats.job.exec.time = 00:15   
-usage.execution.timezone = PST
-usage.aggregation.timezone = GMT
+   usage.stats.job.exec.time = 00:15   
+   usage.execution.timezone = PST
+   usage.aggregation.timezone = GMT
 
-Valid values for the time zone are specified in `AppendixÂ A, *Time Zones* 
`_
+Valid values for the time zone are specified in `AppendixÂ A, *Time Zones* 
+`_
 
 Default: GMT
 
 usage.execution.timezone
 
 The time zone of usage.stats.job.exec.time. Valid values for the time
-zone are specified in `AppendixÂ A, *Time Zones* 
`_
+zone are specified in `AppendixÂ A, *Time Zones* 
+`_
 
 Default: The time zone of the management server.
 
@@ -150,33 +139,26 @@ predominantly in the East Coast of the United States, and 
you would like
 to process usage records every night at 2 AM local (EST) time. Choose
 these settings:
 
--  
-
-   enable.usage.server = true
-
--  
+-  enable.usage.server = true
 
-   usage.execution.timezone = America/New\_York
+-  usage.execution.timezone = America/New\_York
 
--  
-
-   usage.stats.job.exec.time = 07:00. This will run the Usage job at
+-  usage.stats.job.exec.time = 07:00. This will run the Usage job at
2:00 AM EST. Note that this will shift by an hour as the East Coast
of the U.S. enters and exits Daylight Savings Time.
 
--  
-
-   usage.stats.job.aggregation.range = 1440
+-  usage.stats.job.aggregation.range = 1440
 
 With this configuration, the Usage job will run every night at 2 AM EST
 and will process records for the previous dayâs midnight-midnight as
 defined by the EST (America/New\_York) time zone.
 
 .. note:: 
-Because the special value 1440 has been used for
-usage.stats.job.aggregation.range, the Usage Server will ignore the data
-between midnight and 2 AM. That data will be included in the next day's
-run.
+   Because the special value 1440 has been used for
+   usage.stats.job.aggregation.range, the Usage Server will ignore the data
+   between midnight and 2 AM. That data will be included in the next day's
+   run.
+
 
 Setting Usage Limits
 
@@ -186,6 +168,7 @@ resource usage by users. Some of these limits are global 
configuration
 parameters. Others are applied at the ROOT domain and may be overridden
 on a per-account basis.
 
+
 Globally Configured Limits
 ~~
 
@@ -241,21 +224,13 @@ classified as CPU, RAM, Primary storage, and Secondary 
storage. The root
 administrator is able to impose resource usage limit by the following
 resource types for Domain, Project, and Accou

git commit: updated refs/heads/4.4 to bd8eaf8

2014-09-09 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 b7b9cd0d2 -> bd8eaf86f


CLOUDSTACK-7393: Expunging VM immediately and removing unncessary wait in 
test_vpc_vm_life_cycle.py

Signed-off-by: SrikanteswaraRao Talluri 
(cherry picked from commit 402fc914cf4047b7faf1b1410972bb5a4ae5b29d)

Conflicts:
test/integration/component/test_vpc_vm_life_cycle.py


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd8eaf86
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd8eaf86
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd8eaf86

Branch: refs/heads/4.4
Commit: bd8eaf86fe07c8c90f71da8ca430cfb489159655
Parents: b7b9cd0
Author: Gaurav Aradhye 
Authored: Mon Sep 8 18:59:17 2014 +0530
Committer: Daan Hoogland 
Committed: Tue Sep 9 09:14:10 2014 +0200

--
 .../component/test_vpc_vm_life_cycle.py | 49 
 1 file changed, 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd8eaf86/test/integration/component/test_vpc_vm_life_cycle.py
--
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py 
b/test/integration/component/test_vpc_vm_life_cycle.py
index fd995cd..bb26452 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -3488,60 +3488,11 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
 self.account.name)
 try:
 self.vm_1.delete(self.apiclient)
-
-list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_1.id
- )
-
-vm_response = list_vm_response[0]
-
-self.assertEqual(
-vm_response.state,
-'Destroyed',
-"VM state should be destroyed"
-)
-
 self.vm_2.delete(self.apiclient)
-
-list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_2.id
- )
-
-vm_response = list_vm_response[0]
-
-self.assertEqual(
-vm_response.state,
-'Destroyed',
-"VM state should be destroyed"
-)
-
 self.vm_3.delete(self.apiclient)
-
-list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_3.id
- )
-
-vm_response = list_vm_response[0]
-
-self.assertEqual(
-vm_response.state,
-'Destroyed',
-"VM state should be destroyed"
-)
 except Exception as e:
 self.fail("Failed to destroy the virtual instances, %s" % e)
 
-self.debug(
-"Waiting for expunge interval to cleanup the network and VMs")
-
-wait_for_cleanup(
- self.apiclient,
- ["expunge.interval", "expunge.delay"]
-)
-
 # Check if the network rules still exists after Vm stop
 self.debug("Checking if NAT rules existed")
 with self.assertRaises(Exception):

git commit: accounts: document SAML authentication

2014-09-09 Thread sebgoa

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/master 863e1f9a6 -> 802e0d3c5


accounts: document SAML authentication

This closes #19

Signed-off-by: Rohit Yadav 
Signed-off-by: Sebastien Goasguen 


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/802e0d3c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/802e0d3c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/802e0d3c

Branch: refs/heads/master
Commit: 802e0d3c53bbe1fae25e566085e932f2f06f9f3d
Parents: 863e1f9
Author: Rohit Yadav 
Authored: Mon Sep 8 15:02:25 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue Sep 9 04:47:22 2014 -0400

--
 source/accounts.rst | 41 +
 1 file changed, 41 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/802e0d3c/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 83d7329..468d07c 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -264,3 +264,44 @@ directly in cloudstack.
 
 
 .. |button to dedicate a zone, pod,cluster, or host| image:: 
_static/images/dedicate-resource-button.png
+
+Using a SAML 2.0 Identity Provider for User Authentication
+--
+
+You can use a SAML 2.0 Identity Provider with CloudStack for user
+authentication. This will require enabling the SAML 2.0 service provider plugin
+in CloudStack. On successful authentication, CloudStack will use the persistent
+or emailAddress NameID from the SAML token to find an existing user or create
+a new user with this NameID and let the user log in to the CloudStack UI.
+
+First, enable the SAML plugin by setting ``saml2.enabled`` to ``true`` and
+restart management server. To start a SAML 2.0 Single Sign-On authentication,
+the user should call the ``samlsso`` API command which will redirect the user 
to
+IdP login page. Upon successful authentication, the IdP will redirect the user
+to CloudStack. To start a SAML 2.0 Single Log-Out, the user calls the
+``samlslo`` API command which globally logs out the user and return back to
+CloudStack UI login page. The CloudStack service provider metadata is 
accessible
+from the ``getSPMetadata`` API command.
+
+The following global configuration should be configured:
+
+-  ``saml2.enabled``: Set this to **true** to enable the SAML Plugin. Default 
is **false**.
+
+-  ``saml2.default.accountname``: Account name for creating new users. Default 
is **admin**.
+
+-  ``saml2.default.domainid``: Domain (UUID string) to use for creating new 
users. Default is **1** (root domain).
+
+-  ``saml2.redirect.url``: The CloudStack UI url the SSO should redirected to 
when successful. Default is **http://localhost:8080/client**.
+
+-  ``saml2.sp.id``: CloudStack service provider entity ID. Default is 
**org.apache.cloudstack**.
+
+-  ``saml2.sp.sso.url``: CloudStack service provider Single Sign-On URL. 
Default is **http://localhost:8080/client/api?command=samlsso**.
+
+-  ``saml2.sp.slo.url``: CloudStack service provider entity ID. Default is 
**http://localhost:8080/client/api?command=samlslo**.
+
+-  ``saml2.idp.id``: The Identity Provider entity ID string. Default is 
**https://openidp.feide.no**.
+
+-  ``saml2.idp.metadata.url``: Identity Provider Metadata XML Url. Default is 
**https://openidp.feide.no/simplesaml/saml2/idp/metadata.php**.
+
+-  ``saml2.timeout``: Timeout used for downloading and parsing IdP metadata in 
milliseconds. Default is **3**.
+

git commit: Update templates.rst

2014-09-09 Thread sebgoa

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/master 802e0d3c5 -> 26cd1b738


Update templates.rst

remove two space
add /etc/init.d/hostname.sh start
 echo $hostname > /proc/sys/kernel/hostname
 # Recreate SSH2

This closes #18

Signed-off-by: Sebastien Goasguen 


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/26cd1b73
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/26cd1b73
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/26cd1b73

Branch: refs/heads/master
Commit: 26cd1b73877074809dc1bc2e84cef0e6fc8aef04
Parents: 802e0d3
Author: baiqj 
Authored: Thu Aug 28 15:28:46 2014 +0800
Committer: Sebastien Goasguen 
Committed: Tue Sep 9 04:49:24 2014 -0400

--
 source/templates.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/26cd1b73/source/templates.rst
--
diff --git a/source/templates.rst b/source/templates.rst
index bc55aa2..b473043 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -416,12 +416,14 @@ templating.
  echo "cloudstack-hostname: Hostname _localhost_ detected. 
Changing hostname and adding hosts."
  echo " Hostname: $hostname \n FQDN: $fqdn \n IP: $ip"
  # Update /etc/hosts
- awk -v i="$ip" -v f="$fqdn" -v h="$hostname" "/^127/{x=1} !/^127/ 
&& x { x=0; print i,f,h; } { print $0; }" /etc/  hosts > /etc/hosts.dhcp.tmp
+ awk -v i="$ip" -v f="$fqdn" -v h="$hostname" "/^127/{x=1} !/^127/ 
&& x { x=0; print i,f,h; } { print $0; }" /etc/hosts > /etc/hosts.dhcp.tmp
  mv /etc/hosts /etc/hosts.dhcp.bak
  mv /etc/hosts.dhcp.tmp /etc/hosts
  # Rename Host
  echo $hostname > /etc/hostname
  hostname $hostname
+ /etc/init.d/hostname.sh start
+ echo $hostname > /proc/sys/kernel/hostname
  # Recreate SSH2
  export DEBIAN_FRONTEND=noninteractive
  dpkg-reconfigure openssh-server

git commit: updated refs/heads/4.3 to 3391172

2014-09-09 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 c3617f986 -> 33911723f


Update CHANGES file with 6224


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33911723
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33911723
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33911723

Branch: refs/heads/4.3
Commit: 33911723f851fe9a816c400bb4739539b8087cd3
Parents: c3617f9
Author: Sebastien Goasguen 
Authored: Tue Sep 9 13:56:45 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue Sep 9 13:56:45 2014 +0200

--
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33911723/CHANGES.md
--
diff --git a/CHANGES.md b/CHANGES.md
index c3fc7d2..64223cc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Version 4.3.1
 
 This is a bug fix release. The following issues were fixed:
 
+CLOUDSTACK-6624: set specifyIpRanges to true if specifyVlan is set to true
 CLOUDSTACK-7404: Failed to start an instance when originating template has 
been deleted 
 CLOUDSTACK-6531: Stopping the router in case of command failures
 CLOUDSTACK-6115: TravisCI configuration

svn commit: r6460 - in /dev/cloudstack/4.3.1: apache-cloudstack-4.3.1-src.tar.bz2 apache-cloudstack-4.3.1-src.tar.bz2.asc apache-cloudstack-4.3.1-src.tar.bz2.md5 apache-cloudstack-4.3.1-src.tar.bz2.sh

2014-09-09 Thread sebgoa

Author: sebgoa
Date: Tue Sep  9 12:09:12 2014
New Revision: 6460

Log:
Committing release candidate artifacts for 4.3.1 to dist/dev/cloudstack in 
preparation for release vote

Added:
dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2   (with props)
dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.asc
dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.md5
dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.sha

Added: dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2
==
Binary file - no diff available.

Propchange: dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2
--
svn:mime-type = application/octet-stream

Added: dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.asc
==
--- dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.asc (added)
+++ dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.asc Tue Sep  9 
12:09:12 2014
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABCgAGBQJUDu1HAAoJELGPImuPieuEND0P/j0uaeoO6cxYmtjoH4V/VFWn
+HQ6+9hQxfPUF7eU3r8hhiq2iAuDdFUBEoN6ttIIVesV8+iB6j4gmfg6muPm18J/e
+mj0nnVc1wsgGzEs7bbQD5uOexPamOcIK56uhZ1zbBNhg1+I473p2wj3xkfhzV0WA
+I4U/WUFiRl0xFO/7LQP16yGP3pAxXo0ikQQCMFiELM2AeUKuXdTx2jIgeGxHsY0P
+TmXopnF/eAzV4M6T/Z1NadDsLIqQSg3jL45bw2fSo38WhcGGoLHqA19nCKyHG/ru
+bR6ax+yIcInKB3fxsJC0a3voVa+G/hmIRzjdroPXFCgQJGqJ9mA2sWivzH04eTCX
+YFIw4QbBwL6940zUdbIdBnaTfppDpV4NRYka2/fxyAdeHyKZWNl0/rvumJQTpJ9Z
+UwhTKXBVaaWY5In7e2g3WazMAXMPQBTZk66v8L1LiQwsWP2DFylDauY9p1YnmYu+
+EV5oFR/U/ZnB5z3q2t4zJAIFbxkgY+TekZqUnX3jKf2/YwS0+RneBHofJOpD1ZX/
+pW3fx2lGO9EG3SJOj4aCk46WY/pvyuG6xic9iIlNoI1jlBIsjOVGEFOUiD1EWvKT
+XXeAlz/MDIQj0xQW/HLd7llX8FmoKjKhcJvIcBMxe9uWcgRUlV06y00cyIwSnCPo
+9Kq01+CMGH3RKOJXLFOP
+=trqE
+-END PGP SIGNATURE-

Added: dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.md5
==
--- dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.md5 (added)
+++ dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.md5 Tue Sep  9 
12:09:12 2014
@@ -0,0 +1,2 @@
+apache-cloudstack-4.3.1-src.tar.bz2: 99 24 37 81 F8 6C 1C FA  73 DC AA BD 7B AD
+ 86 C0

Added: dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.sha
==
--- dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.sha (added)
+++ dev/cloudstack/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.sha Tue Sep  9 
12:09:12 2014
@@ -0,0 +1,4 @@
+apache-cloudstack-4.3.1-src.tar.bz2: 5616B4B5 9F88D1AD 0507F0DF C8C74F5B
+ BCE90508 347F2A87 87C31D49 67B0BB42
+ 6B2B9875 5BFF940A 55339BEC C6CAF84D
+ AC5DB455 FAA422FF AD9A13AA 109B06BE

[2/2] git commit: cloudmonkey: fix help strings

2014-09-09 Thread bhaisaab

cloudmonkey: fix help strings

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/b8fc61e9
Tree: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/b8fc61e9
Diff: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/b8fc61e9

Branch: refs/heads/master
Commit: b8fc61e990e558169697659a01ab28ef20d13e78
Parents: f1f27e3
Author: Rohit Yadav 
Authored: Tue Sep 9 14:29:18 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 9 14:29:18 2014 +0200

--
 cloudmonkey/cloudmonkey.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/b8fc61e9/cloudmonkey/cloudmonkey.py
--
diff --git a/cloudmonkey/cloudmonkey.py b/cloudmonkey/cloudmonkey.py
index bc5530c..fabbac2 100644
--- a/cloudmonkey/cloudmonkey.py
+++ b/cloudmonkey/cloudmonkey.py
@@ -571,7 +571,7 @@ def main():
 
 parser.add_argument("-c", "--config-file",
 dest="configFile", default=config_file,
-help="config file for cloudmonkey", metavar="FILE")
+help="Config file for cloudmonkey", metavar="FILE")
 
 parser.add_argument("-d", "--display-type",
 dest="displayType", default=None,
@@ -579,7 +579,7 @@ def main():
 choices=tuple(displayTypes))
 
 parser.add_argument("commands", nargs=argparse.REMAINDER,
-help="api commands")
+help="API commands")
 
 argcomplete.autocomplete(parser)
 args = parser.parse_args()

[1/2] git commit: CLOUDSTACK-7456: Add command line flag -d to control output display

2014-09-09 Thread bhaisaab

Repository: cloudstack-cloudmonkey
Updated Branches:
  refs/heads/master 9662e6bcc -> b8fc61e99


CLOUDSTACK-7456: Add command line flag -d to control output display

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/f1f27e31
Tree: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/f1f27e31
Diff: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/f1f27e31

Branch: refs/heads/master
Commit: f1f27e31c1d9ac5baa30b66e1ab0e0a5da7a0f7e
Parents: 9662e6b
Author: Rohit Yadav 
Authored: Tue Sep 9 14:12:01 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 9 14:12:01 2014 +0200

--
 cloudmonkey/cloudmonkey.py | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/f1f27e31/cloudmonkey/cloudmonkey.py
--
diff --git a/cloudmonkey/cloudmonkey.py b/cloudmonkey/cloudmonkey.py
index 9264d0e..bc5530c 100644
--- a/cloudmonkey/cloudmonkey.py
+++ b/cloudmonkey/cloudmonkey.py
@@ -563,14 +563,21 @@ class CloudMonkeyShell(cmd.Cmd, object):
 
 
 def main():
+displayTypes = ["json", "table", "default"]
 parser = argparse.ArgumentParser(usage="cloudmonkey [options] [commands]",
  version="cloudmonkey " + __version__,
  description=__description__,
  epilog="Try cloudmonkey [help|?]")
+
 parser.add_argument("-c", "--config-file",
 dest="configFile", default=config_file,
 help="config file for cloudmonkey", metavar="FILE")
 
+parser.add_argument("-d", "--display-type",
+dest="displayType", default=None,
+help="Output display type, json, table or default",
+choices=tuple(displayTypes))
+
 parser.add_argument("commands", nargs=argparse.REMAINDER,
 help="api commands")
 
@@ -579,6 +586,9 @@ def main():
 
 shell = CloudMonkeyShell(sys.argv[0], args.configFile)
 
+if args.displayType != None and args.displayType in displayTypes:
+shell.set_attr("display", args.displayType)
+
 if len(args.commands) > 0:
 shell.onecmd(' '.join(args.commands))
 else:

git commit: CLOUDSTACK-7459: Honour quoted/escaped arguments from command line

2014-09-09 Thread bhaisaab

Repository: cloudstack-cloudmonkey
Updated Branches:
  refs/heads/master b8fc61e99 -> 1980b6cee


CLOUDSTACK-7459: Honour quoted/escaped arguments from command line

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/1980b6ce
Tree: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/1980b6ce
Diff: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/1980b6ce

Branch: refs/heads/master
Commit: 1980b6cee1df63b3561a7115b8cc076375579dcb
Parents: b8fc61e
Author: Rohit Yadav 
Authored: Tue Sep 9 14:45:25 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 9 14:47:03 2014 +0200

--
 cloudmonkey/cloudmonkey.py | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/1980b6ce/cloudmonkey/cloudmonkey.py
--
diff --git a/cloudmonkey/cloudmonkey.py b/cloudmonkey/cloudmonkey.py
index fabbac2..9063f08 100644
--- a/cloudmonkey/cloudmonkey.py
+++ b/cloudmonkey/cloudmonkey.py
@@ -586,11 +586,13 @@ def main():
 
 shell = CloudMonkeyShell(sys.argv[0], args.configFile)
 
-if args.displayType != None and args.displayType in displayTypes:
+if args.displayType is not None and args.displayType in displayTypes:
 shell.set_attr("display", args.displayType)
 
 if len(args.commands) > 0:
-shell.onecmd(' '.join(args.commands))
+shell.onecmd(" ".join(map(lambda x: x.replace("\\ ", " ")
+ .replace(" ", "\\ "),
+  args.commands)))
 else:
 shell.cmdloop()

git commit: updated refs/heads/4.3 to b6ee5e6

2014-09-09 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 33911723f -> b6ee5e645


pom: fix xapi version from root pom.xml as 41c0eaa remove it from deps/XenServer

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6ee5e64
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6ee5e64
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6ee5e64

Branch: refs/heads/4.3
Commit: b6ee5e6455176e75c67b74241b1a9f6160cc62a1
Parents: 3391172
Author: Rohit Yadav 
Authored: Tue Sep 9 18:23:12 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 9 18:23:12 2014 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6ee5e64/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 19e4d35..83b62e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 2.6.6
 1.7.2
 14.0-rc1
-5.6.100-1-SNAPSHOT
+5.6.100-1
 3.1
 4.2.1
 5.1.21

git commit: updated refs/heads/4.3 to ac5309b

2014-09-09 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 b6ee5e645 -> ac5309b8b


appliance: fix newer debian iso links and checksums for debian

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ac5309b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac5309b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ac5309b8

Branch: refs/heads/4.3
Commit: ac5309b8b47ddb1e5588a2d5090f2bcce0e7c2a4
Parents: b6ee5e6
Author: Rohit Yadav 
Authored: Tue Sep 9 18:37:15 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 9 18:37:15 2014 +0200

--
 tools/appliance/definitions/systemvm64template/definition.rb | 6 +++---
 tools/appliance/definitions/systemvmtemplate/definition.rb   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac5309b8/tools/appliance/definitions/systemvm64template/definition.rb
--
diff --git a/tools/appliance/definitions/systemvm64template/definition.rb 
b/tools/appliance/definitions/systemvm64template/definition.rb
index 454145d..bd59025 100644
--- a/tools/appliance/definitions/systemvm64template/definition.rb
+++ b/tools/appliance/definitions/systemvm64template/definition.rb
@@ -3,9 +3,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
-  :iso_file => "debian-7.0.0-amd64-netinst.iso",
-  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.0.0/amd64/iso-cd/debian-7.0.0-amd64-netinst.iso";,
-  :iso_md5 => "6a55096340b5b1b7d335d5b559e13ea0",
+  :iso_file => "debian-7.5.0-amd64-netinst.iso",
+  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso";,
+  :iso_md5 => "8fdb6715228ea90faba58cb84644d296",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
  '',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac5309b8/tools/appliance/definitions/systemvmtemplate/definition.rb
--
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index 33f25b2..9b57379 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -3,9 +3,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
-  :iso_file => "debian-7.0.0-i386-netinst.iso",
-  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.0.0/i386/iso-cd/debian-7.0.0-i386-netinst.iso";,
-  :iso_md5 => "a6b93666a5393334accb7ac4ee28d949",
+  :iso_file => "debian-7.5.0-i386-netinst.iso",
+  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/i386/iso-cd/debian-7.5.0-i386-netinst.iso";,
+  :iso_md5 => "0e6eaacb5a5828473afe90f6df9c8f16",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
  '',

git commit: updated refs/heads/master to 7656590

2014-09-09 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/master d08d71427 -> 765659091


appliance: fix newer debian iso links and checksums for debian

Signed-off-by: Rohit Yadav 
(cherry picked from commit ac5309b8b47ddb1e5588a2d5090f2bcce0e7c2a4)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76565909
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76565909
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76565909

Branch: refs/heads/master
Commit: 765659091ad01f74cd1e4cfada098fd57f647a45
Parents: d08d714
Author: Rohit Yadav 
Authored: Tue Sep 9 18:37:15 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 9 18:41:53 2014 +0200

--
 tools/appliance/definitions/systemvm64template/definition.rb | 6 +++---
 tools/appliance/definitions/systemvmtemplate/definition.rb   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76565909/tools/appliance/definitions/systemvm64template/definition.rb
--
diff --git a/tools/appliance/definitions/systemvm64template/definition.rb 
b/tools/appliance/definitions/systemvm64template/definition.rb
index bee7db7..4186742 100644
--- a/tools/appliance/definitions/systemvm64template/definition.rb
+++ b/tools/appliance/definitions/systemvm64template/definition.rb
@@ -10,9 +10,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
-  :iso_file => "debian-7.4.0-amd64-netinst.iso",
-  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso";,
-  :iso_md5 => "e7e9433973f082a297793c3c5010b2c5",
+  :iso_file => "debian-7.5.0-amd64-netinst.iso",
+  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso";,
+  :iso_md5 => "8fdb6715228ea90faba58cb84644d296",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
  '',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76565909/tools/appliance/definitions/systemvmtemplate/definition.rb
--
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index ab65f53..d29efcd 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -10,9 +10,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
-  :iso_file => "debian-7.4.0-i386-netinst.iso",
-  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.4.0/i386/iso-cd/debian-7.4.0-i386-netinst.iso";,
-  :iso_md5 => "7339b668a81b417ac023d73739dc6a03",
+  :iso_file => "debian-7.5.0-i386-netinst.iso",
+  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/i386/iso-cd/debian-7.5.0-i386-netinst.iso";,
+  :iso_md5 => "0e6eaacb5a5828473afe90f6df9c8f16",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
  '',

git commit: updated refs/heads/4.3 to 9919873

2014-09-09 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 ac5309b8b -> 99198738f


debian: fix changelog which is having badly formatted timestamp

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99198738
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99198738
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99198738

Branch: refs/heads/4.3
Commit: 99198738fcd646c101fab57b7e5d67f9b0e53b2e
Parents: ac5309b
Author: Rohit Yadav 
Authored: Tue Sep 9 18:47:23 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 9 18:47:23 2014 +0200

--
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99198738/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index 5a68efe..530b4ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ cloudstack (4.3.1) unstable; urgency=low
 
   * Update the version to 4.3.1
 
- -- Sebastien Goasguen   Thu, 04 Sep 2014 16:47:57 2014 +0200
+ -- Sebastien Goasguen   Thu, 04 Sep 2014 16:47:57 +0200
 
 cloudstack (4.3.1-snapshot) unstable; urgency=low

git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to 7f97bf7

2014-09-09 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/hotfix/4.4/CLOUDSTACK-7184 [created] 7f97bf7c5


CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f97bf7c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f97bf7c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f97bf7c

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 7f97bf7c58a348e684f7138c93c287a3c86ca55b
Parents: bd8eaf8
Author: Daan Hoogland 
Authored: Tue Sep 9 22:19:54 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Sep 9 22:19:54 2014 +0200

--
 .../hypervisor/xen/discoverer/XcpServerDiscoverer.java  |  1 +
 .../hypervisor/xen/resource/CitrixResourceBase.java |  8 ++--
 scripts/vm/hypervisor/xenserver/launch_hb.sh|  7 ++-
 scripts/vm/hypervisor/xenserver/vmopspremium|  3 ++-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 12 
 server/src/com/cloud/configuration/Config.java  | 10 +-
 .../cloud/configuration/ConfigurationManagerImpl.java   |  1 +
 server/src/com/cloud/resource/DiscovererBase.java   |  1 +
 .../root/redundant_router/check_heartbeat.sh.templ  |  4 ++--
 9 files changed, 36 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f97bf7c/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 0e7cf74..eda28f3 100755
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -347,6 +347,7 @@ public class XcpServerDiscoverer extends DiscovererBase 
implements Discoverer, L
 details.put("wait", Integer.toString(_wait));
 params.put("migratewait", 
_configDao.getValue(Config.MigrateWait.toString()));
 params.put(Config.XenMaxNics.toString().toLowerCase(), 
_configDao.getValue(Config.XenMaxNics.toString()));
+
params.put(Config.XenHeartBeatTimeout.toString().toLowerCase(), 
_configDao.getValue(Config.XenHeartBeatTimeout.toString()));
 
params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), 
_configDao.getValue(Config.XenHeartBeatInterval.toString()));
 params.put(Config.InstanceName.toString().toLowerCase(), 
_instance);
 details.put(Config.InstanceName.toString().toLowerCase(), 
_instance);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f97bf7c/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index c1c9795..644ef65 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -289,6 +289,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 protected IAgentControl _agentControl;
 
 final int _maxWeight = 256;
+protected int _heartbeatTimeout = 120;
 protected int _heartbeatInterval = 60;
 protected final XsHost _host = new XsHost();
 
@@ -4603,8 +4604,10 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 
 protected boolean launchHeartBeat(Connection conn) {
-String result = callHostPluginPremium(conn, "heartbeat", "host", 
_host.uuid, "interval", Integer
-.toString(_heartbeatInterval));
+String result = callHostPluginPremium(conn, "heartbeat",
+"host", _host.uuid,
+"timeout", Integer.toString(_heartbeatTimeout),
+"interval", Integer.toString(_heartbeatInterval));
 if (result == null || !result.contains("> DONE <")) {
 s_logger.warn("Unable to launch the heartbeat process on " + 
_host.ip);
 return false;
@@ -5674,6 +5677,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 _storageNetworkName1 = (String)params.get("storage.network.device1");
 _storageNetworkName2 = (String)params.get("storage.network.device2");
 
+_heartbeatTimeout = 
NumbersUtil.parseInt((S

git commit: updated refs/heads/master to fcf2c1b

2014-09-09 Thread anthonyxu

Repository: cloudstack
Updated Branches:
  refs/heads/master 765659091 -> fcf2c1b6b


CLOUDSTACK-7505:

  if VM is created from ISO, don't change platform metadat for VM on XS


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fcf2c1b6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fcf2c1b6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fcf2c1b6

Branch: refs/heads/master
Commit: fcf2c1b6bc08037cca9952d5c97490c74e29876b
Parents: 7656590
Author: Anthony Xu 
Authored: Tue Sep 9 14:01:23 2014 -0700
Committer: Anthony Xu 
Committed: Tue Sep 9 14:02:37 2014 -0700

--
 .../xenserver/resource/CitrixResourceBase.java  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fcf2c1b6/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 7e386a3..b12dc24 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -1459,11 +1459,13 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 vm.setPlatform(conn, platform);
 }
 }
-String xenservertoolsversion = 
details.get("hypervisortoolsversion");
-if ((xenservertoolsversion == null || 
!xenservertoolsversion.equalsIgnoreCase("xenserver61")) && 
vmSpec.getGpuDevice() == null) {
-Map platform = vm.getPlatform(conn);
-platform.remove("device_id");
-vm.setPlatform(conn, platform);
+if ( !BootloaderType.CD.equals(vmSpec.getBootloader())) {
+String xenservertoolsversion = 
details.get("hypervisortoolsversion");
+if ((xenservertoolsversion == null || 
!xenservertoolsversion.equalsIgnoreCase("xenserver61")) && 
vmSpec.getGpuDevice() == null) {
+Map platform = vm.getPlatform(conn);
+platform.remove("device_id");
+vm.setPlatform(conn, platform);
+}
 }
 }
 }

[1/2] CLOUDSTACK-7514-[Automation] - Automate ACL test cases relating to listSnapshots()

2014-09-09 Thread sangeethah

Repository: cloudstack
Updated Branches:
  refs/heads/master fcf2c1b6b -> 7a79fd1c5


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a79fd1c/test/integration/component/test_acl_listsnapshot.py
--
diff --git a/test/integration/component/test_acl_listsnapshot.py 
b/test/integration/component/test_acl_listsnapshot.py
new file mode 100644
index 000..ac8748d
--- /dev/null
+++ b/test/integration/component/test_acl_listsnapshot.py
@@ -0,0 +1,2853 @@
+# 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.
+""" 
+Test cases relating to listSnapshot() relating to parameters - 
id,listall,isrecursive,account and domainid
+"""
+#Import Local Modules
+import marvin
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+from nose.plugins.attrib import attr
+#Import System modules
+import time
+
+_multiprocess_shared_ = True
+
+class TestSnapshotList(cloudstackTestCase):
+@classmethod
+def setUpClass(cls):
+   """
+   Create the following domain tree and accounts that are reqiured for 
executing listSnapshot test cases:
+   Under ROOT - create 2 domaind D1 and D2
+   Under D1 - Create 2 subdomain D11 and D12
+   Under D11 - Create subdimain D111
+   
+   Under each of the domain create 1 admin user and couple of regular 
users.
+
+   As each of these users , deploy Virtual machines and take a snapshot of 
the ROOT volume.
+
+   """
+cls.testclient = super(TestSnapshotList, cls).getClsTestClient()
+cls.apiclient = cls.testclient.getApiClient()
+cls.testdata = cls.testClient.getParsedTestDataConfig()
+cls.acldata = cls.testdata["acl"]
+
+cls.domain_1 = None
+cls.domain_2 = None
+cleanup = None
+
+   try:
+   
+# backup default apikey and secretkey
+cls.default_apikey = cls.apiclient.connection.apiKey
+cls.default_secretkey = cls.apiclient.connection.securityKey
+   
+# Create domains 
+cls.domain_1 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain1"]
+   )
+cls.domain_11 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain11"],
+  parentdomainid=cls.domain_1.id
+   )
+cls.domain_111 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain111"],
+  parentdomainid=cls.domain_11.id,
+   )
+cls.domain_12 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain12"],
+  parentdomainid=cls.domain_1.id
+   )
+cls.domain_2 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain2"]
+   )
+# Create  1 admin account and 2 user accounts for doamin_1
+cls.account_d1 = Account.create(
+cls.apiclient,
+cls.acldata["accountD1"],
+admin=True,
+domainid=cls.domain_1.id
+)
+
+   user = cls.generateKeysForUser(cls.apiclient,cls.account_d1)
+cls.user_d1_apikey = user.apikey
+cls.user_d1_secretkey = user.secretkey
+
+cls.account_d1a = Account.create(
+cls.apiclient,
+cls.acldata["accountD1A"],
+admin=False,
+domainid=cls.domain_1.id
+)
+

[2/2] git commit: updated refs/heads/master to 7a79fd1

2014-09-09 Thread sangeethah

CLOUDSTACK-7514-[Automation] - Automate ACL test cases relating to 
listSnapshots()


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a79fd1c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a79fd1c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a79fd1c

Branch: refs/heads/master
Commit: 7a79fd1c5ee4ca93e8e133f3dcda21de565a4888
Parents: fcf2c1b
Author: Sangeetha Hariharan 
Authored: Tue Sep 9 15:05:36 2014 -0700
Committer: Sangeetha Hariharan 
Committed: Tue Sep 9 17:44:29 2014 -0700

--
 .../component/test_acl_listsnapshot.py  | 2853 ++
 1 file changed, 2853 insertions(+)
--

git commit: updated refs/heads/master to 9b65759

2014-09-09 Thread sangeethah

Repository: cloudstack
Updated Branches:
  refs/heads/master 7a79fd1c5 -> 9b65759f3


CLOUDSTACK-7033-[Automation] - Automate ACL test cases relating to isolate 
Network for deleteNetwork() api


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b65759f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b65759f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b65759f

Branch: refs/heads/master
Commit: 9b65759f36ed5894cf0e193508930a5f62b9165a
Parents: 7a79fd1
Author: Sangeetha Hariharan 
Authored: Tue Sep 9 16:23:04 2014 -0700
Committer: Sangeetha Hariharan 
Committed: Tue Sep 9 17:46:34 2014 -0700

--
 .../test_acl_isolatednetwork_delete.py  | 546 +++
 1 file changed, 546 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b65759f/test/integration/component/test_acl_isolatednetwork_delete.py
--
diff --git a/test/integration/component/test_acl_isolatednetwork_delete.py 
b/test/integration/component/test_acl_isolatednetwork_delete.py
new file mode 100644
index 000..3d09390
--- /dev/null
+++ b/test/integration/component/test_acl_isolatednetwork_delete.py
@@ -0,0 +1,546 @@
+# 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.
+""" 
+
+Test cases relating to acess checks for deleteNetwork() for Admin, domain 
admin and regular users
+
+"""
+#Import Local Modules
+import marvin
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+from marvin.cloudstackException import CloudstackAclException
+from nose.plugins.attrib import attr
+#Import System modules
+import time
+
+_multiprocess_shared_ = True
+
+class TestIsolatedNetworkDelete(cloudstackTestCase):
+
+@classmethod
+def setUpClass(cls):
+
+"""
+Create the following domain tree and accounts that are reqiured for 
executing listNetwork() test cases:
+Under ROOT - create 2 domaind D1 and D2
+Under D1 - Create 2 subdomain D11 and D12
+Under D11 - Create subdimain D111
+
+Under each of the domain create 1 admin user and couple of regular 
users.
+
+As each of these users , deploy Virtual machines which results in an 
isolated network being created.
+
+"""
+
+cls.testclient = super(TestIsolatedNetworkDelete, 
cls).getClsTestClient()
+cls.apiclient = cls.testclient.getApiClient()
+cls.testdata = cls.testClient.getParsedTestDataConfig()
+cls.acldata = cls.testdata["acl"]
+
+cls.domain_1 = None
+cls.domain_2 = None
+cls.cleanup = []
+
+   try:
+   
+# backup default apikey and secretkey
+cls.default_apikey = cls.apiclient.connection.apiKey
+cls.default_secretkey = cls.apiclient.connection.securityKey
+   
+# Create domains 
+cls.domain_1 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain1"]
+   )
+cls.domain_11 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain11"],
+  parentdomainid=cls.domain_1.id
+   )
+cls.domain_111 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain111"],
+  parentdomainid=cls.domain_11.id,
+   )
+cls.domain_12 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain12"],
+  parentdomainid=cls.domain_1.id
+   )
+cls.domain_2 = Domain.create(
+

git commit: updated refs/heads/master to 07c9c02

2014-09-09 Thread jessicawang

Repository: cloudstack
Updated Branches:
  refs/heads/master 9b65759f3 -> 07c9c0278


CLOUDSTACK-7261: related UI change after lsitSystemVMs/listRouters API were 
fixed to return hypervisor property while state is running.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/07c9c027
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/07c9c027
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/07c9c027

Branch: refs/heads/master
Commit: 07c9c02789ac1aeb79b7ca79140e3fff1e0bc956
Parents: 9b65759
Author: Jessica Wang 
Authored: Tue Sep 9 15:18:49 2014 -0700
Committer: Jessica Wang 
Committed: Tue Sep 9 15:18:58 2014 -0700

--
 ui/scripts/system.js | 32 ++--
 1 file changed, 14 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07c9c027/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index cf3b9dc..ed53fd2 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -20510,15 +20510,11 @@
 
 if (jsonObj.state == 'Running') {
 allowedActions.push("stop");
-
-//when systemVm is running, scaleUp is not supported for KVM and 
XenServer.
-//however, listRouters API doesn't return hypervisor property
-/*
-if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 
'XenServer') {
-allowedActions.push("scaleUp");
-}
- */
-allowedActions.push("scaleUp");
+
+//when router is Running, only XenServer, VMware support 
scaleUp(change service offering)
+if (jsonObj.hypervisor == 'XenServer' || jsonObj.hypervisor == 
"VMware") {
+allowedActions.push("scaleUp");
+} 
 
 allowedActions.push("restart");
 
@@ -20527,8 +20523,10 @@
 allowedActions.push("migrate");
 } else if (jsonObj.state == 'Stopped') {
 allowedActions.push("start");
+
+//when router is Stopped, all hypervisors support scaleUp(change 
service offering)
 allowedActions.push("scaleUp");
-//when vm is stopped, scaleUp is supported for all hypervisors
+
 allowedActions.push("remove");
 }
 return allowedActions;
@@ -20559,22 +20557,20 @@
 allowedActions.push("restart");
 allowedActions.push("remove");
 
-//when systemVm is running, scaleUp is not supported for KVM and 
XenServer.
-//however, listSystemVms API doesn't return hypervisor property
-/*
-if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 
'XenServer') {
-allowedActions.push("scaleUp");
+//when systemvm is Running, only XenServer, VMware support 
scaleUp(change service offering)
+if (jsonObj.hypervisor == 'XenServer' ||jsonObj.hypervisor == 
"VMware") {
+allowedActions.push("scaleUp");
 }
- */
-allowedActions.push("scaleUp");
 
 allowedActions.push("viewConsole");
 if (isAdmin())
 allowedActions.push("migrate");
 } else if (jsonObj.state == 'Stopped') {
 allowedActions.push("start");
+
+//when systemvm is Stopped, all hypervisors support scaleUp(change 
service offering)
 allowedActions.push("scaleUp");
-//when vm is stopped, scaleUp is supported for all hypervisors
+
 allowedActions.push("remove");
 } else if (jsonObj.state == 'Error') {
 allowedActions.push("remove");

git commit: updated refs/heads/pytest to 2b45f67

2014-09-09 Thread edison

Repository: cloudstack
Updated Branches:
  refs/heads/pytest [created] 2b45f67bc


switch nose to py.test


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b45f67b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b45f67b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b45f67b

Branch: refs/heads/pytest
Commit: 2b45f67bc92be9bdc6784da22255b2f843e6fa95
Parents: 07c9c02
Author: edison 
Authored: Tue Sep 9 16:39:08 2014 -0700
Committer: edison 
Committed: Tue Sep 9 16:41:12 2014 -0700

--
 test/integration/smoke/conftest.py  | 17 +++
 tools/apidoc/build-apidoc.sh|  2 +-
 tools/marvin/marvin/pytest_marvin_plugin.py | 60 
 3 files changed, 78 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b45f67b/test/integration/smoke/conftest.py
--
diff --git a/test/integration/smoke/conftest.py 
b/test/integration/smoke/conftest.py
new file mode 100644
index 000..5d359f5
--- /dev/null
+++ b/test/integration/smoke/conftest.py
@@ -0,0 +1,17 @@
+# 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.
+pytest_plugins = "marvin.pytest_marvin_plugin"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b45f67b/tools/apidoc/build-apidoc.sh
--
diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh
index 03eb687..3772e56 100755
--- a/tools/apidoc/build-apidoc.sh
+++ b/tools/apidoc/build-apidoc.sh
@@ -41,7 +41,7 @@ canonical_readlink ()
 thisdir=$(canonical_readlink $0)
 
 PATHSEP=':'
-if [[ $OSTYPE == "cygwin" ]] ; then
+if [[ ($OSTYPE == "cygwin")  || ($OSTYPE == "msys") ]] ; then
   PATHSEP=';'
 fi
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b45f67b/tools/marvin/marvin/pytest_marvin_plugin.py
--
diff --git a/tools/marvin/marvin/pytest_marvin_plugin.py 
b/tools/marvin/marvin/pytest_marvin_plugin.py
new file mode 100644
index 000..5b66cc2
--- /dev/null
+++ b/tools/marvin/marvin/pytest_marvin_plugin.py
@@ -0,0 +1,60 @@
+# 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.
+import pytest
+import os
+from marvin.marvinPlugin import MarvinInit
+from marvin.codes import FAILED
+
+global_marvin_obj = None
+def pytest_configure():
+configFile = os.environ.get("MARVIN_CONFIG", 
os.path.join(os.path.dirname(os.path.realpath(__file__)),"..", "..", "..", 
"setup", "dev", "advanced.cfg"))
+deployDcb = False
+deployDc = os.environ.get("MARVIN_DEPLOY_DC", "false")
+if deployDc in ["True", "true"]:
+deployDcb = True
+zoneName = os.environ.get("MARVIN_ZONE_NAME", "Sandbox-simulator")
+hypervisor_type = os.environ.get("MARVIN_HYPERVISOR_TYPE", "simulator")
+logFolder = os.environ.get("MARVIN_LOG_FOLDER", 
os.path.expanduser(os.path.join("~","marvin")))
+
+global global_marvin_obj
+global_marvin_obj = MarvinInit(configFile,
+   deployDcb,
+   None,
+   zoneName,
+   hypervisor_type,
+   logFolder)
+
+result = global_marvin_obj.init()
+if result == FAILED:
+pytest.fail

git commit: updated refs/heads/master to 63ea596

2014-09-09 Thread anthonyxu

Repository: cloudstack
Updated Branches:
  refs/heads/master 07c9c0278 -> 63ea596ba


removed unused class
engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/63ea596b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/63ea596b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/63ea596b

Branch: refs/heads/master
Commit: 63ea596ba2590ce4d40042bdd89661a7d7ac8a39
Parents: 07c9c02
Author: Anthony Xu 
Authored: Tue Sep 9 18:30:26 2014 -0700
Committer: Anthony Xu 
Committed: Tue Sep 9 18:31:13 2014 -0700

--
 .../upgrade/PremiumDatabaseUpgradeChecker.java  | 127 ---
 .../resources/components-example.xml|   1 -
 .../cloud/upgrade/databaseCreatorContext.xml|   1 -
 3 files changed, 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63ea596b/engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
--
diff --git 
a/engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java 
b/engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
deleted file mode 100755
index 4a5566b..000
--- a/engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
+++ /dev/null
@@ -1,127 +0,0 @@
-// 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.
-package com.cloud.upgrade;
-
-import javax.ejb.Local;
-
-import com.cloud.upgrade.dao.DbUpgrade;
-import com.cloud.upgrade.dao.Upgrade217to218;
-import com.cloud.upgrade.dao.Upgrade218to224DomainVlans;
-import com.cloud.upgrade.dao.Upgrade218to22Premium;
-import com.cloud.upgrade.dao.Upgrade2210to2211;
-import com.cloud.upgrade.dao.Upgrade2211to2212Premium;
-import com.cloud.upgrade.dao.Upgrade2212to2213;
-import com.cloud.upgrade.dao.Upgrade2213to2214;
-import com.cloud.upgrade.dao.Upgrade2214to30;
-import com.cloud.upgrade.dao.Upgrade221to222Premium;
-import com.cloud.upgrade.dao.Upgrade222to224Premium;
-import com.cloud.upgrade.dao.Upgrade224to225;
-import com.cloud.upgrade.dao.Upgrade225to226;
-import com.cloud.upgrade.dao.Upgrade227to228Premium;
-import com.cloud.upgrade.dao.Upgrade228to229;
-import com.cloud.upgrade.dao.Upgrade229to2210;
-import com.cloud.upgrade.dao.Upgrade301to302;
-import com.cloud.upgrade.dao.Upgrade302to40;
-import com.cloud.upgrade.dao.Upgrade30to301;
-import com.cloud.upgrade.dao.Upgrade40to41;
-import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
-import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
-import com.cloud.utils.component.SystemIntegrityChecker;
-
-@Local(value = {SystemIntegrityChecker.class})
-public class PremiumDatabaseUpgradeChecker extends DatabaseUpgradeChecker {
-public PremiumDatabaseUpgradeChecker() {
-_upgradeMap.put("2.1.7", new DbUpgrade[] {new Upgrade217to218(), new 
Upgrade218to22Premium(), new Upgrade221to222Premium(), new 
UpgradeSnapshot217to224(),
-new Upgrade222to224Premium(), new Upgrade224to225(), new 
Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new 
Upgrade229to2210(),
-new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new 
Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new 
Upgrade30to301(),
-new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()});
-
-_upgradeMap.put("2.1.8", new DbUpgrade[] {new Upgrade218to22Premium(), 
new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new 
Upgrade222to224Premium(),
-new Upgrade218to224DomainVlans(), new Upgrade224to225(), new 
Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new 
Upgrade229to2210(),
-new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new 
Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new 
Upgrade30to301(),
-new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()});
-
-_upgradeMap.put("2.1.9", new DbUpgrade[] {new

git commit: CLOUDSTACK-6634: added more details for ldap ssl

2014-09-09 Thread rajani

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/4.3 335667712 -> fe5b65de1


CLOUDSTACK-6634: added more details for ldap ssl

This closes #20


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/fe5b65de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/fe5b65de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/fe5b65de

Branch: refs/heads/4.3
Commit: fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618
Parents: 3356677
Author: Rajani Karuturi 
Authored: Wed Sep 10 11:08:56 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 11:24:26 2014 +0530

--
 source/accounts.rst | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fe5b65de/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 83d7329..be8f457 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -235,9 +235,13 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
-   to use for LDAP SSL.
- 
+| If the LDAP server requires SSL, you need to enable the below configurations.
+Before enabling SSL for LDAP, you need to get the certificate which the LDAP 
server is using and add it to a trusted keystore.
+You will need to know the path to the keystore and the password.
+
+-  ``ldap.truststore`` : truststore path
+-  ``ldap.truststore.password`` : truststore password
+
 
 LDAP groups:

[2/2] git commit: updated refs/heads/master to a400eec

2014-09-09 Thread devdeep

CLOUDSTACK-7503: Fixed few coverity issues


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a400eecf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a400eecf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a400eecf

Branch: refs/heads/master
Commit: a400eecf6c868c05bacee21689238a1e0ce2
Parents: 4c9507d
Author: Anshul Gangwar 
Authored: Thu Sep 4 14:13:26 2014 +0530
Committer: Devdeep Singh 
Committed: Wed Sep 10 11:33:01 2014 +0530

--
 .../hypervisor/hyperv/resource/HypervDirectConnectResource.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a400eecf/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
--
diff --git 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index 76f8e75..d0f526f 100644
--- 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -516,7 +516,7 @@ public class HypervDirectConnectResource extends 
ServerResourceBase implements S
 // Only Answer instances are returned by remote agents.
 // E.g. see Response.getAnswers()
 Answer[] result = s_gson.fromJson(ansStr, Answer[].class);
-String logResult = 
cleanPassword(StringEscapeUtils.unescapeJava(result.toString()));
+String logResult = cleanPassword(s_gson.toJson(result));
 s_logger.debug("executeRequest received response " + logResult);
 if (result.length > 0) {
 return result[0];
@@ -547,7 +547,7 @@ public class HypervDirectConnectResource extends 
ServerResourceBase implements S
 }
 
 Answer[] result = s_gson.fromJson(ansStr, Answer[].class);
-String logResult = 
cleanPassword(StringEscapeUtils.unescapeJava(result.toString()));
+String logResult = cleanPassword(s_gson.toJson(result));
 s_logger.debug("executeRequest received response " + logResult);
 if (result.length > 0) {
 return result[0];

[1/2] git commit: updated refs/heads/master to a400eec

2014-09-09 Thread devdeep

Repository: cloudstack
Updated Branches:
  refs/heads/master 63ea596ba -> a400eecf6


CLOUDSTACK-6898: [Hyper-V] fixed rdp console freezing during reboot.

Console was freezing because we read data from socket in blocking mode.
During reboot it was blocking infintely.
To fix issue, now we are reading data in non-blocking mode.
In non-blocking mode I set the timeout to 5 seconds.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c9507d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c9507d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c9507d2

Branch: refs/heads/master
Commit: 4c9507d21e82e9c55ac64e75165329565ec6a14f
Parents: 63ea596
Author: Anshul Gangwar 
Authored: Wed Sep 3 14:28:28 2014 +0530
Committer: Devdeep Singh 
Committed: Wed Sep 10 11:32:51 2014 +0530

--
 .../rdpconsole/src/main/java/streamer/SyncLink.java | 2 +-
 .../src/main/java/streamer/apr/AprSocketSource.java | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c9507d2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java
--
diff --git 
a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java 
b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java
index 94281d2..493964a 100755
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java
@@ -371,7 +371,7 @@ public class SyncLink implements Link {
 // Pull source in loop
 while (!shutdown) {
 // Pull data from source element and send it to sink element
-ByteBuffer data = pull(true);
+ByteBuffer data = pull(false);
 if (data != null)
 sink.handleData(data, this);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c9507d2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
--
diff --git 
a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
 
b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
index 0298349..5d3d65b 100755
--- 
a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
+++ 
b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
@@ -101,20 +101,23 @@ public class AprSocketSource extends BaseElement {
 if (verbose)
 System.out.println("[" + this + "] INFO: Reading data from 
stream.");
 
+// to unblock during reboot
+long startTime = System.currentTimeMillis();
 // FIXME: If pull is destroyed or socket is closed, segfault will 
happen here
 int actualLength = (block) ? // Blocking read
 Socket.recv(socket, buf.data, buf.offset, buf.data.length 
- buf.offset)
 : // Non-blocking read
-Socket.recvt(socket, buf.data, buf.offset, 
buf.data.length - buf.offset, 1);
+Socket.recvt(socket, buf.data, buf.offset, 
buf.data.length - buf.offset, 500);
 
 if (socketWrapper.shutdown) {
 socketWrapper.destroyPull();
 return;
 }
 
-if (actualLength < 0) {
+long elapsedTime = System.currentTimeMillis() - startTime;
+if (actualLength < 0 || elapsedTime > 5000) {
 if (verbose)
-System.out.println("[" + this + "] INFO: End of 
stream.");
+System.out.println("[" + this + "] INFO: End of 
stream or timeout");
 
 buf.unref();
 closeStream();

git commit: ignoring .po and .mo files during merge

2014-09-09 Thread rajani

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/4.3 fe5b65de1 -> 5d59a37d0


ignoring .po and .mo files during merge


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/5d59a37d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/5d59a37d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/5d59a37d

Branch: refs/heads/4.3
Commit: 5d59a37d0d2ca0f6ee6d5193fcdf4bb8a42e5e43
Parents: fe5b65d
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:02:31 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:02:31 2014 +0530

--
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5d59a37d/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..a4cfe93
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.po merge=ours
+*.mo merge=ours

[35/40] git commit: remove whitespaces

2014-09-09 Thread rajani

remove whitespaces


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/6c77f697
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/6c77f697
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/6c77f697

Branch: refs/heads/4.4
Commit: 6c77f6970635aa39796ec17904f16137ec156271
Parents: 0c75dcc
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:19:38 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:21:04 2014 -0400

--
 source/events.rst | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/6c77f697/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index 273435e..f25f9e0 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -144,11 +144,11 @@ changes can control the behaviour.
   
   If you want to use encrypted values for the username and password, you 
have to include a bean to pass those
   as variables from a credentials file.
-  
+
   A sample is given below
-  
+
   .. code:: bash
-  
+
  http://www.springframework.org/schema/beans";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 xmlns:context="http://www.springframework.org/schema/context";
@@ -188,12 +188,12 @@ changes can control the behaviour.
   Create a new file in the same folder called ``cred.properties`` and the 
specify the values for username and password as jascrypt encrypted strings
 
   Sample, with ``guest`` as values for both fields:
- 
+
   .. code:: bash
- 
+
  username=nh2XrM7jWHMG4VQK18iiBQ==
  password=nh2XrM7jWHMG4VQK18iiBQ==
- 
+
 
 #. Restart the Management Server.

[23/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/networking.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/networking.po 
b/source/locale/zh_CN/LC_MESSAGES/networking.po
new file mode 100644
index 000..81430a8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/networking.po
@@ -0,0 +1,901 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# aguncn , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-23 12:39+\n"
+"Last-Translator: aguncn \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 378fc355da2a4f7d8546a95fd9b3f5dc
+#: ../../networking.rst:18
+msgid "Setting Up Networking for Users"
+msgstr "ç¨æ·ç½ç»è®¾ç½®"
+
+# 17e4cb5cdf264aa19e3578731bf842c4
+#: ../../networking.rst:21
+msgid "Overview of Setting Up Networking for Users"
+msgstr "ç¨æ·ç½ç»è®¾ç½®æ¦è§"
+
+# 96d37a14970944b58909ecaace082018
+#: ../../networking.rst:23
+msgid ""
+"People using cloud infrastructure have a variety of needs and preferences "
+"when it comes to the networking services provided by the cloud. As a "
+"CloudStack administrator, you can do the following things to set up "
+"networking for your users:"
+msgstr "å½æ¶åå°äºè®¡ç®ææä¾çç½ç»æå¡, 
ä½¿ç¨äºåºç¡è®¾æ½çäººé½æåèªä¸åçéæ±ååå¥½. 
ä½ä¸ºCloudStackç®¡çå, ä½ å¯ä»¥ä¸ºä½ çç¨æ·åä¸é¢çäºæ
æ¥è®¾ç½®ç½ç»:"
+
+# 3db74da31e2046a8908c67bf3c665472
+#: ../../networking.rst:30
+msgid "Set up physical networks in zones"
+msgstr "å¨èµæºåéè®¾ç½®ç©çç½ç»"
+
+# 94e40111c3614cebb720933c53c016bb
+#: ../../networking.rst:34
+msgid ""
+"Set up several different providers for the same service on a single physical"
+" network (for example, both Cisco and Juniper firewalls)"
+msgstr "å¨åä¸ªç©çç½å¡ä¸ä¸ºåä¸æå¡è®¾ç½®ä¸åçæå¡æä¾è
(ä¾å¦, åæ¶è®¾ç½®CiscoåJuniperçé²ç«å¢)"
+
+# f7ee99dc067d4b129ec339cb1799e0cd
+#: ../../networking.rst:39
+msgid ""
+"Bundle different types of network services into network offerings, so users "
+"can choose the desired network services for any given virtual machine"
+msgstr "ç»å®ä¸åç±»åçç½ç»æå¡å°ç½ç»æ¹æ¡ä¸, è¿æ 
·ç¨æ·å¯ä»¥å¨ç»å®çèæºä¸ä½¿ç¨ææçç½ç»æå¡."
+
+# c5a8692df93942eca2c97aa1872928c6
+#: ../../networking.rst:45
+msgid ""
+"Add new network offerings as time goes on so end users can upgrade to a "
+"better class of service on their network"
+msgstr "éçæ¶é´çæ¨ç§», æ·»å 
æ°çç½ç»æ¹æ¡ä»¥ä¾¿æ¯æç»ç¨æ·åçº§ä»ä»¬çç½ç»æå¡."
+
+# f11d70f72e114c728425a80bf2c162c5
+#: ../../networking.rst:50
+msgid ""
+"Provide more ways for a network to be accessed by a user, such as through a "
+"project of which the user is a member"
+msgstr "æä¾æ´å¤çéå¾è®©ä¸ä¸ªç¨æ·è®¿é®ä¸ä¸ªç½ç», 
æ¯å¦éè¿ç¨æ·æå¨çä¸ä¸ªé¡¹ç®"
+
+# aa05ae98bb2a4229a3c0478a99a39fe6
+#: ../../networking.rst:54
+msgid "About Virtual Networks"
+msgstr "å³äºèæç½ç»"
+
+# a08bd43e29f54560ba910cb343eb5f53
+#: ../../networking.rst:56
+msgid ""
+"A virtual network is a logical construct that enables multi-tenancy on a "
+"single physical network. In CloudStack a virtual network can be shared or "
+"isolated."
+msgstr 
"èæç½ç»æ¯ä½¿å¤ç§æ·å¨ä¸ä¸ªç©çç½ç»ä¸çé»è¾ç»æãå¨CloudStackä¸ï¼èæç½ç»å¯ä»¥è¢«å
±äº«æéç¦»ã"
+
+# d1784c41349f444cbaaffea5119ee4bf
+#: ../../networking.rst:61
+msgid "Isolated Networks"
+msgstr "éç¦»çç½ç»"
+
+# db4418e95acd4fa69374025ca81020cb
+#: ../../networking.rst:63
+msgid ""
+"An isolated network can be accessed only by virtual machines of a single "
+"account. Isolated networks have the following properties."
+msgstr 
"ä¸ä¸ªéç¦»çç½ç»å¯ä»¥è®¿é®èææºçåä¸è´¦æ·ãéç¦»çç½ç»å
·æä¸åæ§è´¨ã"
+
+# 554e4288f8524114a4bcf6da37435d19
+#: ../../networking.rst:68
+msgid "Resources such as VLAN are allocated and garbage collected dynamically"
+msgstr "å¦VLANçèµæºè¢«å¨æåéååå¾æ¶é"
+
+# 55a8c8a3a194402a9e55453f2ec86253
+#: ../../networking.rst:73
+msgid "There is one network offering for the entire network"
+msgstr "æä¸ä¸ªç¨äºæ´ä¸ªç½ç»çç½ç»æ¹æ¡"
+
+# 6da623bb1302444ebd2054fdbf1743b7
+#: ../../networking.rst:77
+msgid ""
+"The network offering can be upgraded or downgraded but it is for the entire "
+"network"
+msgstr "ç½ç»æä¾å¯åçº§æéçº§ï¼ä½å

[16/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po 
b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
new file mode 100644
index 000..1433054
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
@@ -0,0 +1,499 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# aguncn , 2014
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-26 14:32+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# e8bd92e93dac45f788464ab1963b20e7
+#: ../../troubleshooting.rst:17
+msgid "TroubleShooting"
+msgstr "æéææ¥"
+
+# 55d6cf3cc73d4ef5a617636942890a97
+#: ../../troubleshooting.rst:20
+msgid "Working with Server Logs"
+msgstr "ä½¿ç¨æå¡å¨æ¥å¿"
+
+# 493b26a59c724cb0b4753cf2de7729c6
+#: ../../troubleshooting.rst:22
+msgid ""
+"The CloudStack Management Server logs all web site, middle tier, and "
+"database activities for diagnostics purposes in "
+"`/var/log/cloudstack/management/`. The CloudStack logs a variety of error "
+"messages. We recommend this command to find the problematic output in the "
+"Management Server log:."
+msgstr "ä¸ºäºæ¹ä¾¿è¯æç³»ç»ï¼CloudStack 
ç®¡çæå¡å¨å¨ç®å½/var/log/cloud/management/ä¸è®°å½äºææç½ç«ãä¸é´å±åæ°æ®åºçæ´»å¨ãCloudStack
 
ä¼è®°å½åç§åºéä¿¡æ¯ãæä»¬æ¨èä½¿ç¨ä¸è¿°å½ä»¤ä»ç®¡çæå¡å¨æ¥å¿ä¸å¯»æ¾æé®é¢çè¾åºæ¥å¿ï¼"
+
+# e9110df374044f87990151358476d4c4
+#: ../../troubleshooting.rst:29
+msgid ""
+"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."
+msgstr "å½ä½ 
å¨æ·è´åç²è´´è¿ä¸ªå½ä»¤æ¶ï¼è¯·ç¡®ä¿ææçå½ä»¤é½å¨åä¸è¡éãæçææ¡£æ·è´å·¥å
·ä¼å°è¿ä¸ªå½ä»¤åå²ä¸ºå¤è¡ã"
+
+# 0650dd8f9e3042b6a0023c284e9700af
+#: ../../troubleshooting.rst:37
+msgid ""
+"The CloudStack processes requests with a Job ID. If you find an error in the"
+" logs and you are interested in debugging the issue you can grep for this "
+"job ID in the management server log. For example, suppose that you find the "
+"following ERROR message:"
+msgstr 
"CloudStackå¤çè¯·æ±æ¶ä¼çæä¸ä¸ªä»»å¡IDãå¦ææ¨åç°äºæ¥å¿ä¸çæä¸ªéè¯¯ï¼ç¶åæ³è°è¯è¯¥é®é¢ï¼æ¨å¯ä»¥å¨ç®¡çæå¡å¨æ¥å¿ä¸grepè¿ä¸ªä»»å¡IDãä¾å¦ï¼åè®¾æ¨åç°äºä»¥ä¸çERRORä¿¡æ¯ï¼"
+
+# 8311990224b84dd0b3faf4084d527b4f
+#: ../../troubleshooting.rst:46
+msgid ""
+"Note that the job ID is 1076. You can track back the events relating to job "
+"1076 with the following grep:"
+msgstr "æ³¨æå°ä»»å¡IDæ¯1076ãä½ 
å¯ä»¥è¿½è¸ªè¿åäºä»¶çç¸è¿ä»»å¡1076æç§ä»¥ä¸grep:"
+
+# e3ffc3e9a91f4bbd92acf9a582aa4f09
+#: ../../troubleshooting.rst:53
+msgid ""
+"The CloudStack Agent Server logs its activities in "
+"`/var/log/cloudstack/agent/`."
+msgstr "CloudStackä»£çæå¡å¨å¨ 
`/var/log/cloudstack/agent/`è®°å½äºå®çæ´»å¨ã"
+
+# 2e3bac54e6a44e7a916a10b1a72ae7b8
+#: ../../troubleshooting.rst:57
+msgid "Data Loss on Exported Primary Storage"
+msgstr "å¨å¯¼åºä¸»åå¨æ¶çæ°æ®ä¸¢å¤±"
+
+# 17772f3eaf854986935381edba6a08f4
+# a36bc3bf835b43ceb89eb0502f49427f
+# 5b32c5e122f34a7390b04dc584d7d8b1
+# 8c990e9835c843e0ba8e6389024c9da7
+# c07d93b58e73413caee9927f2f377a4c
+# 0210bf5ba6124daab904e885ec47d2c3
+#: ../../troubleshooting.rst:60 ../../troubleshooting.rst:94
+#: ../../troubleshooting.rst:138 ../../troubleshooting.rst:158
+#: ../../troubleshooting.rst:178 ../../troubleshooting.rst:215
+msgid "Symptom"
+msgstr "çç¶"
+
+# b8c4b40af3fd4552bdc54740a5a0fd39
+#: ../../troubleshooting.rst:62
+msgid ""
+"Loss of existing data on primary storage which has been exposed as a Linux "
+"NFS server export on an iSCSI volume."
+msgstr 
"ä¸»åå¨çå·²ææ°æ®ä¸¢å¤±ãè¯¥ä¸»åå¨æ¯ç¨iSCSIå·å¯¼åºçä¸ä¸ªLinux
 NFSæå¡å¨è¾åºã"
+
+# c0c2bc4870e74609a67d1aed2af2b411
+# 989912d8a32b45e8a4bd2c54b5a97647
+# 1b80c032e2184fad85a5b5d2321b104a
+# b3c2f63d649b4d4dbb78fe05f3e2f087
+# aa3a404aa32c48bbb850fca268ee4ac9
+# 57820682c7c44dc0b9429c160629a1eb
+#: ../../troubleshooting.rst:66 ../../troubleshooting.rst:100
+#: ../../troubleshooting.rst:143 ../../troubleshooting.rst:163
+#: ../../troubleshooting.

[36/40] git commit: fix ldap section typo

2014-09-09 Thread rajani

fix ldap section typo


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/d92feaf0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/d92feaf0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/d92feaf0

Branch: refs/heads/4.4
Commit: d92feaf0fdd5467734b3db654b0fa712045030b7
Parents: 6c77f69
Author: Pierre-Luc Dion 
Authored: Wed Aug 20 07:43:05 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Wed Aug 20 07:44:51 2014 -0400

--
 source/accounts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/d92feaf0/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index b555742..06a1660 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -219,7 +219,7 @@ default values are for openldap)
Default value for AD and openldap is **givenname**.
 
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
-  Default value is **SAMAccountName** for AD and **uid** for openldap.
+   Default value is **SAMAccountName** for AD and **uid** for openldap.
 
 
 Restricting LDAP users to a group:

[03/40] git commit: Fixing typo in creating affinity group

2014-09-09 Thread rajani

Fixing typo in creating affinity group


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/5a4a44d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/5a4a44d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/5a4a44d2

Branch: refs/heads/4.4
Commit: 5a4a44d23edd5b55768c0e4836a2dca0b8461b99
Parents: a49d204
Author: Sebastien Goasguen 
Authored: Fri May 16 22:18:59 2014 +0200
Committer: Sebastien Goasguen 
Committed: Fri May 16 22:18:59 2014 +0200

--
 source/virtual_machines.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5a4a44d2/source/virtual_machines.rst
--
diff --git a/source/virtual_machines.rst b/source/virtual_machines.rst
index 568735a..2c9e8a3 100644
--- a/source/virtual_machines.rst
+++ b/source/virtual_machines.rst
@@ -400,7 +400,7 @@ To add an affinity group:
 
   Type. The only supported type shipped with CloudStack is Host
   Anti-Affinity. This indicates that the VMs in this group should
-  avoid being placed on the same VM with each other. If you see
+  avoid being placed on the same host with each other. If you see
   other types in this list, it means that your installation of
   CloudStack has been extended with customized affinity group
   plugins.

[38/40] git commit: CLOUDSTACK-6634: added more details for ldap ssl

2014-09-09 Thread rajani

CLOUDSTACK-6634: added more details for ldap ssl

This closes #20


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/fe5b65de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/fe5b65de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/fe5b65de

Branch: refs/heads/4.4
Commit: fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618
Parents: 3356677
Author: Rajani Karuturi 
Authored: Wed Sep 10 11:08:56 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 11:24:26 2014 +0530

--
 source/accounts.rst | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fe5b65de/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 83d7329..be8f457 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -235,9 +235,13 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
-   to use for LDAP SSL.
- 
+| If the LDAP server requires SSL, you need to enable the below configurations.
+Before enabling SSL for LDAP, you need to get the certificate which the LDAP 
server is using and add it to a trusted keystore.
+You will need to know the path to the keystore and the password.
+
+-  ``ldap.truststore`` : truststore path
+-  ``ldap.truststore.password`` : truststore password
+
 
 LDAP groups:

[27/40] git commit: Adding mo files as the build seems to break otherwise

2014-09-09 Thread rajani

Adding mo files as the build seems to break otherwise


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/e54cd248
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/e54cd248
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/e54cd248

Branch: refs/heads/4.4
Commit: e54cd2489c1be37d43ef825fc1752e480eb4364f
Parents: 19e54c2
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:23:26 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:23:26 2014 +0200

--
 source/locale/zh_CN/LC_MESSAGES/accounts.mo   | Bin 0 -> 21351 bytes
 source/locale/zh_CN/LC_MESSAGES/administration.mo | Bin 0 -> 4620 bytes
 source/locale/zh_CN/LC_MESSAGES/api.mo| Bin 0 -> 5134 bytes
 source/locale/zh_CN/LC_MESSAGES/events.mo | Bin 0 -> 14137 bytes
 source/locale/zh_CN/LC_MESSAGES/hosts.mo  | Bin 0 -> 37120 bytes
 source/locale/zh_CN/LC_MESSAGES/index.mo  | Bin 0 -> 1581 bytes
 source/locale/zh_CN/LC_MESSAGES/management.mo | Bin 0 -> 21220 bytes
 source/locale/zh_CN/LC_MESSAGES/networking.mo | Bin 0 -> 28699 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.mo| Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/projects.mo   | Bin 0 -> 26456 bytes
 source/locale/zh_CN/LC_MESSAGES/reliability.mo| Bin 0 -> 17965 bytes
 .../locale/zh_CN/LC_MESSAGES/service_offerings.mo | Bin 0 -> 40909 bytes
 source/locale/zh_CN/LC_MESSAGES/storage.mo| Bin 0 -> 54484 bytes
 source/locale/zh_CN/LC_MESSAGES/systemvm.mo   | Bin 0 -> 31949 bytes
 source/locale/zh_CN/LC_MESSAGES/templates.mo  | Bin 0 -> 53480 bytes
 .../locale/zh_CN/LC_MESSAGES/troubleshooting.mo   | Bin 0 -> 17278 bytes
 source/locale/zh_CN/LC_MESSAGES/tuning.mo | Bin 0 -> 6792 bytes
 source/locale/zh_CN/LC_MESSAGES/ui.mo | Bin 0 -> 17237 bytes
 source/locale/zh_CN/LC_MESSAGES/usage.mo  | Bin 0 -> 42805 bytes
 .../locale/zh_CN/LC_MESSAGES/virtual_machines.mo  | Bin 0 -> 65215 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/accounts.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/accounts.mo 
b/source/locale/zh_CN/LC_MESSAGES/accounts.mo
new file mode 100644
index 000..8cb6d09
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/accounts.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/administration.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/administration.mo 
b/source/locale/zh_CN/LC_MESSAGES/administration.mo
new file mode 100644
index 000..aaf0abf
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/administration.mo 
differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/api.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/api.mo 
b/source/locale/zh_CN/LC_MESSAGES/api.mo
new file mode 100644
index 000..cbe1413
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/api.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/events.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/events.mo 
b/source/locale/zh_CN/LC_MESSAGES/events.mo
new file mode 100644
index 000..a461140
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/events.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/hosts.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/hosts.mo 
b/source/locale/zh_CN/LC_MESSAGES/hosts.mo
new file mode 100644
index 000..913f8c4
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/hosts.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/index.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/index.mo 
b/source/locale/zh_CN/LC_MESSAGES/index.mo
new file mode 100644
index 000..6c034c7
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/index.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/management.mo
--
diff --git a/source/locale/zh_CN/LC_

[20/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/service_offerings.po 
b/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
new file mode 100644
index 000..c64d6a6
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
@@ -0,0 +1,1080 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# typuc , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 02:21+\n"
+"Last-Translator: typuc \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 620304e9ac5340aea4af6b894b131b3a
+#: ../../service_offerings.rst:18
+msgid "Service Offerings"
+msgstr "æå¡æ¹æ¡"
+
+# 748817ca8ea841e7bb071e3fd4e9b1b8
+#: ../../service_offerings.rst:20
+msgid ""
+"In addition to the physical and logical infrastructure of your cloud and the"
+" CloudStack software and servers, you also need a layer of user services so "
+"that people can actually make use of the cloud. This means not just a user "
+"UI, but a set of options and resources that users can choose from, such as "
+"templates for creating virtual machines, disk storage, and more. If you are "
+"running a commercial service, you will be keeping track of what services and"
+" resources users are consuming and charging them for that usage. Even if you"
+" do not charge anything for people to use your cloud â say, if the users 
are"
+" strictly internal to your organization, or just friends who are sharing "
+"your cloud â you can still keep track of what services they use and how 
much"
+" of them."
+msgstr "é¤äºäºä¸çç©çåé»è¾åºç¡è®¾æ½ä»¥å CloudStack 
è½¯ä»¶åæå¡å¨ï¼ä½ 
è¿éè¦ä¸ä¸ªç¨æ·æå¡å±ä»¥ä¾¿è®©äººä»¬è½å¤çæ£å©ç¨äºãè¿ä¸ä»
ä»
æå³è¿ä¸ä¸ªç¨æ·çé¢ï¼èæ¯ä¸ç»ç¨æ·å¯éæ©çéé¡¹åèµæºï¼å¦éè¿æ¨¡çåå»ºèææºï¼ç£çåå¨ççãå¦ææ¨æ£å¨è¿è¡ä¸ä¸ªåä¸æå¡ï¼æ¨å°å¯ä»¥è·è¸ªæå¡åç¨æ·èµæºçä½¿ç¨ä»¥åä½¿ç¨è®¡è´¹æ
åµãå³ä½¿ä½ ä¸å¯¹ä½¿ç¨äºçäººæ¶è´¹ï¼-æ¯å¦è¯´ï¼ç¨æ·æ¯ä½ çå
é¨ç»ç»ï¼æåªæ¯ä½ çæåå±äº«ä½ çäº - ä½ 
ä»ç¶å¯ä»¥è·è¸ªä»ä»¬æä½¿ç¨çæå¡ä»¥åæå¤å°äººã"
+
+# 89ec6965888c4194969da68934867e8f
+#: ../../service_offerings.rst:33
+msgid "Service Offerings, Disk Offerings, Network Offerings, and Templates"
+msgstr "æå¡æ¹æ¡ï¼ç£çæ¹æ¡ï¼ç½ç»æ¹æ¡åæ¨¡ç"
+
+# 39b9fb81cc4a452f932a9becc1c08318
+#: ../../service_offerings.rst:35
+msgid ""
+"A user creating a new instance can make a variety of choices about its "
+"characteristics and capabilities. CloudStack provides several ways to "
+"present users with choices when creating a new instance:"
+msgstr "ç¨æ·å¯ä»¥æ 
¹æ®ä¸åçåè½åç¹æ§æ¥åå»ºæ°çå®ä¾ï¼CloudStackæä¾äºå 
ç§æ¹æ³ä¾ç¨æ·éæ©ä»¥ä¾¿åå»ºä¸ä¸ªæ°çå®ä¾:"
+
+# a080b00346eb4c6191b4a6b1b6ede2bd
+#: ../../service_offerings.rst:39
+msgid ""
+"Service Offerings, defined by the CloudStack administrator, provide a choice"
+" of CPU speed, number of CPUs, RAM size, tags on the root disk, and other "
+"choices. See Creating a New Compute Offering."
+msgstr 
"æå¡æ¹æ¡ï¼ç±CloudStackç®¡çåå®ä¹ï¼æä¾äºå¤ç§éé¡¹ä¾éæ©ï¼CPUéçï¼CPUæ
 ¸æ°ï¼ååå¤§å°ï¼æ ¹ç£çæ ç¾çãå¯åé
åå»ºæ°çè®¡ç®æ¹æ¡ã"
+
+# 87390738e5c6421e8cb6428fd0efd434
+#: ../../service_offerings.rst:43
+msgid ""
+"Disk Offerings, defined by the CloudStack administrator, provide a choice of"
+" disk size and IOPS (Quality of Service) for primary data storage. See "
+"Creating a New Disk Offering."
+msgstr 
"ç£çæ¹æ¡ï¼ç±CloudStackç®¡çåå®ä¹ï¼éå¯¹ä¸»æ°æ®åå¨æä¾ç£çå¤§å°åIOPS(QOS)çéé¡¹ä¾éæ©ãå¯åé
åå»ºæ°çç£çæ¹æ¡ã"
+
+# 3416adb53bd2464c93a0a7de7341aa8c
+#: ../../service_offerings.rst:47
+msgid ""
+"Network Offerings, defined by the CloudStack administrator, describe the "
+"feature set that is available to end users from the virtual router or "
+"external networking devices on a given guest network. See Network Offerings."
+msgstr "ç½ç»æ¹æ¡ï¼ç± CloudStack 
ç®¡çåå®ä¹ï¼çº¦å®æ¥å®¾ç½ç»ä¸èæè·¯ç±å¨æå¤é¨ç½ç»è®¾å¤æä¾ç»ç»ç«¯ç¨æ·å¯ç¨çåè½æè¿°éã"
+
+# 7be016c225ca4b45a449e6d718fbba3e
+#: ../../service_offerings.rst:52
+msgid ""
+"Templates, defined by the CloudStack admi

[02/40] git commit: Update templates.rst: This closes #10

2014-09-09 Thread rajani

Update templates.rst: This closes #10

The right command is dpkg-reconfigure and not dpkg-reconfig.

Signed-off-by: Sebastien Goasguen 


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/a49d204c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/a49d204c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/a49d204c

Branch: refs/heads/4.4
Commit: a49d204cf217b5f5d78c816b30e3de33f587a1d3
Parents: ba544d2
Author: w00binda 
Authored: Thu May 15 17:58:24 2014 +0200
Committer: Sebastien Goasguen 
Committed: Fri May 16 22:08:56 2014 +0200

--
 source/templates.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a49d204c/source/templates.rst
--
diff --git a/source/templates.rst b/source/templates.rst
index 5480279..c4d33b2 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -485,7 +485,8 @@ templating.
 echo $hostname > /etc/hostname
 hostname $hostname
 # Recreate SSH2
-dpkg-reconfig openssh-server
+export DEBIAN_FRONTEND=noninteractive
+dpkg-reconfigure openssh-server
 fi
 ### End of Script ###

[24/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/hosts.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/hosts.po 
b/source/locale/zh_CN/LC_MESSAGES/hosts.po
new file mode 100644
index 000..4d900c2
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/hosts.po
@@ -0,0 +1,1059 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-10 06:42+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 592d97db5d074967b8037886828bbbf7
+#: ../../hosts.rst:18
+msgid "Working with Hosts"
+msgstr "ä½¿ç¨ä¸»æº"
+
+# eb6157eff5a24266a1934dce1cc5c38e
+#: ../../hosts.rst:21
+msgid "Adding Hosts"
+msgstr "æ·»å ä¸»æº"
+
+# 8278623233e349e2bbe063bea7e23268
+#: ../../hosts.rst:23
+msgid ""
+"Additional hosts can be added at any time to provide more capacity for guest"
+" VMs. For requirements and instructions, see `âAdding a Hostâ "
+"`_."
+msgstr "æ·»å 
ä¸»æºè½ä¸ºæ¥å®¾VMsæä¾æ´å¤çæ§è½ãæ´å¤éæ±ä¸è¯´æè¯·åé 
`âæ·»å ä¸»æºâ 
`_ã"
+
+# d13936e89f4e4d9ea480d52a5c693cab
+#: ../../hosts.rst:28
+msgid "Scheduled Maintenance and Maintenance Mode for Hosts"
+msgstr "ä¸»æºçç»´æ¤è®¡åä¸ç»´æ¤æ¨¡å¼"
+
+# c80faa4e959d4bf6a547b8898e582f71
+#: ../../hosts.rst:30
+msgid ""
+"You can place a host into maintenance mode. When maintenance mode is "
+"activated, the host becomes unavailable to receive new guest VMs, and the "
+"guest VMs already running on the host are seamlessly migrated to another "
+"host not in maintenance mode. This migration uses live migration technology "
+"and does not interrupt the execution of the guest."
+msgstr "ä½ å¯ä»¥ä½¿ä¸å°ä¸»æºè¿å
¥ç»´æ¤æ¨¡å¼ãå½æ¿æ´»ç»´æ¤æ¨¡å¼æ¶ï¼è¿å°ä¸»æºå°ä¸ä¼æ¥çº³æ°çæ¥å®¾VMsï¼åæ¶ä¸é¢çVMsä¼æ
 ç¼å°è¿ç§»å°å
¶ä»éç»´æ¤æ¨¡å¼çä¸»æºä¸ãè¿ä¸ªè¿ç§»ä½¿ç¨å¨çº¿è¿ç§»ææ¯å¹¶ä¸ä¸ä¼ä¸æç¨æ·çæä½ã"
+
+# 050155d6fe2d4fe9bfb03ae737991f51
+#: ../../hosts.rst:37
+msgid "vCenter and Maintenance Mode"
+msgstr "vCenterä¸ç»´æ¤æ¨¡å¼"
+
+# 6e6dd514ac534a609dbba7282dd7d14e
+#: ../../hosts.rst:39
+msgid ""
+"To enter maintenance mode on a vCenter host, both vCenter and CloudStack "
+"must be used in concert. CloudStack and vCenter have separate maintenance "
+"modes that work closely together."
+msgstr "è¦ä½¿vCenterä¸»æºè¿å¥ç»´æ¤æ¨¡å¼ï¼vCenteråCloudStackä¸é½å¿
é¡»è¿è¡æ¤æä½ãCloudStackåvCenteræåèªçç»´æ¤æ¨¡å¼ï¼ä»ä»¬éè¦ç´§å¯åä½ã"
+
+# 1e1a327f506545d588b5c2dac6a6be66
+#: ../../hosts.rst:45
+msgid ""
+"Place the host into CloudStack's \"scheduled maintenance\" mode. This does "
+"not invoke the vCenter maintenance mode, but only causes VMs to be migrated "
+"off the host"
+msgstr "å¨CloudStackä¸ï¼å°ä¸»æºè¿å
¥\"ç»´æ¤è®¡å\"æ¨¡å¼ãè¿ä¸ªæä½ä¸ä¼è°ç¨vCenterçç»´æ¤æ¨¡å¼ï¼ä½æ¯ä¼å°VMsè¿ç¦»è¯¥ä¸»æºã"
+
+# 10b6ab6a7f494f5e8df3db13ccfd3af8
+#: ../../hosts.rst:49
+msgid ""
+"When the CloudStack maintenance mode is requested, the host first moves into"
+" the Prepare for Maintenance state. In this state it cannot be the target of"
+" new guest VM starts. Then all VMs will be migrated off the server. Live "
+"migration will be used to move VMs off the host. This allows the guests to "
+"be migrated to other hosts with no disruption to the guests. After this "
+"migration is completed, the host will enter the Ready for Maintenance mode."
+msgstr "å½CloudStackç»´æ¤æ¨¡å¼å¯ç¨åï¼ä¸»æºé¦åä¼è¿å
¥åå¤ç»´æ¤ç¶æãå¨è¿ä¸ªé¶æ®µå®ä¸è½è¿è¡æ°çæ¥å®¾VMsãç¶åææçVMså°ä¼è¢«è¿ç¦»è¯¥ä¸»æºãä¸»æºä½¿ç¨å¨çº¿è¿ç§»æ¥è¿ç§»VMsãè¿ç§æ¹å¼è½å¤ä½¿æ¥å®¾VMså¨è¿ç§»å°å
¶ä»ä¸»æºçè¿ç¨ä¸ä¸ä¼ä¸æç¨æ·çæä½ã"
+
+# 1628c924f80a4f4e9f5becf74ad3f0ee
+#: ../../hosts.rst:59
+msgid "Wait for the \"Ready for Maintenance\" indicator to appear in the UI."
+msgstr "ç\"åå¤å¥½ç»´æ¤\"æç¤ºç¯åºç°å¨UIä¸ã"
+
+# 4adef7c4df77454e8bd00237cd21e93c
+#: ../../hosts.rst:63
+msgid ""
+"Now use vCenter to perform whatever actions are necessary to maintain the "
+"host.

[40/40] git commit: Merge branch '4.3' into 4.4

2014-09-09 Thread rajani

Merge branch '4.3' into 4.4

Conflicts:
source/accounts.rst
source/service_offerings.rst


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/6507638e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/6507638e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/6507638e

Branch: refs/heads/4.4
Commit: 6507638eccd62faa27846031cda9948fff8899b4
Parents: 00c90ec 5d59a37
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:08:26 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:08:26 2014 +0530

--
 .gitattributes |2 +
 source/accounts.rst|   10 +-
 source/locale/zh_CN/LC_MESSAGES/networking2.mo |  Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.po | 8448 +++
 4 files changed, 8457 insertions(+), 3 deletions(-)
--

[10/40] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/templates.rst
--
diff --git a/source/templates.rst b/source/templates.rst
index c4d33b2..bc55aa2 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -12,7 +12,8 @@
KIND, either express or implied.  See the License for the
specific language governing permissions and limitations
under the License.
-   
+
+
 Working with Templates
 ==
 
@@ -30,6 +31,7 @@ CloudStack ships with a default template. In order to present 
more
 choices to users, CloudStack administrators and users can create
 templates and add them to CloudStack.
 
+
 Creating Templates: Overview
 
 
@@ -38,18 +40,12 @@ system. There are a variety of ways to add more templates.
 Administrators and end users can add templates. The typical sequence of
 events is:
 
-#. 
-
-   Launch a VM instance that has the operating system you want. Make any
+#. Launch a VM instance that has the operating system you want. Make any
other desired configuration changes to the VM.
 
-#. 
-
-   Stop the VM.
-
-#. 
+#. Stop the VM.
 
-   Convert the volume into a template.
+#. Convert the volume into a template.
 
 There are other ways to add templates to CloudStack. For example, you
 can take a snapshot of the VM's volume and create a template from the
@@ -58,19 +54,17 @@ snapshot, or import a VHD from another system into 
CloudStack.
 The various techniques for creating templates are described in the next
 few sections.
 
+
 Requirements for Templates
 --
 
--  
-
-   For XenServer, install PV drivers / Xen tools on each template that
+-  For XenServer, install PV drivers / Xen tools on each template that
you create. This will enable live migration and clean guest shutdown.
 
--  
-
-   For vSphere, install VMware Tools on each template that you create.
+-  For vSphere, install VMware Tools on each template that you create.
This will enable console view to work properly.
 
+
 Best Practices for Templates
 
 
@@ -78,6 +72,7 @@ If you plan to use large templates (100 GB or larger), be 
sure you have
 a 10-gigabit network to support the large templates. A slower network
 can lead to timeouts and other errors when large templates are used.
 
+
 The Default Template
 
 
@@ -98,30 +93,31 @@ block most access to the template excluding ssh.
 
 .. code:: bash
 
-# iptables --list
-Chain INPUT (policy ACCEPT)
-target prot opt source   destination
-RH-Firewall-1-INPUT  all  --  anywhere anywhere
-
-Chain FORWARD (policy ACCEPT)
-target prot opt source   destination
-RH-Firewall-1-INPUT  all  --  anywhere anywhere
-
-Chain OUTPUT (policy ACCEPT)
-target prot opt source   destination
-
-Chain RH-Firewall-1-INPUT (2 references)
-target prot opt source   destination
-ACCEPT all  --  anywhere anywhere
-ACCEPT icmp --  anywhereanywhere   icmp any
-ACCEPT esp  --  anywhereanywhere
-ACCEPT ah   --  anywhereanywhere
-ACCEPT udp  --  anywhere224.0.0.251udp dpt:mdns
-ACCEPT udp  --  anywhereanywhere   udp dpt:ipp
-ACCEPT tcp  --  anywhereanywhere   tcp dpt:ipp
-ACCEPT all  --  anywhereanywhere   state 
RELATED,ESTABLISHED
-ACCEPT tcp  --  anywhereanywhere   state NEW tcp dpt:ssh
-REJECT all  --  anywhereanywhere   reject-with icmp-host-
+   # iptables --list
+   Chain INPUT (policy ACCEPT)
+   target prot opt source   destination
+   RH-Firewall-1-INPUT  all  --  anywhere anywhere
+
+   Chain FORWARD (policy ACCEPT)
+   target prot opt source   destination
+   RH-Firewall-1-INPUT  all  --  anywhere anywhere
+
+   Chain OUTPUT (policy ACCEPT)
+   target prot opt source   destination
+
+   Chain RH-Firewall-1-INPUT (2 references)
+   target prot opt source   destination
+   ACCEPT all  --  anywhere anywhere
+   ACCEPT icmp --  anywhereanywhere   icmp any
+   ACCEPT esp  --  anywhereanywhere
+   ACCEPT ah   --  anywhereanywhere
+   ACCEPT udp  --  anywhere224.0.0.251udp dpt:mdns
+   ACCEPT udp  --  anywhereanywhere   udp dpt:ipp
+   ACCEPT tcp  --  anywhereanywhere   tcp dpt:ipp
+   ACCEPT all  --  anywhereanywhere   state RELATED,ESTABLISHED
+   ACCEPT tcp  --  anywhereanywhere   state NEW tcp dpt:ssh
+   REJECT all  --  anywhereanywhere   reject-with icmp-host-
+
 
 Private and Public Templates
 
@@ -141,92 +1

[25/40] git commit: Add po files for zh_CN

2014-09-09 Thread rajani

Add po files for zh_CN


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/fff40fc1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/fff40fc1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/fff40fc1

Branch: refs/heads/4.4
Commit: fff40fc1966522f4355121299607f858f90a4032
Parents: a209573
Author: Sebastien Goasguen 
Authored: Tue May 27 10:59:48 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue May 27 10:59:48 2014 +0200

--
 source/locale/zh_CN/LC_MESSAGES/accounts.po |  553 ++
 .../locale/zh_CN/LC_MESSAGES/administration.po  |   96 +
 source/locale/zh_CN/LC_MESSAGES/api.po  |  155 +
 source/locale/zh_CN/LC_MESSAGES/events.po   |  414 +
 source/locale/zh_CN/LC_MESSAGES/hosts.po| 1059 +++
 source/locale/zh_CN/LC_MESSAGES/index.po|  104 +
 source/locale/zh_CN/LC_MESSAGES/management.po   |  605 ++
 source/locale/zh_CN/LC_MESSAGES/networking.po   |  901 ++
 source/locale/zh_CN/LC_MESSAGES/networking2.po  | 8448 ++
 source/locale/zh_CN/LC_MESSAGES/projects.po |  756 ++
 source/locale/zh_CN/LC_MESSAGES/reliability.po  |  486 +
 .../zh_CN/LC_MESSAGES/service_offerings.po  | 1080 +++
 source/locale/zh_CN/LC_MESSAGES/storage.po  | 1461 +++
 source/locale/zh_CN/LC_MESSAGES/systemvm.po |  958 ++
 source/locale/zh_CN/LC_MESSAGES/templates.po| 1557 
 .../locale/zh_CN/LC_MESSAGES/troubleshooting.po |  499 ++
 source/locale/zh_CN/LC_MESSAGES/tuning.po   |  166 +
 source/locale/zh_CN/LC_MESSAGES/ui.po   |  457 +
 source/locale/zh_CN/LC_MESSAGES/usage.po| 1656 
 .../zh_CN/LC_MESSAGES/virtual_machines.po   | 1860 
 20 files changed, 23271 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/accounts.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/accounts.po 
b/source/locale/zh_CN/LC_MESSAGES/accounts.po
new file mode 100644
index 000..c7f84c9
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/accounts.po
@@ -0,0 +1,553 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# darrentang , 2014
+# morgan wang , 2014
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 07:52+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 90951daa147540dab10f9d0c78d8c73b
+#: ../../accounts.rst:18
+msgid "Managing Accounts, Users and Domains"
+msgstr "ç®¡çè´¦æ·ï¼ç¨æ·åå"
+
+# 661635f04f94452db5ca9e4dd563cef7
+#: ../../accounts.rst:21
+msgid "Accounts, Users, and Domains"
+msgstr "è´¦æ·ï¼ç¨æ·ï¼å"
+
+# a7494e04f72d469a86f3c67e958ed65f
+#: ../../accounts.rst:24
+msgid "Accounts"
+msgstr "è´¦æ·"
+
+# 457dea8dff534d9aa75e2270c1e1ac6d
+#: ../../accounts.rst:26
+msgid ""
+"An account typically represents a customer of the service provider or a "
+"department in a large organization. Multiple users can exist in an account."
+msgstr "ä¸ä¸ªè´¦æ·éå¸¸ä»£è¡¨ä¸ä¸ªå®¢æ·çæå¡æä¾è
æä¸ä¸ªå¤§ç»ç»ä¸çä¸ä¸ªé¨é¨ãä¸ä¸ªè´¦æ·å¯åå¨å¤ä¸ªç¨æ·ã"
+
+# b45cd9ee7d3e478cbb3c129943ce53d5
+#: ../../accounts.rst:31
+msgid "Domains"
+msgstr "å"
+
+# 10ebf41c7dbf4e65b1be24934d043965
+#: ../../accounts.rst:33
+msgid ""
+"Accounts are grouped by domains. Domains usually contain multiple accounts "
+"that have some logical relationship to each other and a set of delegated "
+"administrators with some authority over the domain and its subdomains. For "
+"example, a service provider with several resellers could create a domain for"
+" each reseller."
+msgstr "å¸æ·éå¸¸æåè¿è¡åç»ãåä¸ç»å¸¸å
å«å¤ä¸ªè´¦æ·ï¼è¿äºè´¦æ·é´åå¨ä¸äºé»è¾ä¸å
³ç³»åä¸ç³»åè¯¥ååå
¶ååä¸çå§æ´¾çç®¡çåï¼è¿æ®µçææå°±æ¯è¯´å¨é»è¾ä¸åä¸å¯ä»¥æç®¡çåï¼ååä¸ä¹å¯ä»¥æç®¡çåï¼ãæ¯å¦ï¼ä¸ä¸ªæå¡æä¾åå¯æå¤ä¸ªåéåè¿æ
 ·çæå¡æä¾åå°±è½ä¸ºæ¯ä¸ä¸ªåéååå»ºä¸ä¸ªå"
+
+# 403c3bff584f41c6b9ee1d4ba5bc6241
+#: ../../accounts.rst:39
+msgid ""
+"For each account created, the Cloud installation creates three different "
+"types of user accounts: root administrator,

[14/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po 
b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
new file mode 100644
index 000..64d9faa
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
@@ -0,0 +1,1860 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# darrentang , 2014
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-11 12:02+\n"
+"Last-Translator: darrentang \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 2170d7c1a0e145718f15a48fdfd6376c
+#: ../../virtual_machines.rst:18
+msgid "Working with Virtual Machines"
+msgstr "ä½¿ç¨èææº"
+
+# 7b1c6837d7294d04b64fdefe3b860527
+#: ../../virtual_machines.rst:21
+msgid "About Working with Virtual Machines"
+msgstr "å³äºèææºçä½¿ç¨"
+
+# a8fcaad6e74c48de85dda47b508896ff
+#: ../../virtual_machines.rst:23
+msgid ""
+"CloudStack provides administrators with complete control over the lifecycle "
+"of all guest VMs executing in the cloud. CloudStack provides several guest "
+"management operations for end users and administrators. VMs may be stopped, "
+"started, rebooted, and destroyed."
+msgstr 
"CloudStackå¨äºä¸ä¸ºç®¡çåæä¾äºå®æ´çç®¡çæææ¥å®¾VMsæ´ä¸ªçå½å¨æçåè½ãCloudStackä¸ºç»ç«¯ç¨æ·åç®¡çåæä¾äºè®¸å¤æ¥å®¾èæºç®¡çæä½ãVMsè½è¢«å
³æºãå¼æºãéå¯åéæ¯ã"
+
+# 76072107bbd74ed58ef5e488bbc45361
+#: ../../virtual_machines.rst:28
+msgid ""
+"Guest VMs have a name and group. VM names and groups are opaque to "
+"CloudStack and are available for end users to organize their VMs. Each VM "
+"can have three names for use in different contexts. Only two of these names "
+"can be controlled by the user:"
+msgstr 
"æ¥å®¾VMsæåç§°åç»ãVMçåç§°åç»å¯¹äºCloudStackæ¯ä¸éæçï¼å¯¹ç»ç«¯ç¨æ·æ´çä»ä»¬çVMså¯ç¨ãæ¯ä¸ªVMå¯ä»¥æä¸ä¸ªç¨äºä¸åç¯å¢çåç§°ãå
¶ä¸æä¸¤ä¸ªåååç¨æ·æ§å¶ï¼"
+
+# fdf35c82059748b09618dc1b96c32958
+#: ../../virtual_machines.rst:35
+msgid ""
+"Instance name â a unique, immutable ID that is generated by CloudStack and "
+"can not be modified by the user. This name conforms to the requirements in "
+"IETF RFC 1123."
+msgstr "å®ä¾åç§° â 
ä¸ä¸ªå¯ä¸çï¼ä¸å¯åçç±CloudStackçæçIDï¼æ¤IDä¸è½è¢«ç¨æ·ä¿®æ¹ãæ¤åç§°ç¬¦å
 IETF RFC 1123ä¸çè¦æ±ã"
+
+# 35bab809b50548b78006bcf7edfd8375
+#: ../../virtual_machines.rst:41
+msgid ""
+"Display name â the name displayed in the CloudStack web UI. Can be set by "
+"the user. Defaults to instance name."
+msgstr "æ¾ç¤ºåç§° â å¨CloudStack 
UIä¸æ¾ç¤ºçåç§°ãå¯ä»¥ç±ç¨æ·è®¾ç½®ãé»è®¤è·å®ä¾åç§°ä¸è´ã"
+
+# fc95d564a6b74400bdf7cbc43166b900
+#: ../../virtual_machines.rst:46
+msgid ""
+"Name â host name that the DHCP server assigns to the VM. Can be set by the "
+"user. Defaults to instance name"
+msgstr "åç§° â ç±DHCPæå¡å¨åé
ç»VMçä¸»æºåãå¯ä»¥ç±ç¨æ·è®¾ç½®ãé»è®¤è·å®ä¾åç§°ä¸è´ã"
+
+# 29b7bc970aec4088a82cb82eac51acf2
+#: ../../virtual_machines.rst:50
+msgid ""
+"You can append the display name of a guest VM to its internal name. For more"
+" information, see `âAppending a Display Name to the Guest VMâs Internal "
+"Nameâ <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+msgstr "ä½ è½ææ¥å®¾VMçæ¾ç¤ºåéå å°å®çå
é¨åç§°ä¸ãæ´å¤ä¿¡æ¯ï¼è¯·åè `âå°æ¾ç¤ºåéå å°VMçå
é¨åç§°â <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+
+# 7776a17a323a4f91a6a4286428927bdf
+#: ../../virtual_machines.rst:52
+msgid ""
+"Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is"
+" monitored by the system. If the system detects that the VM is down, it will"
+" attempt to restart the VM, possibly on a different host. For more "
+"information, see HA-Enabled Virtual Machines on"
+msgstr "æ¥å®¾VMså¯ä»¥é
ç½®æé«å¯ç¨ï¼HAï¼ãå¯ç¨äºHAçVMç±ç³»ç»çæ§ãå¦æç³»ç»æ£æµå°æ¤VMå®æºï¼å®å¯è½å°å°è¯å¨ä¸åçä¸»æºä¸éå¯VMãæ´å¤ä¿¡æ¯ï¼è¯·åèå¨èææºä¸å¯ç¨HA"
+
+# 89d81c5e76a047d0b049cbfcc9437d7d
+#: ../../virtual_machines.rst:57
+msgid ""
+"Each new VM is allocated one public IP address. When the VM is started, "
+"CloudStack auto

[30/40] git commit: CLOUDSTACK-6634

2014-09-09 Thread rajani

CLOUDSTACK-6634

updated the ldap section in admin guide

Signed-off-by: Pierre-Luc Dion 


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/733b8665
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/733b8665
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/733b8665

Branch: refs/heads/4.4
Commit: 733b8665968f1b4b9d4efde58579b09260c89b7e
Parents: 018c1ad
Author: Rajani Karuturi 
Authored: Tue Aug 19 16:27:43 2014 +0530
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:14:37 2014 -0400

--
 .../_static/images/CloudStack-ldap-screen1.png  | Bin 0 -> 23243 bytes
 source/accounts.rst | 172 ---
 2 files changed, 33 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/733b8665/source/_static/images/CloudStack-ldap-screen1.png
--
diff --git a/source/_static/images/CloudStack-ldap-screen1.png 
b/source/_static/images/CloudStack-ldap-screen1.png
new file mode 100644
index 000..46032a4
Binary files /dev/null and b/source/_static/images/CloudStack-ldap-screen1.png 
differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/733b8665/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index e5d4b6d..a4d95a2 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -186,160 +186,54 @@ Using an LDAP Server for User Authentication
 
 
 You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. Just map CloudStack
-accounts to the corresponding LDAP accounts using a query filter. The
-query filter is written using the query syntax of the particular LDAP
-server, and can include special wildcard characters provided by
-CloudStack for matching common values such as the userâs email address
-and name. CloudStack will search the external LDAP directory tree
-starting at a specified base directory and return the distinguished name
-(DN) and password of the matching user. This information along with the
-given password is used to authenticate the user..
+or ApacheDS to authenticate CloudStack end-users. 
+CloudStack will search the external LDAP directory tree
+starting at a specified base directory and gets user info such as first name, 
last name, email and username. 
 
-To set up LDAP authentication in CloudStack, call the CloudStack API
-command ldapConfig and provide the following:
-
--  Hostname or IP address and listening port of the LDAP server
-
--  Base directory and query filter
-
--  Search user DN credentials, which give CloudStack permission to
-   search on the LDAP server
-
--  SSL keystore and password, if SSL is used
-
-
-Example LDAP Configuration Commands
-~~~
-
-To understand the examples in this section, you need to know the basic
-concepts behind calling the CloudStack API, which are explained in the
-Developerâs Guide.
-
-The following shows an example invocation of ldapConfig with an ApacheDS
-LDAP server
-
-.. code:: bash
-
-   
http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
-
-The command must be URL-encoded. Here is the same example without the
-URL encoding:
-
-.. code:: bash
-   
-   http://127.0.0.1:8080/client/api?command=ldapConfig
-   &hostname=127.0.0.1
-   &searchbase=ou=testing,o=project
-   &queryfilter=(&(%uid=%u))
-   &binddn=cn=John+Singh,ou=testing,o=project
-   &bindpass=secret
-   &port=10389
-   &ssl=true
-   &truststore=C:/company/info/trusted.ks
-   &truststorepass=secret
-   &response=json
-   &apiKey=YourAPIKey&signature=YourSignatureHash
-
-The following shows a similar command for Active Directory. Here, the
-search base is the testing group within a company, and the users are
-matched up based on email address.
-
-.. code:: bash
+To authenticate, username and password entered by the user are used.
+Cloudstack does a search for a user with the given username. If it exists, it 
does a bind request with DN and password
 
-   
http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%28mail%3D%25e%29%29
 
&binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&bindpass=_&port=389&response=jso

[08/40] git commit: split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

split the networking2 file into multiple includes and renamed it to 
'networking_and_traffic': This closes #11


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/72a3a7c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/72a3a7c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/72a3a7c1

Branch: refs/heads/4.4
Commit: 72a3a7c109c7ef198dc1fe99d91a4dd2ff6791a7
Parents: 5a4a44d
Author: Will Stevens 
Authored: Fri May 16 17:35:52 2014 -0400
Committer: Sebastien Goasguen 
Committed: Sat May 17 09:35:01 2014 +0200

--
 source/index.rst|2 +-
 source/networking/acquiring_an_ip_address.rst   |   42 +
 source/networking/advanced_zone_config.rst  |  152 +
 source/networking/basic_zone_config.rst |   24 +
 source/networking/dns_and_dhcp.rst  |   22 +
 source/networking/elastic_ips.rst   |  104 +
 .../external_firewalls_and_load_balancers.rst   |  661 ++
 .../networking/global_server_load_balancing.rst |  453 ++
 source/networking/guest_ip_ranges.rst   |   29 +
 source/networking/guest_traffic.rst |   50 +
 source/networking/inter_vlan_routing.rst|   96 +
 .../ip_forwarding_and_firewalling.rst   |  280 +
 source/networking/ip_load_balancing.rst |   31 +
 .../ip_reservation_in_guest_networks.rst|  125 +
 .../isolation_in_advanced_zone_with_vlan.rst|  202 +
 source/networking/multiple_guest_networks.rst   |  207 +
 source/networking/multiple_ip_ranges.rst|   43 +
 .../networking/multiple_ips_on_single_nic.rst   |   98 +
 .../multiple_subnets_in_shared_network.rst  |   99 +
 source/networking/networking_in_pod.rst |   45 +
 source/networking/networking_in_zone.rst|   34 +
 source/networking/palo_alto_config.rst  |  475 ++
 source/networking/persistent_networks.rst   |   94 +
 source/networking/portable_ips.rst  |  131 +
 .../public_ips_and_vlans_for_accounts.rst   |  154 +
 source/networking/releasing_an_ip_address.rst   |   38 +
 source/networking/remote_access_vpn.rst |  696 ++
 source/networking/security_groups.rst   |  214 +
 source/networking/static_nat.rst|   56 +
 .../networking/virtual_private_cloud_config.rst | 1438 
 source/networking2.rst  | 7033 --
 source/networking_and_traffic.rst   |   82 +
 source/palo_alto_config.rst |  282 -
 source/systemvm.rst |8 +-
 34 files changed, 6180 insertions(+), 7320 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index ddfa3bb..cc25dd4 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -114,7 +114,7 @@ Managing Networks and Traffic
 .. toctree::
:maxdepth: 2
 
-   networking2
+   networking_and_traffic
 
 Managing the Cloud
 --

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/acquiring_an_ip_address.rst
--
diff --git a/source/networking/acquiring_an_ip_address.rst 
b/source/networking/acquiring_an_ip_address.rst
new file mode 100644
index 000..b6556db
--- /dev/null
+++ b/source/networking/acquiring_an_ip_address.rst
@@ -0,0 +1,42 @@
+.. 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.
+   
+
+Acquiring a New IP Address
+--
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click Acquire New IP.
+
+   The Acquire New IP window is displayed.
+
+#. Specify whether you want cross-zone IP or not.
+
+   If you want Portable IP click Yes in the

[21/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/projects.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/projects.po 
b/source/locale/zh_CN/LC_MESSAGES/projects.po
new file mode 100644
index 000..63db2ef
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/projects.po
@@ -0,0 +1,756 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# mushroom_rain , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-16 07:45+\n"
+"Last-Translator: mushroom_rain \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 67b9f51612cb496d9701fcd2c24d9cb5
+#: ../../projects.rst:18
+msgid "Using Projects to Organize Users and Resources"
+msgstr "ä½¿ç¨é¡¹ç®æ¥ç®¡çç¨æ·åèµæºã"
+
+# 1cb3a4ccdca349788ea29a615f989e93
+#: ../../projects.rst:21
+msgid "Overview of Projects"
+msgstr "é¡¹ç®æ¦è§"
+
+# f06b8f1572294f1c9e8567167df9a4c5
+#: ../../projects.rst:23
+msgid ""
+"Projects are used to organize people and resources. CloudStack users within "
+"a single domain can group themselves into project teams so they can "
+"collaborate and share virtual resources such as VMs, snapshots, templates, "
+"data disks, and IP addresses. CloudStack tracks resource usage per project "
+"as well as per user, so the usage can be billed to either a user account or "
+"a project. For example, a private cloud within a software company might have"
+" all members of the QA department assigned to one project, so the company "
+"can track the resources used in testing while the project members can more "
+"easily isolate their efforts from other users of the same cloud"
+msgstr 
"é¡¹ç®ç¨æ¥ç®¡çç¨æ·åèµæºãå¤äºåç¬åä¸çCloudStackç¨æ·å¯ä»¥èªç»ï¼ä»ä»¬å¯ä»¥éä¸å¹¶åäº«èæèµæºï¼å¦VMãå¿«ç
§ãæ¨¡æ¿ãç£çãIPå°åçãCloudStackå¯ä»¥åè·è¸ªæ¯ä¸ªç¨æ·ä¸æ 
·è·è¸ªæ¯ä¸ªé¡¹ç®çèµæºï¼æä»¥å¯ä»¥æç§ç¨æ·æè
é¡¹ç®å¯¹èµæºä½¿ç¨æ¶è´¹ãä¾å¦ï¼ä¸ä¸ªè½¯ä»¶å
¬å¸çç§æäºå¯è½å°ææQAé¨é¨çåå·¥åé
å°ä¸ä¸ªé¡¹ç®ï¼å½éè¦å¨æµè¯ä¸åºååä¸äºä¸è¯¥é¡¹ç®ç»åå·¥çè´¡ç®æ¶ï¼æµè¯ä¸çèµæºè·è¸ªå°åçå®¹æã"
+
+# 467cabcfe9c448b784ab2c2c52560838
+#: ../../projects.rst:34
+msgid ""
+"You can configure CloudStack to allow any user to create a new project, or "
+"you can restrict that ability to just CloudStack administrators. Once you "
+"have created a project, you become that projectâs administrator, and you 
can"
+" add others within your domain to the project. CloudStack can be set up "
+"either so that you can add people directly to a project, or so that you have"
+" to send an invitation which the recipient must accept. Project members can "
+"view and manage all virtual resources created by anyone in the project (for "
+"example, share VMs). A user can be a member of any number of projects and "
+"can switch views in the CloudStack UI to show only project-related "
+"information, such as project VMs, fellow project members, project-related "
+"alerts, and so on."
+msgstr "ä½ å¯ä»¥éç½® CloudStackåè®¸ä»»ä½ç¨æ·åå»ºé¡¹ç®ï¼æèä½ 
ä¹å¯ä»¥åªåè®¸CloudStackç®¡çåè¿è¡æ¤é¡¹æä½ãä¸æ¦ä½ 
åå»ºäºé¡¹ç®ï¼ä½ å°±æä¸ºé¡¹ç®ç®¡çåï¼ä½ å¯ä»¥å°åä¸çå
¶ä»ç¨æ·å å¥å°é¡¹ç®ãCloudStackå¯ä»¥è®¾ç½®æå°ç¨æ·ç´æ¥å å
¥é¡¹ç®æèåæ¥åè
åééè¯·ãé¡¹ç®ç»æåå¯ä»¥æµè§åç®¡çé¡¹ç®ä¸çææèæèµæºï¼ä¾å¦ï¼å

±äº«VMï¼ãä¸ä¸ªç¨æ·å¯ä»¥å±äºä»»ä½é¡¹ç®ç»ï¼å¹¶å¯å¨CloudStackçé¢ä¸åæ¢åªä¸é¡¹ç®ç¸å
³çä¿¡æ¯ï¼å¦é¡¹ç®VMï¼é¡¹ç®æåï¼é¡¹ç®ç¸å³è¦åçã"
+
+# 084d2df113554d86bc84fabe4777c76c
+#: ../../projects.rst:46
+msgid ""
+"The project administrator can pass on the role to another project member. "
+"The project administrator can also add more members, remove members from the"
+" project, set new resource limits (as long as they are below the global "
+"defaults set by the CloudStack administrator), and delete the project. When "
+"the administrator removes a member from the project, resources created by "
+"that user, such as VM instances, remain with the project. This brings us to "
+"the subject of resource ownership and which resources can be used by a "
+"project."
+msgstr "é¡¹ç®ç®¡çåå¯ä»¥å°è§è²ä¼ 
éç»é¡¹ç®å¦å¤çæåãé¡¹ç®ç®¡çåä¹å¯ä»¥æ·»å ãå 
é¤é¡¹ç®æåï¼è®¾ç½®æ°çèµæºé

[07/40] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_load_balancing.rst
--
diff --git a/source/networking/ip_load_balancing.rst 
b/source/networking/ip_load_balancing.rst
new file mode 100644
index 000..6d2edd9
--- /dev/null
+++ b/source/networking/ip_load_balancing.rst
@@ -0,0 +1,31 @@
+.. 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.
+   
+
+IP Load Balancing
+-
+
+The user may choose to associate the same public IP for multiple guests.
+CloudStack implements a TCP-level load balancer with the following
+policies.
+
+-  Round-robin
+
+-  Least connection
+
+-  Source IP
+
+This is similar to port forwarding but the destination may be multiple
+IP addresses.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_reservation_in_guest_networks.rst
--
diff --git a/source/networking/ip_reservation_in_guest_networks.rst 
b/source/networking/ip_reservation_in_guest_networks.rst
new file mode 100644
index 000..c8b8f38
--- /dev/null
+++ b/source/networking/ip_reservation_in_guest_networks.rst
@@ -0,0 +1,125 @@
+.. 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.
+
+
+IP Reservation in Isolated Guest Networks
+-
+
+In isolated guest networks, a part of the guest IP address space can be
+reserved for non-CloudStack VMs or physical servers. To do so, you
+configure a range of Reserved IP addresses by specifying the CIDR when a
+guest network is in Implemented state. If your customers wish to have
+non-CloudStack controlled VMs or physical servers on the same network,
+they can share a part of the IP address space that is primarily provided
+to the guest network.
+
+In an Advanced zone, an IP address range or a CIDR is assigned to a
+network when the network is defined. The CloudStack virtual router acts
+as the DHCP server and uses CIDR for assigning IP addresses to the guest
+VMs. If you decide to reserve CIDR for non-CloudStack purposes, you can
+specify a part of the IP address range or the CIDR that should only be
+allocated by the DHCP service of the virtual router to the guest VMs
+created in CloudStack. The remaining IPs in that network are called
+Reserved IP Range. When IP reservation is configured, the administrator
+can add additional VMs or physical servers that are not part of
+CloudStack to the same network and assign them the Reserved IP
+addresses. CloudStack guest VMs cannot acquire IPs from the Reserved IP
+Range.
+
+
+IP Reservation Considerations
+~
+
+Consider the following before you reserve an IP range for non-CloudStack
+machines:
+
+-  IP Reservation is supported only in Isolated networks.
+
+-  IP Reservation can be applied only when the network is in Implemented
+   state.
+
+-  No IP Reservation is done by default.
+
+-  Guest VM CIDR you specify must be a subset of the network CIDR.
+
+-  Specify a valid Guest VM CIDR. IP Reservation is applied only if no
+   active IPs exist outside the Guest VM CIDR.
+
+   You cannot apply IP Reservation if any VM is alloted with an IP
+   address that is outside the Guest VM CIDR.
+
+-  To reset an existing IP Reservation, apply IP reservation by
+   specifying the value of network CIDR in the CIDR field.
+
+   For example, the following table descr

[31/40] git commit: accounts.rst: remove trailing spaces, add highlight

2014-09-09 Thread rajani

accounts.rst: remove trailing spaces, add highlight


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/fce127ef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/fce127ef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/fce127ef

Branch: refs/heads/4.4
Commit: fce127ef8e6669ea72e5c9b9051f5720172125cb
Parents: 733b866
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:04:07 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:15:02 2014 -0400

--
 source/accounts.rst | 81 
 1 file changed, 54 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fce127ef/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index a4d95a2..b555742 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -186,53 +186,80 @@ Using an LDAP Server for User Authentication
 
 
 You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. 
-CloudStack will search the external LDAP directory tree
-starting at a specified base directory and gets user info such as first name, 
last name, email and username. 
+or ApacheDS to authenticate CloudStack end-users. CloudStack will search
+the external LDAP directory tree starting at a specified base directory
+and gets user info such as first name, last name, email and username.
 
 To authenticate, username and password entered by the user are used.
-Cloudstack does a search for a user with the given username. If it exists, it 
does a bind request with DN and password
+Cloudstack does a search for a user with the given username. If it
+exists, it does a bind request with DN and password.
 
 To set up LDAP authentication in CloudStack, call the CloudStack API
-command addLdapConfiguration and provide Hostname or IP address and listening 
port of the LDAP server.
-You could configure multiple servers as well. These are expected to be 
replicas. If one fails, the next one is used.
+command ``addLdapConfiguration`` and provide Hostname or IP address
+and listening port of the LDAP server. You could configure multiple
+servers as well. These are expected to be replicas. If one fails,
+the next one is used.
 
+The following global configurations should also be configured (the
+default values are for openldap)
 
-The following global configurations should also be configured (the default 
values are for openldap)
+-  ``ldap.basedn``:Sets the basedn for LDAP. Ex: 
**OU=APAC,DC=company,DC=com**
 
+-  ``ldap.bind.principal``, ``ldap.bind.password``: DN and password for a user
+   who can list all the users in the above basedn. Ex:
+   **CN=Administrator, OU=APAC, DC=company, DC=com**
+
+-  ``ldap.user.object``: object type of users within LDAP. Defaults value is
+   **user** for AD and **interorgperson** for openldap.
+
+-  ``ldap.email.attribute``: email attribute within ldap for a user. Default
+   value for AD and openldap is **mail**.
+
+-  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
+   Default value for AD and openldap is **givenname**.
+
+-  ``ldap.username.attribute``: username attribute for a user within LDAP.
+  Default value is **SAMAccountName** for AD and **uid** for openldap.
 
-- ldap.basedn: Sets the basedn for LDAP. Ex: OU=APAC,DC=company,DC=com
-- ldap.bind.principal,ldap.bind.password: DN and password for a user who can 
list all the users in the above basedn. Ex: CN=Administrator, OU=APAC, 
DC=company, DC=com
-- ldap.user.object: object type of users within LDAP. Defaults value is user 
for AD and interorgperson for openldap.
-- ldap.email.attribute: email attribute within ldap for a user. Default value 
for AD and openldap is mail.
-- ldap.firstname.attribute: firstname attribute within ldap for a user. 
Default value for AD and openldap is givenname.
-- ldap.username.attribute: username attribute for a user within LDAP. Default 
value is SAMAccountNAme  for AD and uid for openldap.
 
 Restricting LDAP users to a group:
-~
-- ldap.search.group.principle: this is optional and if set only users from 
this group are listed.  
+~~
+
+-  ``ldap.search.group.principle``: this is optional and if set only users from
+   this group are listed.
+
 
 LDAP SSL:
-~
-- ldap.lastname.attribute: lsatname attribute within ldap for a user. Default 
value for AD and openldap is sn.
-- ldap.truststore, ldap.truststore.password:   truststore,password to use for 
LDAP SSL.
- 
-LDAP groups:  
-~
-- ldap.gr

[11/40] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/projects.rst
--
diff --git a/source/projects.rst b/source/projects.rst
index 7d8d766..8cdefee 100644
--- a/source/projects.rst
+++ b/source/projects.rst
@@ -68,6 +68,7 @@ project can use any service offering or disk offering 
available in its
 domain; however, you can not create private service and disk offerings
 at the project level..
 
+
 Configuring Projects
 
 
@@ -76,6 +77,7 @@ administrator must set up various systems to support them, 
including
 membership invitations, limits on project resources, and controls on who
 can create projects.
 
+
 Setting Up Invitations
 ~~
 
@@ -86,22 +88,14 @@ by email or through the userâs CloudStack account. If you 
want
 administrators to use invitations to add members to projects, turn on
 and set up the invitations feature in CloudStack.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
-
-   In the left navigation, click Global Settings.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Global Settings.
 
-   In the search box, type project and click the search button.
+#. In the search box, type project and click the search button.
|Searches projects|
 
-#. 
-
-   In the search results, you can see a few other parameters you need to
+#. In the search results, you can see a few other parameters you need to
set to control how invitations behave. The table below shows global
configuration parameters related to project invitations. Click the
edit button to set each parameter.
@@ -126,13 +120,11 @@ and set up the invitations feature in CloudStack.
| project.smtp.username  | (Optional) User name required by the SMTP 
server for authentication. You must also set project.smtp.password and set 
project.smtp.useAuth to true..   |

++---+
 
-#. 
-
-   Restart the Management Server:
+#. Restart the Management Server:
 
.. code:: bash
 
-   service cloudstack-management restart
+  service cloudstack-management restart
 
 Setting Resource Limits for Projects
 
@@ -163,53 +155,32 @@ new maximum, the resources are not affected; however, the 
project can
 not add any new resources of that type until the total drops below the
 new limit.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
+#. Log in as administrator to the CloudStack UI.
 
-   In the left navigation, click Projects.
+#. In the left navigation, click Projects.
 
-#. 
+#. In Select View, choose Projects.
 
-   In Select View, choose Projects.
+#. Click the name of the project you want to work with.
 
-#. 
-
-   Click the name of the project you want to work with.
-
-#. 
-
-   Click the Resources tab. This tab lists the current maximum amount
+#. Click the Resources tab. This tab lists the current maximum amount
that the project is allowed to own for each type of resource.
 
-#. 
+#. Type new values for one or more resources.
 
-   Type new values for one or more resources.
+#. Click Apply.
 
-#. 
-
-   Click Apply.
 
 Setting the Global Project Resource Limits
 ^^
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Global Settings.
 
-   In the left navigation, click Global Settings.
+#. In the search box, type max.projects and click the search button.
 
-#. 
-
-   In the search box, type max.projects and click the search button.
-
-#. 
-
-   In the search results, you will see the parameters you can use to set
+#. In the search results, you will see the parameters you can use to set
per-project maximum resource amounts that apply to all projects in
the cloud. No project can have more resources, but an individual
project can have lower limits. Click the edit button to set each
@@ -228,13 +199,11 @@ Setting the Global Project Resource Limits

+--+--+
 
 
-#. 
-
-   Restart the Management Server.
+#. Restart the Management Server.
 
.. code:: bash
 
-   # service cloudstack-management restart
+  # service cloudstack-management restart
 
 Setting Project Creator Permissions
 ~~~
@@ -242,21 +211,13 @@ Setting Project Creator Permissions
 You can configure CloudStack to allow any user to create a new project,
 or you can restrict that ability to just CloudStack administrators.
 
-#. 
+#. Log in as administrator to the CloudStack UI.
 
-   Log in as administrator to the

[17/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/templates.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/templates.po 
b/source/locale/zh_CN/LC_MESSAGES/templates.po
new file mode 100644
index 000..958ffe8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/templates.po
@@ -0,0 +1,1557 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# morgan wang , 2014
+# renoshen , 2014
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-23 11:44+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# b97982f6c7534586be38178d1c1fdcd8
+#: ../../templates.rst:17
+msgid "Working with Templates"
+msgstr "ä½¿ç¨æ¨¡æ¿"
+
+# e9dce9aaa8b14b9b8163fc28465cbca2
+#: ../../templates.rst:19
+msgid ""
+"A template is a reusable configuration for virtual machines. When users "
+"launch VMs, they can choose from a list of templates in CloudStack."
+msgstr "æ¨¡æ¿ç¸å½äºèææºçéç¨é
ç½®ãå½ç¨æ·åå»ºèææºæ¶è½ä»CloudStackçæ¨¡æ¿åè¡¨ä¸éæ©ä¸ä¸ªã"
+
+# d0a82a53c7814d2bad8709d6ea8d8243
+#: ../../templates.rst:22
+msgid ""
+"Specifically, a template is a virtual disk image that includes one of a "
+"variety of operating systems, optional additional software such as office "
+"applications, and settings such as access control to determine who can use "
+"the template. Each template is associated with a particular type of "
+"hypervisor, which is specified when the template is added to CloudStack."
+msgstr "ç¹æ®æåµä¸ï¼æ¨¡æ¿å¯ä»¥æ¯ä¸ä¸ªå
å«ä¸ä¸ªæå¤ä¸ªæä½ç³»ç»çèæç£çéåï¼ä½ 
å¯ä»¥éæ©æ§çå®è£
å¦å¤çè½¯ä»¶ï¼æ¯å¦officeåºç¨å¹¶è®¾ç½®è®¿é®æ§å¶æ¥å³å®è°è½ä½¿ç¨è¿ä¸ªæ¨¡æ¿ãæ¯ä¸ªæ¨¡æ¿å¯¹åºä¸ä¸ªç¹æ®ç±»åçèææºï¼æ¤ç±»èææºå¨å°æ¨¡æ¿æ·»å
 å¥CloudStackæ¶æå®ã"
+
+# 3cea19812ae7412c873921f3b112df2d
+#: ../../templates.rst:29
+msgid ""
+"CloudStack ships with a default template. In order to present more choices "
+"to users, CloudStack administrators and users can create templates and add "
+"them to CloudStack."
+msgstr 
"CloudStackéå¸¦ä¸ä¸ªé»è®¤æ¨¡æ¿ãä¸ºäºåç¨æ·åç°åºæ´å¤éæ©ï¼CloudStackçç®¡çååç¨æ·è½åå»ºæ¨¡æ¿å¹¶æ·»å
 å°CloudStackä¸ã"
+
+# cdd1318db7514de09ddba24875b24795
+#: ../../templates.rst:34
+msgid "Creating Templates: Overview"
+msgstr "åå»ºæ¨¡æ¿æ¦è§"
+
+# 6604bbcbda1146a8947cec849b8aacfc
+#: ../../templates.rst:36
+msgid ""
+"CloudStack ships with a default template for the CentOS operating system. "
+"There are a variety of ways to add more templates. Administrators and end "
+"users can add templates. The typical sequence of events is:"
+msgstr 
"CloudStacké»è®¤å·²ç»æäºä¸ä¸ªå¸¦CentOSç³»ç»çé»è®¤æ¨¡æ¿ãæè®¸å¤æ·»å
 æ´å¤æ¨¡æ¿çæ¹æ³ï¼ç®¡çååæ®éç¨æ·åè½æ·»å ãä¸è¬æ¯è¿æ 
·çé¡ºåºï¼"
+
+# f34378876e0d44ff800666b2d65fc180
+#: ../../templates.rst:43
+msgid ""
+"Launch a VM instance that has the operating system you want. Make any other "
+"desired configuration changes to the VM."
+msgstr "è¿è¡ä¸ä¸ªå¸¦æä½ 
éè¦çæä½ç³»ç»çèææºå®ä¾ï¼å¹¶è¿è¡ä¸äºä½ ææçè®¾ç½®ã"
+
+# 24b37b205a73458c8aa1fb8a40a568e0
+#: ../../templates.rst:48
+msgid "Stop the VM."
+msgstr "åæ¢VMã"
+
+# c64df33a7a6842908b88d0747e1af601
+#: ../../templates.rst:52
+msgid "Convert the volume into a template."
+msgstr "å°å·è½¬æ¢ä¸ºæ¨¡æ¿ã"
+
+# 59a9ab57227c474ab160737b378627a2
+#: ../../templates.rst:54
+msgid ""
+"There are other ways to add templates to CloudStack. For example, you can "
+"take a snapshot of the VM's volume and create a template from the snapshot, "
+"or import a VHD from another system into CloudStack."
+msgstr "è¿æå¶ä»æ¹æ³åCloudStackä¸æ·»å æ¨¡æ¿ãæ¯å¦ä½ 
å¯ä»¥å¯¹èæºç£çå·åä¸ªå¿«ç§ç¶åéè¿è¿ä¸ªå¿«ç
§åå»ºæ¨¡æ¿ï¼æèä»å¦ä¸ä¸ªç³»ç»å¯¼å¥ä¸ä¸ªVHDå°CloudStackã"
+
+# ed480ef0b4464b7f8970f7eab786dc96
+#: ../../templates.rst:58
+msgid ""
+"The various techniques for creating templates are described in the next few "
+"sections."
+msgstr "æ¥ä¸æ¥çå èä¸å°ç»§ç»è®²è¿°åç§åå»ºæ¨¡æ¿çææ¯ã"
+
+# af2d0bd506da45ac8de738d250325f24
+#: ../../templates.rst:62
+msgid "Requirements for Templates"
+msgstr "æ¨¡æ¿çéæ±"
+
+# fc604d7ce79041b2897e66c4616fd723
+#: ../../templates.rst:66
+msgid ""
+"For

[04/40] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking_and_traffic.rst
--
diff --git a/source/networking_and_traffic.rst 
b/source/networking_and_traffic.rst
new file mode 100644
index 000..f29ed3b
--- /dev/null
+++ b/source/networking_and_traffic.rst
@@ -0,0 +1,82 @@
+.. 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.
+   
+
+Managing Networks and Traffic
+=
+
+In a CloudStack, guest VMs can communicate with each other using shared
+infrastructure with the security and user perception that the guests
+have a private LAN. The CloudStack virtual router is the main component
+providing networking features for guest traffic.
+
+.. include:: networking/guest_traffic.rst
+
+.. include:: networking/networking_in_pod.rst
+
+.. include:: networking/networking_in_zone.rst
+
+.. include:: networking/basic_zone_config.rst
+
+.. include:: networking/advanced_zone_config.rst
+
+.. include:: networking/multiple_guest_networks.rst
+
+.. include:: networking/ip_reservation_in_guest_networks.rst
+
+.. include:: networking/public_ips_and_vlans_for_accounts.rst
+
+.. include:: networking/multiple_ips_on_single_nic.rst
+
+.. include:: networking/multiple_ip_ranges.rst
+
+.. include:: networking/elastic_ips.rst
+
+.. include:: networking/portable_ips.rst
+
+.. include:: networking/multiple_subnets_in_shared_network.rst
+
+.. include:: networking/isolation_in_advanced_zone_with_vlan.rst
+
+.. include:: networking/security_groups.rst
+
+.. include:: networking/external_firewalls_and_load_balancers.rst
+
+.. include:: networking/global_server_load_balancing.rst
+
+.. include:: networking/guest_ip_ranges.rst
+
+.. include:: networking/acquiring_an_ip_address.rst
+
+.. include:: networking/releasing_an_ip_address.rst
+
+.. include:: networking/static_nat.rst
+
+.. include:: networking/ip_forwarding_and_firewalling.rst
+
+.. include:: networking/ip_load_balancing.rst
+
+.. include:: networking/dns_and_dhcp.rst
+
+.. include:: networking/remote_access_vpn.rst
+
+.. include:: networking/inter_vlan_routing.rst
+
+.. include:: networking/virtual_private_cloud_config.rst
+
+.. include:: networking/persistent_networks.rst
+
+.. include:: networking/palo_alto_config.rst
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/palo_alto_config.rst
--
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
deleted file mode 100644
index 6c0aa46..000
--- a/source/palo_alto_config.rst
+++ /dev/null
@@ -1,282 +0,0 @@
-.. 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.
-
-
-
-Setup a Palo Alto Networks Firewall

-
-
-Functionality Provided
-~~
-
-This implementation enable the orchestration of a Palo Alto Networks Firewall 
from within CloudStack UI and API.  
-
-**The following features are supported**:
-
-- List/Add/Delete Palo Alto Networks service provider
-- List/Add/Delete Palo Alto Networks network service offering
-- List/Add/Delete Palo Alto Networks network using the above service offering
-- Add an instance to a Palo Alto Networks network
-- Source NAT management on network create and delete
-- List/Add/Delete Ingress Firewall rule
-- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules 
supported)
-- List/Add/Delete Port Forw

[26/40] git commit: Fix formatting issues in README

2014-09-09 Thread rajani

Fix formatting issues in README


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/19e54c22
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/19e54c22
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/19e54c22

Branch: refs/heads/4.4
Commit: 19e54c228eac857ee6322170ce95714255b66cb1
Parents: fff40fc
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:10:51 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:10:51 2014 +0200

--
 README.rst | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/19e54c22/README.rst
--
diff --git a/README.rst b/README.rst
index 227a6c8..a866fbb 100644
--- a/README.rst
+++ b/README.rst
@@ -30,31 +30,37 @@ Translation
 Clean the build
 
 ::
+
make clean
 
 Generate the .pot files
 
 ::
+
make gettext
 
 Generate the .tx/config files with:
 
 ::
+
sphinx-intl update-txconfig-resources --pot-dir source/locale/pot 
--transifex-project-name apache-cloudstack-administration-rtd --locale-dir 
source/locale
 
 Push the .pot files to transifex with:
 
 ::
+
tx push -s
 
 Download the translated strings, for example Japanese (ja):
 
 ::
+
tx pull -l ja
 
 Build the translated docs:
 
 ::
+
sphinx-intl build --locale-dir source/locale
make -e SPHINXOPTS="-D language='ja'" html

[05/40] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking2.rst
--
diff --git a/source/networking2.rst b/source/networking2.rst
deleted file mode 100644
index b3743fc..000
--- a/source/networking2.rst
+++ /dev/null
@@ -1,7033 +0,0 @@
-.. 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.
-   
-
-Managing Networks and Traffic
-=
-
-In a CloudStack, guest VMs can communicate with each other using shared
-infrastructure with the security and user perception that the guests
-have a private LAN. The CloudStack virtual router is the main component
-providing networking features for guest traffic.
-
-Guest Traffic
--
-
-A network can carry guest traffic only between VMs within one zone.
-Virtual machines in different zones cannot communicate with each other
-using their IP addresses; they must communicate with each other by
-routing through a public IP address.
-
-See a typical guest traffic setup given below:
-
-|guest-traffic-setup.png| 
-
-Typically, the Management Server automatically creates a virtual router
-for each network. A virtual router is a special virtual machine that
-runs on the hosts. Each virtual router in an isolated network has three
-network interfaces. If multiple public VLAN is used, the router will
-have multiple public interfaces. Its eth0 interface serves as the
-gateway for the guest traffic and has the IP address of 10.1.1.1. Its
-eth1 interface is used by the system to configure the virtual router.
-Its eth2 interface is assigned a public IP address for public traffic.
-If multiple public VLAN is used, the router will have multiple public
-interfaces.
-
-The virtual router provides DHCP and will automatically assign an IP
-address for each guest VM within the IP range assigned for the network.
-The user can manually reconfigure guest VMs to assume different IP
-addresses.
-
-Source NAT is automatically configured in the virtual router to forward
-outbound traffic for all guest VMs
-
-Networking in a Pod

-
-The figure below illustrates network setup within a single pod. The
-hosts are connected to a pod-level switch. At a minimum, the hosts
-should have one physical uplink to each switch. Bonded NICs are
-supported as well. The pod-level switch is a pair of redundant gigabit
-switches with 10 G uplinks.
-
-|networksinglepod.png| 
-
-Servers are connected as follows:
-
--  
-
-   Storage devices are connected to only the network that carries
-   management traffic.
-
--  
-
-   Hosts are connected to networks for both management traffic and
-   public traffic.
-
--  
-
-   Hosts are also connected to one or more networks carrying guest
-   traffic.
-
-We recommend the use of multiple physical Ethernet cards to implement
-each network interface as well as redundant switch fabric in order to
-maximize throughput and improve reliability.
-
-Networking in a Zone
-
-
-The following figure illustrates the network setup within a single zone.
-
-|networksetupzone.png|
-
-A firewall for management traffic operates in the NAT mode. The network
-typically is assigned IP addresses in the 192.168.0.0/16 Class B private
-address space. Each pod is assigned IP addresses in the 192.168.\*.0/24
-Class C private address space.
-
-Each zone has its own set of public IP addresses. Public IP addresses
-from different zones do not overlap.
-
-Basic Zone Physical Network Configuration
--
-
-In a basic network, configuring the physical network is fairly
-straightforward. You only need to configure one guest network to carry
-traffic that is generated by guest VMs. When you first add a zone to
-CloudStack, you set up the guest network through the Add Zone screens.
-
-Advanced Zone Physical Network Configuration
-
-
-Within a zone that uses advanced networking, you need to tell the
-Management Server how the physical network is set up to carry different
-kinds of traffic in isolation.
-
-Configure Guest Traffic in an Advanced Zone
-~~~
-
-These steps assume you have al

1 2 >

1 - 100 of 104 matches

Mail list logo