Update docs (#211)
* Updating images to the new UI
* Updating docs to match new images / api params
* Updating docs
* Changing more images
diff --git a/source/adminguide/accounts.rst b/source/adminguide/accounts.rst
index a83bcd1..adc870f 100644
--- a/source/adminguide/accounts.rst
+++ b/source/adminguide/accounts.rst
@@ -12,7 +12,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
Roles, Accounts, Users, and Domains
-----------------------------------
@@ -24,6 +24,8 @@
role attached to them that enforce access rules on them to be allowed or
disallowed to make an API request. Typically there are four default roles:
root admin, resource admin, domain admin and user.
+Newer roles have been added which include Read-Only Admin, Read-Only User,
+Support Admin and Support User which are in turn based on the aforementioned roles.
Accounts
@@ -82,6 +84,33 @@
managing templates, service offerings, customer care administrators, and
domains
+Read Only Administrator
+~~~~~~~~~~~~~~~~~~~~~~~
+
+A restricted admin role in which an account is only allowed to perform any list, get
+or find operations but not perform any other operation which can change the
+infrastructure, configuration or user resources.
+
+Read Only User
+~~~~~~~~~~~~~~
+
+A restricted user role in which an account is only allowed to perform list, get or find
+operations. It can be used by users who may only be interested in monitoring and usage
+of resources.
+
+Support Admin
+~~~~~~~~~~~~~
+
+A restricted admin role in which an admin account is limited to perform axilary support
+and maintenance tasks which do not directly affect the infrastucture, such as creating offerings,
+and put resources in maintenance, but cannot change the infrastructure such as physical networks.
+
+Support User
+~~~~~~~~~~~~
+
+A restricted user role in which an account cannot create or destroy resources, but can view resources
+and perform auxilary and support operations such as start or stop VMs, attach or detach volumes, ISOs etc.
+
Resource Ownership
~~~~~~~~~~~~~~~~~~
@@ -125,7 +154,7 @@
rule,permission,description
<Rule1>,<Permission1>,<Description1>
- <Rule2>,<Permission2>,<Description2>
+ <Rule2>,<Permission2>,<Description2>
<Rule3>,<Permission3>,<Description3>
…
so on
@@ -148,8 +177,8 @@
running a migration tool by the CloudStack admin. The migration tool is located
at ``/usr/share/cloudstack-common/scripts/util/migrate-dynamicroles.py``.
-**NOTE: If you have not changed your commands.properties file at any time, then
-it is recommended to use the -D (default) option as otherwise new API commands may
+**NOTE: If you have not changed your commands.properties file at any time, then
+it is recommended to use the -D (default) option as otherwise new API commands may
not be added to the dynamic roles database.**
During migration, this tool enables an internal flag in the database,
@@ -182,7 +211,7 @@
Example:
-
+
.. parsed-literal::
@@ -247,7 +276,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~
To use an explicitly dedicated host, use the explicit-dedicated type of
-affinity group (see `“Affinity Groups” <virtual_machines.html#affinity-groups>`_).
+affinity group (see `“Affinity Groups” <virtual_machines.html#affinity-groups>`_).
For example, when creating a new VM, an
end user can choose to place it on dedicated infrastructure. This
operation will succeed only if some infrastructure has already been
@@ -395,7 +424,7 @@
port=389\
domainid=12345678-90ab-cdef-fedc-ba0987654321
-This is all that is required to enable the manual importing of LDAP users, the
+This is all that is required to enable the manual importing of LDAP users, the
LisLdapUsers API can be used to query for users to import.
For the auto import method, a CloudStack Domain needs to be linked to
@@ -483,7 +512,7 @@
~~~~~~~~~~~~
- ``ldap.group.object``: object type of groups within LDAP. Default value is
- group for AD and **groupOfUniqueNames** for openldap.
+ group for AD and **groupOfUniqueNames** for openldap.
- ``ldap.group.user.uniquemember``: attribute for uniquemembers within a group.
Default value is **member** for AD and **uniquemember** for openldap.
diff --git a/source/adminguide/autoscale_without_netscaler.rst b/source/adminguide/autoscale_without_netscaler.rst
index 055d44f..c8f8f7f 100644
--- a/source/adminguide/autoscale_without_netscaler.rst
+++ b/source/adminguide/autoscale_without_netscaler.rst
@@ -17,10 +17,6 @@
Configuring AutoScale without using NetScaler
=============================================
-.. warning::
- This feature is currently only available on the master branch and will be
- released in the 4.4 release.
-
.. note::
AutoScaling is currently not supported in the new UI.
To manage AutoScaling, please directly invoke the
diff --git a/source/adminguide/hosts.rst b/source/adminguide/hosts.rst
index ae9a89c..467370f 100644
--- a/source/adminguide/hosts.rst
+++ b/source/adminguide/hosts.rst
@@ -199,11 +199,11 @@
hypervisor patches. The hypervisor vendor is likely to refuse to support
any system that is not up to date with patches.
-.. note::
+.. note::
The lack of up-do-date hotfixes can lead to data corruption and lost VMs.
-(XenServer) For more information, see
-`Highly Recommended Hotfixes for XenServer in the CloudStack Knowledge Base
+(XenServer) For more information, see
+`Highly Recommended Hotfixes for XenServer in the CloudStack Knowledge Base
<http://docs.cloudstack.org/Knowledge_Base/Possible_VM_corruption_if_XenServer_Hotfix_is_not_Applied/Highly_Recommended_Hotfixes_for_XenServer_5.6_SP2>`_.
@@ -247,7 +247,7 @@
.. code:: bash
- mysql> SELECT * FROM cloud.host_details WHERE name='password' AND host_id={previous step ID};
+ mysql> SELECT * FROM cloud.host_details WHERE name='password' AND host_id={previous step ID};
#. Update the passwords for the host in the database. In this example,
we change the passwords for hosts with host IDs 5 and 12 and host_details IDs 8 and 22 to
@@ -266,15 +266,15 @@
CPU and memory (RAM) over-provisioning factors can be set for each
cluster to change the number of VMs that can run on each host in the
cluster. This helps optimize the use of resources. By increasing the
-over-provisioning ratio, more resource capacity will be used. If the
-ratio is set to 1, no over-provisioning is done.
+over-provisioning factor, more resource capacity will be used. If the
+factor is set to 1, no over-provisioning is done.
-The administrator can also set global default over-provisioning ratios
+The administrator can also set global default over-provisioning factors
in the cpu.overprovisioning.factor and mem.overprovisioning.factor
global configuration variables. The default value of these variables is
1: over-provisioning is turned off by default.
-Over-provisioning ratios are dynamically substituted in CloudStack's
+Over-provisioning factors are dynamically substituted in CloudStack's
capacity calculations. For example:
Capacity = 2 GB
@@ -286,8 +286,8 @@
Used = 3 GB
Free = 1 GB
-The administrator can specify a memory over-provisioning ratio, and can
-specify both CPU and memory over-provisioning ratios on a per-cluster
+The administrator can specify a memory over-provisioning factor, and can
+specify both CPU and memory over-provisioning factors on a per-cluster
basis.
In any given cloud, the optimum number of VMs for each host is affected
@@ -303,8 +303,8 @@
(assigning a specific cluster to an account) to effectively offer
different levels of service to different accounts. For example, an
account paying for a more expensive level of service could be assigned
-to a dedicated cluster with an over-provisioning ratio of 1, and a
-lower-paying account to a cluster with a ratio of 2.
+to a dedicated cluster with an over-provisioning factor of 1, and a
+lower-paying account to a cluster with a factor of 2.
When a new host is added to a cluster, CloudStack will assume the host
has the capability to perform the CPU and RAM over-provisioning which is
@@ -385,46 +385,48 @@
Memory ballooning is supported by default.
-Setting Over-Provisioning Ratios
+Setting Over-Provisioning Factors
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
There are two ways the root admin can set CPU and RAM over-provisioning
-ratios. First, the global configuration settings
+factors. First, the global configuration settings
cpu.overprovisioning.factor and mem.overprovisioning.factor will be
-applied when a new cluster is created. Later, the ratios can be modified
+applied when a new cluster is created. Later, the factors can be modified
for an existing cluster.
Only VMs deployed after the change are affected by the new setting. If
you want VMs deployed before the change to adopt the new
-over-provisioning ratio, you must stop and restart the VMs. When this is
+over-provisioning factor, you must stop and restart the VMs. When this is
done, CloudStack recalculates or scales the used and reserved capacities
-based on the new over-provisioning ratios, to ensure that CloudStack is
+based on the new over-provisioning factors, to ensure that CloudStack is
correctly tracking the amount of free capacity.
-.. note::
- It is safer not to deploy additional new VMs while the capacity
- recalculation is underway, in case the new values for available
- capacity are not high enough to accommodate the new VMs. Just wait
- for the new used/available values to become available, to be sure
+.. note::
+ It is safer not to deploy additional new VMs while the capacity
+ recalculation is underway, in case the new values for available
+ capacity are not high enough to accommodate the new VMs. Just wait
+ for the new used/available values to become available, to be sure
there is room for all the new VMs you want.
-To change the over-provisioning ratios for an existing cluster:
+To change the over-provisioning factors for an existing cluster:
#. Log in as administrator to the CloudStack UI.
#. In the left navigation bar, click Infrastructure.
-#. Under Clusters, click View All.
+#. Select Clusters.
-#. Select the cluster you want to work with, and click the Edit button.
+#. Select the cluster you want to work with, and click the Settings button.
+
+#. Search for overprovisioning.
#. Fill in your desired over-provisioning multipliers in the fields CPU
- overcommit ratio and RAM overcommit ratio. The value which is
+ overcommit factor and RAM overcommit factor. The value which is
intially shown in these fields is the default value inherited from
the global configuration settings.
- .. note::
- In XenServer, due to a constraint of this hypervisor, you can not
+ .. note::
+ In XenServer, due to a constraint of this hypervisor, you can not
use an over-provisioning factor greater than 4.
@@ -514,8 +516,7 @@
#. In the left navigation, choose Infrastructure.
-#. On Zones, click View More, then click the zone to which you want to
- work with.
+#. Click Zones and select the zone you'd like to modify.
#. Click Physical Network.
@@ -572,8 +573,8 @@
network and the state is changed to Setup. In this state, the network
will not be garbage collected.
-.. note::
- You cannot change a VLAN once it's assigned to the network. The VLAN
+.. note::
+ You cannot change a VLAN once it's assigned to the network. The VLAN
remains with the network for its entire life cycle.
@@ -769,7 +770,7 @@
- This feature applies to KVM hosts.
- KVM utilised under CloudStack uses the standard Libvirt hook script behaviour as outlined in the Libvirt documentation page `hooks`_.
-- During the install of the KVM CloudStack agent, the Libvirt hook script "/etc/libvirt/hooks/qemu", referred to as the qemu script hereafter is installed.
+- During the install of the KVM CloudStack agent, the Libvirt hook script "/etc/libvirt/hooks/qemu", referred to as the qemu script hereafter is installed.
- This is a python script that carries out network management tasks every time a VM is started, stopped or migrated, as per the Libvirt hooks specification.
- Custom network configuration tasks can be done at the same time as the qemu script is called.
- Since the tasks in question are user-specific, they cannot be included in the CloudStack-provided qemu script.
@@ -788,8 +789,8 @@
~~~~~~
- The cloudstack-agent package will install the qemu script in the /etc/libvirt/hooks directory of Libvirt.
-- The Libvirt documentation page `arguments`_ describes the arguments that can be passed to the qemu script.
-- The input arguments are:
+- The Libvirt documentation page `arguments`_ describes the arguments that can be passed to the qemu script.
+- The input arguments are:
#. Name of the object involved in the operation, or '-' if there is none. For example, the name of a guest being started.
#. Name of the operation being performed. For example, 'start' if a guest is being started.
@@ -800,7 +801,7 @@
- If an invalid operation argument is received, the qemu script will log the fact, not execute any custom scripts and exit.
-- All input arguments that are passed to the qemu script will also be passed to each custom script.
+- All input arguments that are passed to the qemu script will also be passed to each custom script.
- For each of the above actions, the qemu script will find and run scripts by the name "<action>_<custom script name>" in a custom include path /etc/libvirt/hooks/custom/. Custom scripts that do not follow this naming convention will be ignored and not be executed.
@@ -825,7 +826,7 @@
Custom Script Naming for a Specific VM Action
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- For a custom script that needs to be executed at the end of a specific VM action, do the following:
+- For a custom script that needs to be executed at the end of a specific VM action, do the following:
#. Navigate to the custom script that needs to be executed for a specific action.
#. Rename the file by prefixing to the filename the specific action name followed by an underscore. For example, if a custom script is named abc.sh, then prefix 'migrate' and an underscore to the name to become migrate_abc.sh.
@@ -840,7 +841,7 @@
#. Rename the file by prefixing 'all' to the filename, followed by an underscore. For example, if a custom script is named def.py, then prefix 'all' and an underscore to the name to become all_def.py.
Custom Script Execution Configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Grant each custom script execute permissions so that the underlying host operating system can execute them:
#. Navigate to the custom script that needs to be executable.
@@ -879,7 +880,7 @@
#. Post-Maintenance stage: Post-maintenance script ((``PostMaintenance`` or ``PostMaintenance.sh`` or ``PostMaintenance.py``)) is expected to perform validation after the host exits maintenance. These scripts will help to detect any problem during the maintenance process, including reboots or restarts within scripts.
-.. note::
+.. note::
Pre-flight and pre-maintenance scripts’ execution can determine if the maintenance stage is not required for a host. The special exit code = 70 on a pre-flight or pre-maintenance script will let CloudStack know that the maintenance stage is not required for a host.
Administrators must define only one script per stage. In case a stage does not contain a script, it is skipped, continuing with the next stage. Administrators are responsible for defining and copying scripts into the hosts
@@ -952,7 +953,7 @@
The pre-flight script may signal that no maintenance is needed on the host. In that case, the host is skipped from the rolling maintenance hosts iteration.
-Once pre-flight checks pass, then the management server iterates through each host in the selected scope and sends a command to execute each of the rest of the stages in order. The hosts in the selected scope are grouped by clusters, therefore all the hosts in a cluster are processed before processing the hosts of a different cluster.
+Once pre-flight checks pass, then the management server iterates through each host in the selected scope and sends a command to execute each of the rest of the stages in order. The hosts in the selected scope are grouped by clusters, therefore all the hosts in a cluster are processed before processing the hosts of a different cluster.
The management server iterates through hosts in each cluster on the selected scope and for each of the hosts does the following:
@@ -960,7 +961,7 @@
- The existence of the maintenance script on the host is checked (this check is performed only for the maintenance script, not for the rest of the stages)
- If the host does not contain a maintenance script, then the host is skipped and the iteration continues with the next host in the cluster.
-
+
- Execute pre-maintenance script (if any) before entering maintenance mode.
- The pre-maintenance script may signal that no maintenance is needed on the host. In that case, the host is skipped and the iteration continues with the next host in the cluster.
diff --git a/source/adminguide/locale/pot/hosts.pot b/source/adminguide/locale/pot/hosts.pot
index 6314be5..5ef7fbe 100644
--- a/source/adminguide/locale/pot/hosts.pot
+++ b/source/adminguide/locale/pot/hosts.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -357,17 +357,21 @@
#: ../../hosts.rst:255
# 3633dc63fade45ad8b1bc222bb9ad425
-msgid "CPU and memory (RAM) over-provisioning factors can be set for each cluster to change the number of VMs that can run on each host in the cluster. This helps optimize the use of resources. By increasing the over-provisioning ratio, more resource capacity will be used. If the ratio is set to 1, no over-provisioning is done."
+msgid "CPU and memory (RAM) over-provisioning factors can be set for each
+cluster to change the number of VMs that can run on each host in the
+cluster. This helps optimize the use of resources. By increasing the
+over-provisioning factor, more resource capacity will be used. If the
+factor is set to 1, no over-provisioning is done."
msgstr ""
#: ../../hosts.rst:261
# 43467fc7868049cab2d4374ff0094af1
-msgid "The administrator can also set global default over-provisioning ratios in the cpu.overprovisioning.factor and mem.overprovisioning.factor global configuration variables. The default value of these variables is 1: over-provisioning is turned off by default."
+msgid "The administrator can also set global default over-provisioning factors in the cpu.overprovisioning.factor and mem.overprovisioning.factor global configuration variables. The default value of these variables is 1: over-provisioning is turned off by default."
msgstr ""
#: ../../hosts.rst:266
# 253e39db71ed47619ec617fb7a5397ac
-msgid "Over-provisioning ratios are dynamically substituted in CloudStack's capacity calculations. For example:"
+msgid "over-provisioning factors are dynamically substituted in CloudStack's capacity calculations. For example:"
msgstr ""
#: ../../hosts.rst:269
@@ -387,7 +391,7 @@
#: ../../hosts.rst:278
# fdd299fb9bed44d696ed49d97cd8779d
-msgid "The administrator can specify a memory over-provisioning ratio, and can specify both CPU and memory over-provisioning ratios on a per-cluster basis."
+msgid "The administrator can specify a memory over-provisioning factor, and can specify both CPU and memory over-provisioning factors on a per-cluster basis."
msgstr ""
#: ../../hosts.rst:282
@@ -397,7 +401,7 @@
#: ../../hosts.rst:291
# 14bb9814011f4bb6972aeb18939b2e6c
-msgid "The overprovisioning settings can be used along with dedicated resources (assigning a specific cluster to an account) to effectively offer different levels of service to different accounts. For example, an account paying for a more expensive level of service could be assigned to a dedicated cluster with an over-provisioning ratio of 1, and a lower-paying account to a cluster with a ratio of 2."
+msgid "The overprovisioning settings can be used along with dedicated resources (assigning a specific cluster to an account) to effectively offer different levels of service to different accounts. For example, an account paying for a more expensive level of service could be assigned to a dedicated cluster with an over-provisioning factor of 1, and a ower-paying account to a cluster with a factor of 2."
msgstr ""
#: ../../hosts.rst:298
@@ -501,17 +505,17 @@
#: ../../hosts.rst:378
# fd73c49bd922450fb7a771ebb8586d6d
-msgid "Setting Over-Provisioning Ratios"
+msgid "Setting over-provisioning factors"
msgstr ""
#: ../../hosts.rst:380
# 7d8bbd43174f499a98270e1aad9301bd
-msgid "There are two ways the root admin can set CPU and RAM over-provisioning ratios. First, the global configuration settings cpu.overprovisioning.factor and mem.overprovisioning.factor will be applied when a new cluster is created. Later, the ratios can be modified for an existing cluster."
+msgid "There are two ways the root admin can set CPU and RAM over-provisioning factors. First, the global configuration settings cpu.overprovisioning.factor and mem.overprovisioning.factor will be applied when a new cluster is created. Later, the factors can be modified for an existing cluster."
msgstr ""
#: ../../hosts.rst:386
# 6930197d999a4c1bb3e8bca13bb10c00
-msgid "Only VMs deployed after the change are affected by the new setting. If you want VMs deployed before the change to adopt the new over-provisioning ratio, you must stop and restart the VMs. When this is done, CloudStack recalculates or scales the used and reserved capacities based on the new over-provisioning ratios, to ensure that CloudStack is correctly tracking the amount of free capacity."
+msgid "Only VMs deployed after the change are affected by the new setting. If you want VMs deployed before the change to adopt the new over-provisioning factor, you must stop and restart the VMs. When this is done, CloudStack recalculates or scales the used and reserved capacities based on the new over-provisioning factors, to ensure that CloudStack is correctly tracking the amount of free capacity."
msgstr ""
#: ../../hosts.rst:394
@@ -521,7 +525,7 @@
#: ../../hosts.rst:400
# 443b0ee66d0b40bdad6e11ac6c4eb123
-msgid "To change the over-provisioning ratios for an existing cluster:"
+msgid "To change the over-provisioning factors for an existing cluster:"
msgstr ""
#: ../../hosts.rst:402
@@ -531,17 +535,17 @@
#: ../../hosts.rst:406
# 450e03bbb9974112bec16a0dca62c829
-msgid "Under Clusters, click View All."
+msgid "Select Clusters."
msgstr ""
#: ../../hosts.rst:408
# dc9598fec6f74c74a82c2311ff962b5d
-msgid "Select the cluster you want to work with, and click the Edit button."
+msgid "Search for overprovisioning."
msgstr ""
#: ../../hosts.rst:410
# 4574765089c64df0a53ffd4b0d9052a0
-msgid "Fill in your desired over-provisioning multipliers in the fields CPU overcommit ratio and RAM overcommit ratio. The value which is intially shown in these fields is the default value inherited from the global configuration settings."
+msgid "Fill in your desired over-provisioning multipliers in the fields CPU overcommit factor and RAM overcommit factor. The value which is intially shown in these fields is the default value inherited from the global configuration settings."
msgstr ""
#: ../../hosts.rst:421
@@ -718,7 +722,7 @@
#: ../../hosts.rst:504
# 7bd96bd6e7fd4c94bd7be28295bd46de
-msgid "On Zones, click View More, then click the zone to which you want to work with."
+msgid "Click Zones and select the zone you'd like to modify."
msgstr ""
#: ../../hosts.rst:507
diff --git a/source/adminguide/locale/pot/management.pot b/source/adminguide/locale/pot/management.pot
index 96ab7aa..cf7bfff 100644
--- a/source/adminguide/locale/pot/management.pot
+++ b/source/adminguide/locale/pot/management.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -133,12 +133,12 @@
#: ../../management.rst:91
# 7d8f4e987714451e9db1c9e749f8b1ca
-msgid "PRODUCT manages different types of hosts that contains one or more physical CPU sockets. CPU socket is considered as a unit of measure used for licensing and billing cloud infrastructure. PRODUCT provides both UI and API support to collect the CPU socket statistics for billing purpose. The Infrastructure tab has a new tab for CPU sockets. You can view the statistics for CPU sockets managed by PRODUCT, which in turn reflects the size of the cloud. The CPU Socket page will give you the number of hosts and sockets used for each host type."
+msgid "Cloudstack manages different types of hosts that contains one or more physical CPU sockets. CPU socket is considered as a unit of measure usedfor licensing and billing cloud infrastructure. Cloudstack provides both UI and API support to collect the CPU socket statistics for billing purpose. The Infrastructure tab has a new tab for CPU sockets. You can view the statistics for CPU sockets managed by Cloudstack, which in turn reflects the size of the cloud. The CPU Socket page will give you the number of hosts and sockets used for each host type."
msgstr ""
#: ../../management.rst:100
# dec087784ccd48c49189c3f0ed1811a9
-msgid "Log in to the PRODUCT UI."
+msgid "Log in to the Cloudstack UI."
msgstr ""
#: ../../management.rst:102
diff --git a/source/adminguide/locale/pot/networking.pot b/source/adminguide/locale/pot/networking.pot
index 0c5c206..e87206f 100644
--- a/source/adminguide/locale/pot/networking.pot
+++ b/source/adminguide/locale/pot/networking.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -103,7 +103,7 @@
#: ../../networking.rst:73
# 4b159336d5054af78283deb65966e56d
-msgid "A shared network can be accessed by virtual machines that belong to many different accounts. Network Isolation on shared networks is accomplished by using techniques such as security groups, which is supported only in Basic zones in CloudStack 3.0.3 and later versions."
+msgid "A shared network can be accessed by virtual machines that belong to many different accounts. Network Isolation on shared networks is accomplished by using techniques such as security groups, which is supported only in Basic zones or Advanced Zones with Security Groups"
msgstr ""
#: ../../networking.rst:78
@@ -458,7 +458,7 @@
#: ../../networking.rst:231
# 22b7bae2bee145399e00d289bccc7917
-msgid "In Select Offering, choose Network Offering."
+msgid "In the left navigation bar, click Service Offerings and choose Network Offering."
msgstr ""
#: ../../networking.rst:233
diff --git a/source/adminguide/locale/pot/networking/acquiring_an_ip_address.pot b/source/adminguide/locale/pot/networking/acquiring_an_ip_address.pot
index 1d9eb2e..9368be2 100644
--- a/source/adminguide/locale/pot/networking/acquiring_an_ip_address.pot
+++ b/source/adminguide/locale/pot/networking/acquiring_an_ip_address.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -38,7 +38,7 @@
#: ../../networking/acquiring_an_ip_address.rst:26
# beaa083fcce64bb48e44a47c9b4ab745
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking/acquiring_an_ip_address.rst:28
diff --git a/source/adminguide/locale/pot/networking/external_firewalls_and_load_balancers.pot b/source/adminguide/locale/pot/networking/external_firewalls_and_load_balancers.pot
index ebe9d94..fa7cea9 100644
--- a/source/adminguide/locale/pot/networking/external_firewalls_and_load_balancers.pot
+++ b/source/adminguide/locale/pot/networking/external_firewalls_and_load_balancers.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -288,7 +288,7 @@
#: ../../networking/external_firewalls_and_load_balancers.rst:262
# 20fc7dedf2cf482d94d8977ac64c6b0d
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking/external_firewalls_and_load_balancers.rst:264
diff --git a/source/adminguide/locale/pot/networking/ip_forwarding_and_firewalling.pot b/source/adminguide/locale/pot/networking/ip_forwarding_and_firewalling.pot
index 009b357..557e19f 100644
--- a/source/adminguide/locale/pot/networking/ip_forwarding_and_firewalling.pot
+++ b/source/adminguide/locale/pot/networking/ip_forwarding_and_firewalling.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -89,7 +89,7 @@
#: ../../networking/ip_forwarding_and_firewalling.rst:65
# d546be88025a4254b8eecf1f0b16bdf0
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking/ip_forwarding_and_firewalling.rst:67
@@ -278,7 +278,7 @@
#: ../../networking/ip_forwarding_and_firewalling.rst:206
# 7fce8b96f6e64727bb6063766c828bdd
-msgid "In Select Offering, choose Network Offering."
+msgid "In the left navigation bar, click Service Offerings and choose Network Offering."
msgstr ""
#: ../../networking/ip_forwarding_and_firewalling.rst:208
diff --git a/source/adminguide/locale/pot/networking/multiple_subnets_in_shared_network.pot b/source/adminguide/locale/pot/networking/multiple_subnets_in_shared_network.pot
index ca77e68..2c3d0fb 100644
--- a/source/adminguide/locale/pot/networking/multiple_subnets_in_shared_network.pot
+++ b/source/adminguide/locale/pot/networking/multiple_subnets_in_shared_network.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -78,7 +78,7 @@
#: ../../networking/multiple_subnets_in_shared_network.rst:56
# 9d6f09662ceb452bb8bf26c21696a7ff
-msgid "On Zones, click View More, then click the zone to which you want to work with.."
+msgid "Click Zones and select the zone you'd like to modify.."
msgstr ""
#: ../../networking/multiple_subnets_in_shared_network.rst:59
diff --git a/source/adminguide/locale/pot/networking/portable_ips.pot b/source/adminguide/locale/pot/networking/portable_ips.pot
index d21b851..3010ab2 100644
--- a/source/adminguide/locale/pot/networking/portable_ips.pot
+++ b/source/adminguide/locale/pot/networking/portable_ips.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -160,7 +160,7 @@
#: ../../networking/portable_ips.rst:96
# a7dc83315ae746af830094d45cfe7c11
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking/portable_ips.rst:98
diff --git a/source/adminguide/locale/pot/networking/releasing_an_ip_address.pot b/source/adminguide/locale/pot/networking/releasing_an_ip_address.pot
index 0a982ef..7e3f070 100644
--- a/source/adminguide/locale/pot/networking/releasing_an_ip_address.pot
+++ b/source/adminguide/locale/pot/networking/releasing_an_ip_address.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -43,7 +43,7 @@
#: ../../networking/releasing_an_ip_address.rst:30
# 1e70144ba5394954a2c92850335b7555
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking/releasing_an_ip_address.rst:32
diff --git a/source/adminguide/locale/pot/networking/remote_access_vpn.pot b/source/adminguide/locale/pot/networking/remote_access_vpn.pot
index b7806e1..63a825d 100644
--- a/source/adminguide/locale/pot/networking/remote_access_vpn.pot
+++ b/source/adminguide/locale/pot/networking/remote_access_vpn.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -117,7 +117,7 @@
#: ../../networking/remote_access_vpn.rst:82
# a23f38b6e2c8464bb754dcb7965bd45e
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking/remote_access_vpn.rst:84
diff --git a/source/adminguide/locale/pot/networking/static_nat.pot b/source/adminguide/locale/pot/networking/static_nat.pot
index 20773ee..ec43fe1 100644
--- a/source/adminguide/locale/pot/networking/static_nat.pot
+++ b/source/adminguide/locale/pot/networking/static_nat.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -58,7 +58,7 @@
#: ../../networking/static_nat.rst:42
# 0898722d18384a89a217a7a8e7cb6fbf
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking/static_nat.rst:44
diff --git a/source/adminguide/locale/pot/networking/virtual_private_cloud_config.pot b/source/adminguide/locale/pot/networking/virtual_private_cloud_config.pot
index e589c54..d3965b1 100644
--- a/source/adminguide/locale/pot/networking/virtual_private_cloud_config.pot
+++ b/source/adminguide/locale/pot/networking/virtual_private_cloud_config.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -1547,7 +1547,7 @@
#: ../../networking/virtual_private_cloud_config.rst:1165
# 2e6d402ef3d044488597c6501ca6749d
# f974a014675745ceae4ebb19113bc49e
-msgid "From the Select Offering drop-down, choose Network Offering."
+msgid "Naviagte to Service Offerings and choose Network OfferingPublic IP Addresses."
msgstr ""
#: ../../networking/virtual_private_cloud_config.rst:961
diff --git a/source/adminguide/locale/pot/networking2.pot b/source/adminguide/locale/pot/networking2.pot
index a2f6fbd..2a3e8f1 100644
--- a/source/adminguide/locale/pot/networking2.pot
+++ b/source/adminguide/locale/pot/networking2.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -1745,7 +1745,7 @@
# 9751f6d58300447198381c3549bd481e
# f8c3a0b896d14361b59692083c989410
# 4bccc75dc7d0449097629003483b3545
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking2.rst:1274
@@ -1857,7 +1857,7 @@
#: ../../networking2.rst:1367
# 1f05243395c24667a0f7e9c75bbc190f
-msgid "On Zones, click View More, then click the zone to which you want to work with.."
+msgid "Click Zones and select the zone you'd like to modify.."
msgstr ""
#: ../../networking2.rst:1372
@@ -3831,7 +3831,7 @@
#: ../../networking2.rst:3645
# 9289d78fd54546e3ac890ba5e790db43
-msgid "In Select Offering, choose Network Offering."
+msgid "In the left navigation bar, click Service Offerings and choose Network Offering."
msgstr ""
#: ../../networking2.rst:3649
@@ -6272,7 +6272,7 @@
#: ../../networking2.rst:6482
# bfaeb8a949fb4d25a618540dcc365471
# 6c6e4ac1110442ba9ec325328e96bfb8
-msgid "From the Select Offering drop-down, choose Network Offering."
+msgid "Naviagte to Service Offerings and choose Network OfferingPublic IP Addresses."
msgstr ""
#: ../../networking2.rst:6185
diff --git a/source/adminguide/locale/pot/networking_and_traffic.pot b/source/adminguide/locale/pot/networking_and_traffic.pot
index 303e0c6..8bbbf41 100644
--- a/source/adminguide/locale/pot/networking_and_traffic.pot
+++ b/source/adminguide/locale/pot/networking_and_traffic.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -1749,7 +1749,7 @@
# d605e8bf3fb74b278bf0d265f1db6084
# 5f4eacd3a2ba48349a41f04f8756ee37
# ba3dfb6ca3af4d51a17fa31861d95379
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr ""
#: ../../networking/portable_ips.rst:98
@@ -1861,7 +1861,7 @@
#: ../../networking/multiple_subnets_in_shared_network.rst:56
# 5dead61f678f4f708dc471eb41eb51d7
-msgid "On Zones, click View More, then click the zone to which you want to work with.."
+msgid "Click Zones and select the zone you'd like to modify.."
msgstr ""
#: ../../networking/multiple_subnets_in_shared_network.rst:59
@@ -3818,7 +3818,7 @@
#: ../../networking/ip_forwarding_and_firewalling.rst:206
# be40a0ea880c4159a9d420c70881eeba
-msgid "In Select Offering, choose Network Offering."
+msgid "In the left navigation bar, click Service Offerings and choose Network Offering."
msgstr ""
#: ../../networking/ip_forwarding_and_firewalling.rst:208
@@ -6263,7 +6263,7 @@
#: ../../networking/virtual_private_cloud_config.rst:1165
# d6358f1cb80b45c6becf012d6670f0ff
# 19877c93762c4d95b38bfafc90fc110c
-msgid "From the Select Offering drop-down, choose Network Offering."
+msgid "Naviagte to Service Offerings and choose Network OfferingPublic IP Addresses."
msgstr ""
#: ../../networking/virtual_private_cloud_config.rst:963
diff --git a/source/adminguide/locale/pot/projects.pot b/source/adminguide/locale/pot/projects.pot
index e29ee05..882bd88 100644
--- a/source/adminguide/locale/pot/projects.pot
+++ b/source/adminguide/locale/pot/projects.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
+# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -233,17 +233,6 @@
msgid "In the left navigation, click Projects."
msgstr ""
-#: ../../projects.rst:162
-#: ../../projects.rst:286
-#: ../../projects.rst:330
-#: ../../projects.rst:382
-# 028c250e7e6144e2a78bcb28aeb20c20
-# 2eb7b64a81f44d6381ff74cb4876454f
-# ced1ffd77bfc4a769d87a1e02b4f605b
-# c52047f8f2064bb2a2e81d5aa52a4c86
-msgid "In Select View, choose Projects."
-msgstr ""
-
#: ../../projects.rst:164
#: ../../projects.rst:288
#: ../../projects.rst:332
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/hosts.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/hosts.po
index 254e584..7b0786a 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/hosts.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/hosts.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -457,7 +457,7 @@
# 43467fc7868049cab2d4374ff0094af1
#: ../../hosts.rst:261
msgid ""
-"The administrator can also set global default over-provisioning ratios in "
+"The administrator can also set global default over-provisioning factors in "
"the cpu.overprovisioning.factor and mem.overprovisioning.factor global "
"configuration variables. The default value of these variables is 1: over-"
"provisioning is turned off by default."
@@ -466,7 +466,7 @@
# 253e39db71ed47619ec617fb7a5397ac
#: ../../hosts.rst:266
msgid ""
-"Over-provisioning ratios are dynamically substituted in CloudStack's "
+"over-provisioning factors are dynamically substituted in CloudStack's "
"capacity calculations. For example:"
msgstr "超配比率是由CloudStack的容量计算器动态调整的。比如："
@@ -490,8 +490,8 @@
# fdd299fb9bed44d696ed49d97cd8779d
#: ../../hosts.rst:278
msgid ""
-"The administrator can specify a memory over-provisioning ratio, and can "
-"specify both CPU and memory over-provisioning ratios on a per-cluster basis."
+"The administrator can specify a memory over-provisioning factor, and can "
+"specify both CPU and memory over-provisioning factors on a per-cluster basis."
msgstr "管理员可以在每个群集中指定一个内存超配比率，也可以同时指定CPU和内存超配比率。"
# 13239c1da0164d2e88a9275d8083e8aa
@@ -514,7 +514,7 @@
"(assigning a specific cluster to an account) to effectively offer different "
"levels of service to different accounts. For example, an account paying for "
"a more expensive level of service could be assigned to a dedicated cluster "
-"with an over-provisioning ratio of 1, and a lower-paying account to a "
+"with an over-provisioning factor of 1, and a lower-paying account to a "
"cluster with a ratio of 2."
msgstr "超配设置和专用资源（对一个账号分配一个特定的群集）一起使用时能对不同用户有效的提供的不同服务级别。比如，一个账号购买了比较高级别的服务，那么分配给他一个超配比率为1的专用群集，购买低级别服务的账号分配一个比率为2的群集。"
@@ -645,7 +645,7 @@
# fd73c49bd922450fb7a771ebb8586d6d
#: ../../hosts.rst:378
-msgid "Setting Over-Provisioning Ratios"
+msgid "Setting over-provisioning factors"
msgstr "设置存储超配系数"
# 7d8bbd43174f499a98270e1aad9301bd
@@ -664,7 +664,7 @@
"want VMs deployed before the change to adopt the new over-provisioning "
"ratio, you must stop and restart the VMs. When this is done, CloudStack "
"recalculates or scales the used and reserved capacities based on the new "
-"over-provisioning ratios, to ensure that CloudStack is correctly tracking "
+"over-provisioning factors, to ensure that CloudStack is correctly tracking "
"the amount of free capacity."
msgstr "只有在变更之后部署VMs，设置才会生效。如果想让变更之前部署的VMs也能继承新的超配比率，你必须重启VMs。当此操作完成之后，CloudStack会重新计算或者调整已使用的资源，并且基于新的超配比率预留出容量，以保证CloudStack正确的掌握了剩余容量的情况。"
@@ -680,7 +680,7 @@
# 443b0ee66d0b40bdad6e11ac6c4eb123
#: ../../hosts.rst:400
-msgid "To change the over-provisioning ratios for an existing cluster:"
+msgid "To change the over-provisioning factors for an existing cluster:"
msgstr "在已存在的群集中更改超配系数："
# b796b807352f4f8285fca177e9417577
@@ -690,19 +690,19 @@
# 450e03bbb9974112bec16a0dca62c829
#: ../../hosts.rst:406
-msgid "Under Clusters, click View All."
+msgid "Select Clusters."
msgstr "在群集页面，点击查看所有。"
# dc9598fec6f74c74a82c2311ff962b5d
#: ../../hosts.rst:408
-msgid "Select the cluster you want to work with, and click the Edit button."
+msgid "Search for overprovisioning."
msgstr "选择你要操作的群集，点击编辑按钮。"
# 4574765089c64df0a53ffd4b0d9052a0
#: ../../hosts.rst:410
msgid ""
"Fill in your desired over-provisioning multipliers in the fields CPU "
-"overcommit ratio and RAM overcommit ratio. The value which is intially shown"
+"overcommit factor and RAM overcommit factor. The value which is intially shown"
" in these fields is the default value inherited from the global "
"configuration settings."
msgstr "在CPU overcommit ratio和RAM overcommit ratio区域里填入你希望的超配系数。这里的初始值是从全局配置设置里继承而来的。"
@@ -928,8 +928,7 @@
# 7bd96bd6e7fd4c94bd7be28295bd46de
#: ../../hosts.rst:504
msgid ""
-"On Zones, click View More, then click the zone to which you want to work "
-"with."
+"Click Zones and select the zone you'd like to modify."
msgstr "在Zones上，点击查看更多，然后点击你要进行操作的zone。"
# 29ea322032104b06880f1204aa29a145
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/management.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/management.po
index 5374345..585e04b 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/management.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/management.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -152,20 +152,12 @@
# 7d8f4e987714451e9db1c9e749f8b1ca
#: ../../management.rst:91
-msgid ""
-"PRODUCT manages different types of hosts that contains one or more physical "
-"CPU sockets. CPU socket is considered as a unit of measure used for "
-"licensing and billing cloud infrastructure. PRODUCT provides both UI and API"
-" support to collect the CPU socket statistics for billing purpose. The "
-"Infrastructure tab has a new tab for CPU sockets. You can view the "
-"statistics for CPU sockets managed by PRODUCT, which in turn reflects the "
-"size of the cloud. The CPU Socket page will give you the number of hosts and"
-" sockets used for each host type."
+msgid "Cloudstack manages different types of hosts that contains one or more physical CPU sockets. CPU socket is considered as a unit of measure usedfor licensing and billing cloud infrastructure. Cloudstack provides both UI and API support to collect the CPU socket statistics for billing purpose. The Infrastructure tab has a new tab for CPU sockets. You can view the statistics for CPU sockets managed by Cloudstack, which in turn reflects the size of the cloud. The CPU Socket page will give you the number of hosts and sockets used for each host type."
msgstr "生产环境管理着包含一个多个物理CPU端口的不同类型的主机。CPU端口可以看作是一个测量单元，用来授权或制定云架构。生产环境提供UI和API支持来收集CPU端口统计，供订单使用。在架构选项中，有一个新的CPU端口项。可以查看生产环境管理的CPU端口统计数据，这些数据能够反映云的大小。CPU端口页会展示每一主机类型的主机数量及端口数。"
# dec087784ccd48c49189c3f0ed1811a9
#: ../../management.rst:100
-msgid "Log in to the PRODUCT UI."
+msgid "Log in to the Cloudstack UI."
msgstr "登录到CloudStack用户界面。"
# 012d9d141d8745a48fd182b1cab1f8f1
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking.po
index 0d95a6e..8356535 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -125,11 +125,7 @@
# 4b159336d5054af78283deb65966e56d
#: ../../networking.rst:73
-msgid ""
-"A shared network can be accessed by virtual machines that belong to many "
-"different accounts. Network Isolation on shared networks is accomplished by "
-"using techniques such as security groups, which is supported only in Basic "
-"zones in CloudStack 3.0.3 and later versions."
+msgid "A shared network can be accessed by virtual machines that belong to many different accounts. Network Isolation on shared networks is accomplished by using techniques such as security groups, which is supported only in Basic zones or Advanced Zones with Security Groups"
msgstr "共享网络可以被属于不同客户的虚拟机访问。共享网络中的网络隔离通过安全组实现（仅在CloudStack 3.0.3及以后的基本区域中支持）"
# 0eed59cfbc8447e98bc84e58489e3ae7
@@ -500,7 +496,7 @@
# 22b7bae2bee145399e00d289bccc7917
#: ../../networking.rst:231
-msgid "In Select Offering, choose Network Offering."
+msgid "In the left navigation bar, click Service Offerings and choose Network Offering."
msgstr "在选择方案中，选择网络方案。"
# ef1169d122904044a6c0246757cbbb46
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/acquiring_an_ip_address.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/acquiring_an_ip_address.po
index ad1020f..acd92d7 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/acquiring_an_ip_address.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/acquiring_an_ip_address.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -39,7 +39,7 @@
# beaa083fcce64bb48e44a47c9b4ab745
#: ../../networking/acquiring_an_ip_address.rst:26
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# 76867ce630364509a651c09137cab94e
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po
index 384282a..f1e674d 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -395,7 +395,7 @@
# 20fc7dedf2cf482d94d8977ac64c6b0d
#: ../../networking/external_firewalls_and_load_balancers.rst:262
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# aff4544b414847af82ceceb0bd4e3b55
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po
index f4ebdc3..74e9c7c 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -115,7 +115,7 @@
# d546be88025a4254b8eecf1f0b16bdf0
#: ../../networking/ip_forwarding_and_firewalling.rst:65
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# 0c60a7fde5644f9188c0bf190c166890
@@ -361,7 +361,7 @@
# 7fce8b96f6e64727bb6063766c828bdd
#: ../../networking/ip_forwarding_and_firewalling.rst:206
-msgid "In Select Offering, choose Network Offering."
+msgid "In the left navigation bar, click Service Offerings and choose Network Offering."
msgstr "在选择方案中，选择网络方案。"
# ef8895c197ff4343b04aecc73b5a9294
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po
index f919ffc..cc48110 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -91,8 +91,7 @@
# 9d6f09662ceb452bb8bf26c21696a7ff
#: ../../networking/multiple_subnets_in_shared_network.rst:56
msgid ""
-"On Zones, click View More, then click the zone to which you want to work "
-"with.."
+Click Zones and select the zone you'd like to modify.
msgstr "在Zones上，点击查看更多，然后点击你要进行操作的zone.."
# 9a6c131e8dee4829a34a534324f96d6a
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/portable_ips.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/portable_ips.po
index 33859a2..45b28b4 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/portable_ips.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/portable_ips.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -175,7 +175,7 @@
# a7dc83315ae746af830094d45cfe7c11
#: ../../networking/portable_ips.rst:96
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# 64b8eac8ac21402293c2fff5d435a7eb
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/releasing_an_ip_address.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/releasing_an_ip_address.po
index c0ee7f3..49832f0 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/releasing_an_ip_address.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/releasing_an_ip_address.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -47,7 +47,7 @@
# 1e70144ba5394954a2c92850335b7555
#: ../../networking/releasing_an_ip_address.rst:30
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# 3f542514484849b1bfde31aa95ec3a25
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/remote_access_vpn.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/remote_access_vpn.po
index d6fc91e..20bbe71 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/remote_access_vpn.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/remote_access_vpn.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -148,7 +148,7 @@
# a23f38b6e2c8464bb754dcb7965bd45e
#: ../../networking/remote_access_vpn.rst:82
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# ddf12be035374568a290af5640b40e74
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/static_nat.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/static_nat.po
index 4407395..edd0d65 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/static_nat.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/static_nat.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -67,7 +67,7 @@
# 0898722d18384a89a217a7a8e7cb6fbf
#: ../../networking/static_nat.rst:42
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# 5e916ccbf7c94237b104827f38f2ca6a
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/virtual_private_cloud_config.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/virtual_private_cloud_config.po
index 163e960..a407315 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/virtual_private_cloud_config.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/virtual_private_cloud_config.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -1820,7 +1820,7 @@
# f974a014675745ceae4ebb19113bc49e
#: ../../networking/virtual_private_cloud_config.rst:959
#: ../../networking/virtual_private_cloud_config.rst:1165
-msgid "From the Select Offering drop-down, choose Network Offering."
+msgid "Naviagte to Service Offerings and choose Network OfferingPublic IP Addresses."
msgstr "下拉选择方案，选择网络方案："
# 08107e25d3ae4ed5a4e72a9ef68249af
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po
index f2a12a8..494b91a 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
# aguncn <aguncn@163.com>, 2014
# renoshen <shenkuan-ghq@sinosig.com>, 2014
@@ -1970,7 +1970,7 @@
#: ../../networking2.rst:3296 ../../networking2.rst:3339
#: ../../networking2.rst:3382 ../../networking2.rst:3456
#: ../../networking2.rst:3870
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# 667a207d51d24ec19784a9167e8565b8
@@ -2098,8 +2098,7 @@
# 1f05243395c24667a0f7e9c75bbc190f
#: ../../networking2.rst:1367
msgid ""
-"On Zones, click View More, then click the zone to which you want to work "
-"with.."
+Click Zones and select the zone you'd like to modify.
msgstr "在Zones上，点击查看更多，然后点击你要进行操作的zone.."
# 2b58f0a641ae4d80a61839330e31435b
@@ -4909,7 +4908,7 @@
# 9289d78fd54546e3ac890ba5e790db43
#: ../../networking2.rst:3645
-msgid "In Select Offering, choose Network Offering."
+msgid "In the left navigation bar, click Service Offerings and choose Network Offering."
msgstr "在选择方案中，选择网络方案。"
# 09e3077c1dd044d899bb41898736a9b2
@@ -7793,7 +7792,7 @@
# bfaeb8a949fb4d25a618540dcc365471
# 6c6e4ac1110442ba9ec325328e96bfb8
#: ../../networking2.rst:6177 ../../networking2.rst:6482
-msgid "From the Select Offering drop-down, choose Network Offering."
+msgid "Naviagte to Service Offerings and choose Network OfferingPublic IP Addresses."
msgstr "下拉选择方案，选择网络方案："
# 7d4dc49f6e224caa9bee24da2b622a4c
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po
index 7093a23..d6136d3 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -2079,7 +2079,7 @@
#: ../../networking/static_nat.rst:42
#: ../../networking/ip_forwarding_and_firewalling.rst:65
#: ../../networking/remote_access_vpn.rst:82
-msgid "Click View IP Addresses."
+msgid "Click Public IP Addresses."
msgstr "点击查看IP地址。"
# fbc9c26eb4f041618e668c4addb7f051
@@ -2212,8 +2212,7 @@
# 5dead61f678f4f708dc471eb41eb51d7
#: ../../networking/multiple_subnets_in_shared_network.rst:56
msgid ""
-"On Zones, click View More, then click the zone to which you want to work "
-"with.."
+Click Zones and select the zone you'd like to modify.
msgstr "在Zones上，点击查看更多，然后点击你要进行操作的zone.."
# 113bdf0910ef4fa181ae7e1dd6b4965a
@@ -5029,7 +5028,7 @@
# be40a0ea880c4159a9d420c70881eeba
#: ../../networking/ip_forwarding_and_firewalling.rst:206
-msgid "In Select Offering, choose Network Offering."
+msgid "In the left navigation bar, click Service Offerings and choose Network Offering."
msgstr "在选择方案中，选择网络方案。"
# 3b005d62ac404f7a971817f2e813a88a
@@ -8013,7 +8012,7 @@
# 19877c93762c4d95b38bfafc90fc110c
#: ../../networking/virtual_private_cloud_config.rst:959
#: ../../networking/virtual_private_cloud_config.rst:1165
-msgid "From the Select Offering drop-down, choose Network Offering."
+msgid "Naviagte to Service Offerings and choose Network OfferingPublic IP Addresses."
msgstr "下拉选择方案，选择网络方案："
# 34b1dc57da234cfcbef32cbb10126c3c
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/projects.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/projects.po
index dd3a3ed..e1548bc 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/projects.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/projects.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C)
# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
-#
+#
# Translators:
msgid ""
msgstr ""
@@ -305,15 +305,6 @@
msgid "In the left navigation, click Projects."
msgstr "在左侧导航栏点击项目。"
-# 028c250e7e6144e2a78bcb28aeb20c20
-# 2eb7b64a81f44d6381ff74cb4876454f
-# ced1ffd77bfc4a769d87a1e02b4f605b
-# c52047f8f2064bb2a2e81d5aa52a4c86
-#: ../../projects.rst:162 ../../projects.rst:286 ../../projects.rst:330
-#: ../../projects.rst:382
-msgid "In Select View, choose Projects."
-msgstr "在选择视图选择项目。"
-
# af4be7e8b89f4da08c1391967263e362
# dc1fc36ced6d4c48984c0a599e2893ba
# 79ab804df9234bd0af6b4f89d1b545b5
diff --git a/source/adminguide/management.rst b/source/adminguide/management.rst
index c395542..c7b948d 100644
--- a/source/adminguide/management.rst
+++ b/source/adminguide/management.rst
@@ -85,16 +85,16 @@
Reporting CPU Sockets
---------------------
-PRODUCT manages different types of hosts that contains one or more
+Cloudstack manages different types of hosts that contains one or more
physical CPU sockets. CPU socket is considered as a unit of measure used
-for licensing and billing cloud infrastructure. PRODUCT provides both UI
+for licensing and billing cloud infrastructure. Cloudstack provides both UI
and API support to collect the CPU socket statistics for billing
purpose. The Infrastructure tab has a new tab for CPU sockets. You can
-view the statistics for CPU sockets managed by PRODUCT, which in turn
+view the statistics for CPU sockets managed by Cloudstack, which in turn
reflects the size of the cloud. The CPU Socket page will give you the
number of hosts and sockets used for each host type.
-1. Log in to the PRODUCT UI.
+1. Log in to the Cloudstack UI.
2. In the left navigation bar, click Infrastructure.
@@ -150,7 +150,7 @@
.. code:: bash
- # java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar \ org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ input="newpassword123" password="`cat /etc/cloudstack/management/key`" \ verbose=false
+ # java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar \ org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ input="newpassword123" password="`cat /etc/cloudstack/management/key`" \ verbose=false
File encryption type
@@ -166,7 +166,7 @@
.. code:: bash
- db.cloud.password=ENC(encrypted_password_from_above)
+ db.cloud.password=ENC(encrypted_password_from_above)
db.usage.password=ENC(encrypted_password_from_above)
#. After copying the new password over, you can now start CloudStack
@@ -215,112 +215,112 @@
The following is the list of alert type numbers. The current alerts can
be found by calling listAlerts.
-::
-
+::
+
MEMORY = 0 // Available Memory below configured threshold
-::
-
+::
+
CPU = 1 // Unallocated CPU below configured threshold
-::
-
+::
+
STORAGE =2 // Available Storage below configured threshold
-::
-
+::
+
STORAGE_ALLOCATED = 3 // Remaining unallocated Storage is below configured threshold
-::
-
+::
+
PUBLIC_IP = 4 // Number of unallocated virtual network public IPs is below configured threshold
-::
-
+::
+
PRIVATE_IP = 5 // Number of unallocated private IPs is below configured threshold
-::
-
+::
+
SECONDARY_STORAGE = 6 // Available Secondary Storage in availability zone is below configured threshold
-::
-
+::
+
HOST = 7 // Host related alerts like host disconnected
-::
-
+::
+
USERVM = 8 // User VM stopped unexpectedly
-::
-
+::
+
DOMAIN_ROUTER = 9 // Domain Router VM stopped unexpectedly
-::
-
+::
+
CONSOLE_PROXY = 10 // Console Proxy VM stopped unexpectedly
-::
-
+::
+
ROUTING = 11 // Lost connection to default route (to the gateway)
-::
-
+::
+
STORAGE_MISC = 12 // Storage issue in system VMs
-::
-
+::
+
USAGE_SERVER = 13 // No usage server process running
-::
-
+::
+
MANAGMENT_NODE = 14 // Management network CIDR is not configured originally
-::
-
+::
+
DOMAIN_ROUTER_MIGRATE = 15 // Domain Router VM Migration was unsuccessful
-::
-
+::
+
CONSOLE_PROXY_MIGRATE = 16 // Console Proxy VM Migration was unsuccessful
-::
-
+::
+
USERVM_MIGRATE = 17 // User VM Migration was unsuccessful
-::
-
+::
+
VLAN = 18 // Number of unallocated VLANs is below configured threshold in availability zone
-::
-
+::
+
SSVM = 19 // SSVM stopped unexpectedly
-::
-
+::
+
USAGE_SERVER_RESULT = 20 // Usage job failed
-::
-
+::
+
STORAGE_DELETE = 21 // Failed to delete storage pool
-::
-
+::
+
UPDATE_RESOURCE_COUNT = 22 // Failed to update the resource count
-::
-
+::
+
USAGE_SANITY_RESULT = 23 // Usage Sanity Check failed
-::
-
+::
+
DIRECT_ATTACHED_PUBLIC_IP = 24 // Number of unallocated shared network IPs is low in availability zone
-::
-
+::
+
LOCAL_STORAGE = 25 // Remaining unallocated Local Storage is below configured threshold
-::
-
+::
+
RESOURCE_LIMIT_EXCEEDED = 26 //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only
@@ -377,8 +377,8 @@
Syslog manager. To specify multiple external managers, separate the
IP addresses and other configuration values with commas (,).
- .. note::
- The recommended maximum number of SNMP or Syslog managers is 20
+ .. note::
+ The recommended maximum number of SNMP or Syslog managers is 20
for each.
The following example shows how to configure two SNMP managers at IP
@@ -409,7 +409,7 @@
<appender name="ALERTSYSLOG">
<param name="Threshold" value="WARN"/>
<param name="SyslogHosts" value="10.1.1.1,10.1.1.2"/>
- <param name="Facility" value="LOCAL6"/>
+ <param name="Facility" value="LOCAL6"/>
<layout>
<param name="ConversionPattern" value=""/>
</layout>
@@ -448,8 +448,8 @@
#. Set the DNS suffix at the desired scope
- At the network level, the DNS suffix can be assigned through the
- UI when creating a new network, as described in
- `“Adding an Additional Guest Network”
+ UI when creating a new network, as described in
+ `“Adding an Additional Guest Network”
<networking2#adding-an-additional-guest-network>`_ or with the
updateNetwork command in the CloudStack API.
diff --git a/source/adminguide/networking.rst b/source/adminguide/networking.rst
index 6b97075..6bd739a 100644
--- a/source/adminguide/networking.rst
+++ b/source/adminguide/networking.rst
@@ -69,7 +69,7 @@
A shared network can be accessed by virtual machines that belong to many
different accounts. Network Isolation on shared networks is accomplished
by using techniques such as security groups, which is supported only in
-Basic zones in CloudStack 3.0.3 and later versions.
+Basic zones or Advanced Zones with Security Groups.
- Shared Networks are created by the administrator
@@ -246,9 +246,7 @@
#. Log in with admin privileges to the CloudStack UI.
-#. In the left navigation bar, click Service Offerings.
-
-#. In Select Offering, choose Network Offering.
+#. In the left navigation bar, click Service Offerings and choose Network Offering.
#. Click Add Network Offering.
diff --git a/source/adminguide/networking/acquiring_an_ip_address.rst b/source/adminguide/networking/acquiring_an_ip_address.rst
index b6556db..0b08e4f 100644
--- a/source/adminguide/networking/acquiring_an_ip_address.rst
+++ b/source/adminguide/networking/acquiring_an_ip_address.rst
@@ -12,7 +12,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
Acquiring a New IP Address
--------------------------
@@ -23,7 +23,7 @@
#. Click the name of the network where you want to work with.
-#. Click View IP Addresses.
+#. Click the Public IP Addresses tab.
#. Click Acquire New IP.
diff --git a/source/adminguide/networking/advanced_zone_config.rst b/source/adminguide/networking/advanced_zone_config.rst
index 63027b3..6ada489 100644
--- a/source/adminguide/networking/advanced_zone_config.rst
+++ b/source/adminguide/networking/advanced_zone_config.rst
@@ -43,17 +43,17 @@
#. Provide the following information:
- **Name**: The name of the network. This will be user-visible
-
+
- **Display Text**: The description of the network. This will be
user-visible
-
+
- **Zone**: The zone in which you are configuring the guest network.
-
+
- **Network offering**: If the administrator has configured multiple
network offerings, select the one you want to use for this network
-
+
- **Guest Gateway**: The gateway that the guests should use
-
+
- **Guest Netmask**: The netmask in use on the subnet the guests
will use
diff --git a/source/adminguide/networking/external_firewalls_and_load_balancers.rst b/source/adminguide/networking/external_firewalls_and_load_balancers.rst
index c0a2caa..91f5898 100644
--- a/source/adminguide/networking/external_firewalls_and_load_balancers.rst
+++ b/source/adminguide/networking/external_firewalls_and_load_balancers.rst
@@ -31,8 +31,8 @@
up an external load balancer when you want to provide load balancing
through means other than CloudStack's provided virtual router.
-.. note::
- In a Basic zone, load balancing service is supported only if
+.. note::
+ In a Basic zone, load balancing service is supported only if
Elastic IP or Elastic LB services are enabled.
When NetScaler load balancer is used to provide EIP or ELB services in a
@@ -173,7 +173,7 @@
system startup:
.. code:: bash
-
+
chkconfig snmpd on
@@ -238,7 +238,7 @@
creates a rule, specifies an algorithm, and assigns the rule to a set of
VMs.
-.. note::
+.. note::
If you create load balancing rules while using a network service
offering that includes an external load balancer device such as
NetScaler, and later change the network service offering to one that
@@ -259,12 +259,11 @@
#. Click the name of the network where you want to load balance the
traffic.
-#. Click View IP Addresses.
+#. Click Public IP Addresses.
-#. Click the IP address for which you want to create the rule, then
- click the Configuration tab.
+#. Click the IP address for which you want to create the rule.
-#. In the Load Balancing node of the diagram, click View All.
+#. Click the Load Balancing tab.
In a Basic zone, you can also create a load balancing rule without
acquiring or selecting an IP address. CloudStack internally assign an
@@ -420,7 +419,7 @@
system's health and work in unison with CloudStack to initiate scale-up
or scale-down actions.
-.. note::
+.. note::
AutoScale is supported on NetScaler Release 10 Build 74.4006.e and beyond.
@@ -433,8 +432,8 @@
AutoScale. When a VM is deployed by using a template and when it
comes up, the application should be up and running.
- .. note::
- If the application is not running, the NetScaler device considers the
+ .. note::
+ If the application is not running, the NetScaler device considers the
VM as ineffective and continues provisioning the VMs unconditionally
until the resource limit is exhausted.
@@ -448,9 +447,9 @@
monitor the SNMP-based counter, ensure that the SNMP agent is
installed in the template used for creating the AutoScale VMs, and
the SNMP operations work with the configured SNMP community and port
- by using standard SNMP managers. For example, see
- `"Configuring SNMP Community String on a RHELServer"
- <#configuring-snmp-community-string-on-a-rhel-server>`_
+ by using standard SNMP managers. For example, see
+ `"Configuring SNMP Community String on a RHELServer"
+ <#configuring-snmp-community-string-on-a-rhel-server>`_
to configure SNMP on a RHEL machine.
- Ensure that the endpointe.url parameter present in the Global
@@ -504,7 +503,7 @@
rule has at least the configured number of active VM instances are
available to serve the traffic.
- .. note::
+ .. note::
If an application, such as SAP, running on a VM instance is down for
some reason, the VM is then not counted as part of Min Instance
parameter, and the AutoScale feature initiates a scaleup action if
@@ -525,7 +524,7 @@
leads to a single load balancing rule exhausting the VM instances
limit specified at the account or domain level.
- .. note::
+ .. note::
If an application, such as SAP, running on a VM instance is down for
some reason, the VM is not counted as part of Max Instance parameter.
So there may be scenarios where the number of VMs provisioned for a
diff --git a/source/adminguide/networking/ip_forwarding_and_firewalling.rst b/source/adminguide/networking/ip_forwarding_and_firewalling.rst
index 0999eb7..e13fe63 100644
--- a/source/adminguide/networking/ip_forwarding_and_firewalling.rst
+++ b/source/adminguide/networking/ip_forwarding_and_firewalling.rst
@@ -62,11 +62,11 @@
#. Click the name of the network where you want to work with.
-#. Click View IP Addresses.
+#. Click Public IP Addresses tab.
#. Click the IP address you want to work with.
-#. Click the Configuration tab and fill in the following values.
+#. Click the Firewall tab and fill in the following values.
- **Source CIDR**: (Optional) To accept only traffic from IP
addresses within a particular address block, enter a CIDR or a
@@ -203,7 +203,7 @@
#. In the left navigation bar, click Service Offerings.
- #. In Select Offering, choose Network Offering.
+ #. In the left navigation bar, click Service Offerings and choose Network Offering.
#. Click Add Network Offering.
@@ -255,12 +255,10 @@
#. Click the name of the guest network where the VMs are running.
#. Choose an existing IP address or acquire a new IP address. See
- `"Acquiring a New IP Address" <#acquiring-a-new-ip-address>`_.
+ `"Acquiring a New IP Address" <#acquiring-a-new-ip-address>`_.
Click the name of the IP address in the list.
-#. Click the Configuration tab.
-
-#. In the Port Forwarding node of the diagram, click View All.
+#. Click the Port Forwarding tab.
#. Fill in the following:
diff --git a/source/adminguide/networking/ip_reservation_in_guest_networks.rst b/source/adminguide/networking/ip_reservation_in_guest_networks.rst
index 021fd79..028f504 100644
--- a/source/adminguide/networking/ip_reservation_in_guest_networks.rst
+++ b/source/adminguide/networking/ip_reservation_in_guest_networks.rst
@@ -67,16 +67,16 @@
network creation:
.. cssclass:: table-striped table-bordered table-hover
-
+
===== ============= ============== ======================================== ========================================================
Case CIDR Network CIDR Reserved IP Range for Non-CloudStack VMs Description
===== ============= ============== ======================================== ========================================================
1 10.1.1.0/24 None None No IP Reservation.
2 10.1.1.0/26 10.1.1.0/24 10.1.1.64 to 10.1.1.254 IP Reservation configured by the UpdateNetwork API with
- guestvmcidr=10.1.1.0/26 or enter 10.1.1.0/26 in the CIDR
+ guestvmcidr=10.1.1.0/26 or enter 10.1.1.0/26 in the CIDR
field in the UI.
3 10.1.1.0/24 None None Removing IP Reservation by the UpdateNetwork API with
- guestvmcidr=10.1.1.0/24 or enter 10.1.1.0/24 in the CIDR
+ guestvmcidr=10.1.1.0/24 or enter 10.1.1.0/24 in the CIDR
field in the UI.
===== ============= ============== ======================================== ========================================================
@@ -111,9 +111,7 @@
#. Click the name of the network you want to modify.
-#. In the Details tab, click Edit. |ip-edit-icon.png|
-
- The CIDR field changes to editable one.
+#. Click Edit. |ip-edit-icon.png|
#. In CIDR, specify the Guest VM CIDR.
diff --git a/source/adminguide/networking/isolation_in_advanced_zone_with_vlan.rst b/source/adminguide/networking/isolation_in_advanced_zone_with_vlan.rst
index 745facc..aaa1158 100644
--- a/source/adminguide/networking/isolation_in_advanced_zone_with_vlan.rst
+++ b/source/adminguide/networking/isolation_in_advanced_zone_with_vlan.rst
@@ -12,7 +12,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
Isolation in Advanced Zone Using Private VLANs
-----------------------------------------------
@@ -20,7 +20,7 @@
About PVLANs (Secondary VLANs)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The clasic use-case for PVLANs is a shared backup network, where you wish all users'
+The clasic use-case for PVLANs is a shared backup network, where you wish all users'
hosts to be able to communicate with a backup host, but not with each other.
|pvlans.png|
@@ -41,18 +41,15 @@
Of the three types of Private VLAN (promiscuous, community and isolated),
CloudStack supports **one promiscuous** PVLAN, **one isolated** PVLAN and **multiple community** PVLANs **per
-primary VLAN**.
+primary VLAN**.
PVLANs are currently supported on shared and layer 2 networks.
The PVLAN concept is supported on KVM (when using OVS), XenServer (when using OVS), and VMware hypervisors
- .. note::
+ .. note::
OVS on XenServer and KVM does not support PVLAN natively. Therefore,
CloudStack managed to simulate PVLAN on OVS for XenServer and KVM by
modifying the flow table.
- .. note::
- Community PVLANs are only currently supported on VMware hypervisors.
-
Prerequisites
~~~~~~~~~~~~~
diff --git a/source/adminguide/networking/multiple_guest_networks.rst b/source/adminguide/networking/multiple_guest_networks.rst
index dd90f66..f7900cd 100644
--- a/source/adminguide/networking/multiple_guest_networks.rst
+++ b/source/adminguide/networking/multiple_guest_networks.rst
@@ -48,7 +48,7 @@
#. In the left navigation, choose Network.
-#. Click Add guest network. Provide the following information:
+#. Click Add Network and select the Isolated tab. Provide the following information:
- **Name**: The name of the network. This will be user-visible.
@@ -64,9 +64,9 @@
network offerings, select the one you want to use for this
network.
- - **Guest Gateway**: The gateway that the guests should use.
+ - **Gateway**: The gateway that the guests should use.
- - **Guest Netmask**: The netmask in use on the subnet the guests
+ - **Netmask**: The netmask in use on the subnet the guests
will use.
#. Click Create.
diff --git a/source/adminguide/networking/multiple_ips_on_single_nic.rst b/source/adminguide/networking/multiple_ips_on_single_nic.rst
index b67109a..8cd7fb7 100644
--- a/source/adminguide/networking/multiple_ips_on_single_nic.rst
+++ b/source/adminguide/networking/multiple_ips_on_single_nic.rst
@@ -69,7 +69,7 @@
#. Click the name of the instance you want to work with.
-#. In the Details tab, click NICs.
+#. Click the NICs tab.
#. Click View Secondary IPs.
diff --git a/source/adminguide/networking/multiple_subnets_in_shared_network.rst b/source/adminguide/networking/multiple_subnets_in_shared_network.rst
index c44c449..d172757 100644
--- a/source/adminguide/networking/multiple_subnets_in_shared_network.rst
+++ b/source/adminguide/networking/multiple_subnets_in_shared_network.rst
@@ -53,8 +53,7 @@
#. In the left navigation, choose Infrastructure.
-#. On Zones, click View More, then click the zone to which you want to
- work with..
+#. Click Zones and select the zone you'd like to modify.
#. Click Physical Network.
diff --git a/source/adminguide/networking/portable_ips.rst b/source/adminguide/networking/portable_ips.rst
index 55b3cd2..a65ca05 100644
--- a/source/adminguide/networking/portable_ips.rst
+++ b/source/adminguide/networking/portable_ips.rst
@@ -12,7 +12,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
Portable IPs
------------
@@ -43,6 +43,12 @@
- Portable IP transfer is available only for static NAT.
+.. note::
+ Portable IPs is currently not supported in the new UI.
+ To manage Portable IPs, please directly invoke the
+ respective APIs or use `cloudmonkey <https://github.com/apache/cloudstack-cloudmonkey>`_,
+ the CLI tool for cloudstack
+
Guidelines
^^^^^^^^^^
@@ -93,7 +99,7 @@
#. Click the name of the network where you want to work with.
-#. Click View IP Addresses.
+#. Click Public IP Addresses.
#. Click Acquire New IP.
diff --git a/source/adminguide/networking/releasing_an_ip_address.rst b/source/adminguide/networking/releasing_an_ip_address.rst
index a662d0d..2815038 100644
--- a/source/adminguide/networking/releasing_an_ip_address.rst
+++ b/source/adminguide/networking/releasing_an_ip_address.rst
@@ -27,7 +27,7 @@
#. Click the name of the network where you want to work with.
-#. Click View IP Addresses.
+#. Click Public IP Addresses.
#. Click the IP address you want to release.
diff --git a/source/adminguide/networking/remote_access_vpn.rst b/source/adminguide/networking/remote_access_vpn.rst
index 4c8413b..5b4f15e 100644
--- a/source/adminguide/networking/remote_access_vpn.rst
+++ b/source/adminguide/networking/remote_access_vpn.rst
@@ -81,7 +81,7 @@
#. Click the name of the network you want to work with.
-#. Click View IP Addresses.
+#. Click Public IP Addresses.
#. Click one of the displayed IP address names.
diff --git a/source/adminguide/networking/site_to_site_vpn.rst b/source/adminguide/networking/site_to_site_vpn.rst
index bb528e9..15224f1 100644
--- a/source/adminguide/networking/site_to_site_vpn.rst
+++ b/source/adminguide/networking/site_to_site_vpn.rst
@@ -1,3 +1,18 @@
+.. 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.
+
.. _setting-s2s-vpn-conn:
Setting Up a Site-to-Site VPN Connection
diff --git a/source/adminguide/networking/static_nat.rst b/source/adminguide/networking/static_nat.rst
index 4e6199e..6e57b36 100644
--- a/source/adminguide/networking/static_nat.rst
+++ b/source/adminguide/networking/static_nat.rst
@@ -39,7 +39,7 @@
#. Click the name of the network where you want to work with.
-#. Click View IP Addresses.
+#. Click Public IP Addresses.
#. Click the IP address you want to work with.
diff --git a/source/adminguide/networking/virtual_private_cloud_config.rst b/source/adminguide/networking/virtual_private_cloud_config.rst
index d802d40..095fa29 100644
--- a/source/adminguide/networking/virtual_private_cloud_config.rst
+++ b/source/adminguide/networking/virtual_private_cloud_config.rst
@@ -963,7 +963,7 @@
#. Log in to the CloudStack UI as a user or admin.
-#. From the Select Offering drop-down, choose Network Offering.
+#. Naviagte to Service Offerings and choose Network Offering.
#. Click Add Network Offering.
@@ -1169,7 +1169,7 @@
#. Log in to the CloudStack UI as a user or admin.
-#. From the Select Offering drop-down, choose Network Offering.
+#. Naviagte to Service Offerings and choose Network OfferingPublic IP Addresses.
#. Click Add Network Offering.
diff --git a/source/adminguide/projects.rst b/source/adminguide/projects.rst
index 899521f..68ceec0 100644
--- a/source/adminguide/projects.rst
+++ b/source/adminguide/projects.rst
@@ -179,8 +179,6 @@
#. In the left navigation, click Projects.
-#. In Select View, choose Projects.
-
#. Click the name of the project you want to work with.
#. Click the Resources tab. This tab lists the current maximum amount
@@ -265,8 +263,6 @@
#. In the left navigation, click Projects.
-#. In Select view, click Projects.
-
#. Click New Project.
#. Give the project a name and description for display to users, then
@@ -334,8 +330,6 @@
#. In the left navigation, click Projects.
-#. In Select View, choose Projects.
-
#. Click the name of the project you want to work with.
#. Click on the `Add Account to Project` button. This will have 2 tabs, one to add account to the project and the other to add a user to the project. Here, we can specify the:
@@ -387,8 +381,6 @@
#. In the left navigation, click Projects.
-#. In Select View, choose Projects.
-
#. Click the name of the project.
#. Click one of the buttons:
diff --git a/source/adminguide/systemvm.rst b/source/adminguide/systemvm.rst
index a5e7f5e..46b95bc 100644
--- a/source/adminguide/systemvm.rst
+++ b/source/adminguide/systemvm.rst
@@ -27,7 +27,7 @@
The System VMs come from a single template. The System VM has the
following characteristics:
-- Debian 7.8 ("wheezy"), 3.2.0 kernel with the latest security
+- Debian 10.8(buster), 4.19.0 kernel with the latest security
patches from the Debian security APT repository
- Has a minimal set of packages installed thereby reducing the attack
@@ -57,7 +57,7 @@
the following location:
.. cssclass:: table-striped table-bordered table-hover
-
+
========== ================================================================================================
Hypervisor Download Location
========== ================================================================================================
@@ -91,15 +91,15 @@
Accessing System VMs
--------------------
-It may sometimes be necessary to access System VMs for diagnostics of certain
-issues, for example if you are experiencing SSVM (Secondary Storage VM)
-connection issues. Use the steps below in order to connect to the SSH console
+It may sometimes be necessary to access System VMs for diagnostics of certain
+issues, for example if you are experiencing SSVM (Secondary Storage VM)
+connection issues. Use the steps below in order to connect to the SSH console
of a running System VM.
-Accessing System VMs over the network requires the use of private keys and
-connecting to System VMs SSH Daemon on port 3922. XenServer/KVM Hypervisors
-store this key at /root/.ssh/id_rsa.cloud on each CloudStack agent. To access
-System VMs running on ESXi, the key is stored on the management server at
+Accessing System VMs over the network requires the use of private keys and
+connecting to System VMs SSH Daemon on port 3922. XenServer/KVM Hypervisors
+store this key at /root/.ssh/id_rsa.cloud on each CloudStack agent. To access
+System VMs running on ESXi, the key is stored on the management server at
/var/lib/cloudstack/management/.ssh/id_rsa.
@@ -107,17 +107,17 @@
#. Log in with admin privileges to the CloudStack UI.
- #. Click Infrastructure, then System VMs, and then click the name of a
+ #. Click Infrastructure, then System VMs, and then click the name of a
running VM.
- #. Take a note of the 'Host', 'Private IP Address' and 'Link Local IP
+ #. Take a note of the 'Host', 'Private IP Address' and 'Link Local IP
Address' of the System VM you wish to access.
#. XenServer/KVM Hypervisors
#. Connect to the Host of which the System VM is running.
- #. SSH to the 'Link Local IP Address' of the System VM from the Host on
+ #. SSH to the 'Link Local IP Address' of the System VM from the Host on
which the VM is running.
Format: ssh -i <path-to-private-key> <link-local-ip> -p 3922
@@ -172,8 +172,8 @@
noVNC is set as the default console viewer which be changed via the
"novnc.console.default" global setting, which is set to true by default.
-.. note::
- The hypervisors will have many ports assigned to VNC usage so that
+.. note::
+ The hypervisors will have many ports assigned to VNC usage so that
multiple VNC sessions can occur simultaneously.
There is never any traffic to the guest virtual IP, and there is no need
@@ -198,7 +198,7 @@
Using a SSL Certificate for the Console Proxy
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-By default, the console viewing functionality uses plaintext HTTP. In
+By default, the console viewing functionality uses plaintext HTTP. In
any production environment, the console proxy connection should be
encrypted via SSL at the minimum.
@@ -206,18 +206,18 @@
communication with SSL:
- Set up a SSL wild-card certificate and domain name resolution
-
+
- Set up SSL certificate for specific FQDN and configure load-balancer
Changing the Console Proxy SSL Certificate and Domain
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The administrator can configure SSL encryption by selecting a domain
-and uploading a new SSL certificate and private key. The domain must
-run a DNS service that is capable of resolving queries for addresses
+The administrator can configure SSL encryption by selecting a domain
+and uploading a new SSL certificate and private key. The domain must
+run a DNS service that is capable of resolving queries for addresses
of the form aaa-bbb-ccc-ddd.your.domain to an IPv4 IP address in the
-form aaa.bbb.ccc.ddd, for example, 202.8.44.1. To change the console
+form aaa.bbb.ccc.ddd, for example, 202.8.44.1. To change the console
proxy domain, SSL certificate, and private key:
#. Set up dynamic name resolution or populate all possible DNS names in
@@ -225,10 +225,10 @@
aaa-bbb-ccc-ddd.consoleproxy.company.com -> aaa.bbb.ccc.ddd.
.. note::
- In these steps you will notice *consoleproxy.company.com* -For
- security best practices, we recommend creating a wildcard SSL
- certificate on a separate subdomain so in the event that the
- certificate is compromised, a malicious user cannot impersonate
+ In these steps you will notice *consoleproxy.company.com* -For
+ security best practices, we recommend creating a wildcard SSL
+ certificate on a separate subdomain so in the event that the
+ certificate is compromised, a malicious user cannot impersonate
a company.com domain.
#. Generate the private key and certificate signing request (CSR). When
@@ -242,7 +242,7 @@
openssl genrsa -des3 -out yourprivate.key 2048
- #. Generate a new certificate CSR. Ensure the creation of a wildcard
+ #. Generate a new certificate CSR. Ensure the creation of a wildcard
certificate, eg ``*.consoleproxy.company.com``
.. code:: bash
@@ -282,8 +282,8 @@
interruption in console availability.
The Management Server generates URLs of the form
-"aaa-bbb-ccc-ddd.consoleproxy.company.com" after this change is made.
-The new console requests will be served with the new DNS domain name,
+"aaa-bbb-ccc-ddd.consoleproxy.company.com" after this change is made.
+The new console requests will be served with the new DNS domain name,
certificate, and key.
Uploading ROOT CA and Intermediate CA
@@ -323,12 +323,12 @@
Load-balancing Console Proxies
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-An alternative to using dynamic DNS or creating a range of DNS entries
+An alternative to using dynamic DNS or creating a range of DNS entries
as described in the last section would be to create a SSL certificate
for a specific domain name, configure CloudStack to use that particular
FQDN, and then configure a load balancer to load balance the console
-proxy's IP address behind the FQDN. As the functionality for this is
-still new, please see
+proxy's IP address behind the FQDN. As the functionality for this is
+still new, please see
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more details.
@@ -375,26 +375,26 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
When CloudStack creates a virtual router, it uses default settings which
-are defined in a default system service offering. See `“System Service
+are defined in a default system service offering. See `“System Service
Offerings” <#system-service-offerings>`_. All the
virtual routers in a single guest network use the same system service
offering. You can upgrade the capabilities of the virtual router by
creating and applying a custom system service offering.
-#. Define your custom system service offering.
- See `“Creating a New System Service Offering”
- <#creating-a-new-system-service-offering>`_.
+#. Define your custom system service offering.
+ See `“Creating a New System Service Offering”
+ <#creating-a-new-system-service-offering>`_.
In System VM Type, choose Domain Router.
#. Associate the system service offering with a network offering. See
- `“Creating a New Network Offering”
+ `“Creating a New Network Offering”
<networking.html#creating-a-new-network-offering>`_.
#. Apply the network offering to the network where you want the virtual
routers to use the new system service offering. If this is a new
network, follow the steps in Adding an Additional Guest Network on
page 66. To change the service offering for existing virtual routers,
- follow the steps in `“Changing the Network Offering on a Guest Network”
+ follow the steps in `“Changing the Network Offering on a Guest Network”
<advanced_zone_config.html#changing-the-network-offering-on-a-guest-network>`_.
@@ -405,26 +405,26 @@
deletes all the iptables rules. To work around this issue, stop the
virtual router and start it from the CloudStack UI.
-- .. warning::
- Do not use the destroyRouter API when only one router is available
- in the network, because restartNetwork API with the cleanup=false
- parameter can't recreate it later. If you want to destroy and
- recreate the single router available in the network, use the
+- .. warning::
+ Do not use the destroyRouter API when only one router is available
+ in the network, because restartNetwork API with the cleanup=false
+ parameter can't recreate it later. If you want to destroy and
+ recreate the single router available in the network, use the
restartNetwork API with the cleanup=true parameter.
Service Monitoring Tool for Virtual Router
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Various services running on the CloudStack virtual routers can be
+Various services running on the CloudStack virtual routers can be
monitored by using a Service Monitoring tool. The tool ensures that
-services are successfully running until CloudStack deliberately disables
-them. If a service goes down, the tool automatically attempts to restart
-service, and if that does not help bringing up the service, an alert as
-well as an event is generated indicating the failure. A new global
-parameter, ``network.router.enableservicemonitoring``, has been
-introduced to control this feature. The default value is false, implies,
-monitoring is disabled. When you enable, ensure that the Management
+services are successfully running until CloudStack deliberately disables
+them. If a service goes down, the tool automatically attempts to restart
+service, and if that does not help bringing up the service, an alert as
+well as an event is generated indicating the failure. A new global
+parameter, ``network.router.enableservicemonitoring``, has been
+introduced to control this feature. The default value is false, implies,
+monitoring is disabled. When you enable, ensure that the Management
Server and the router are restarted.
Monitoring tool can help to start a VR service, which is crashed due to
@@ -435,9 +435,9 @@
- The services that are terminated by the OS when memory or CPU is not
sufficiently available for the service.
-.. note::
- Only those services with daemons are monitored. The services that are
- failed due to errors in the service/daemon configuration file cannot
+.. note::
+ Only those services with daemons are monitored. The services that are
+ failed due to errors in the service/daemon configuration file cannot
be restarted by the Monitoring tool. VPC Networks are supported (as of CloudStack 4.14)
The following services are monitored in a VR:
@@ -465,7 +465,7 @@
by the service monitoring script (i.e. trying to restart a stopped service).
As of CloudStack 4.14, the interval at which the service monitoring script runs
-is no more hardcoded to 3 minutes, but is instead controlled via
+is no more hardcoded to 3 minutes, but is instead controlled via
global setting router.health.checks.basic.interval.
@@ -473,13 +473,13 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In addition to monitoring services as of 4.14 CloudStack adds a framework
-for more extensive health checks. The health checks are split into two
-categories - basic and advanced. The two categories have their own admin
-definable intervals. The split is made this way as the advanced health checks
-are considerably more expensive. The health checks will be available on-demand
+for more extensive health checks. The health checks are split into two
+categories - basic and advanced. The two categories have their own admin
+definable intervals. The split is made this way as the advanced health checks
+are considerably more expensive. The health checks will be available on-demand
via API as well as scheduled.
-The following tests are covered: · Basic connectivity from the management server
+The following tests are covered: · Basic connectivity from the management server
to the virtual router
- Basic connectivity to virtual router its interfaces' gateways
@@ -505,166 +505,166 @@
This happens in the following steps:
-1. Management server periodically pushes data to each running virtual router
-including schedule intervals, tests to skip, some configuration for LB, VMs,
+1. Management server periodically pushes data to each running virtual router
+including schedule intervals, tests to skip, some configuration for LB, VMs,
Gateways, etc.
-2. Basic and advanced tests as scheduled as per the intervals in the data sent
-by Management server. Each run of checks populates it’s results and saves it
-within the router at ‘/root/basic_monitor_results.json’ and
-'/root/advance_monitor_results.json’. Each run of checks also keeps
-track of the start time, end time, and duration of test run for better
+2. Basic and advanced tests as scheduled as per the intervals in the data sent
+by Management server. Each run of checks populates it’s results and saves it
+within the router at ‘/root/basic_monitor_results.json’ and
+'/root/advance_monitor_results.json’. Each run of checks also keeps
+track of the start time, end time, and duration of test run for better
understanding.
-3. Each test is also available on demand via ' getRouterHealthCheckResults'
-API added with the patch. The API can be executed from CLI and UI. Performing
+3. Each test is also available on demand via ' getRouterHealthCheckResults'
+API added with the patch. The API can be executed from CLI and UI. Performing
fresh checks is expensive and will cause management server doing the following:
- a. Refresh the data from Management server records on the router for
+ a. Refresh the data from Management server records on the router for
verification (repeat of step 1),
b. Run all the checks of both basic and advanced type,
c. Fetch the result of the health check from router to be sent back in response.
-4. The patch also supports custom health checks with custom systemVM templates.
+4. The patch also supports custom health checks with custom systemVM templates.
This is achieved as follows:
- a. Each executable script placed in '/root/health_scripts/' is considered an
+ a. Each executable script placed in '/root/health_scripts/' is considered an
independent health check and is executed on each scheduled or on demand health check run.
b. The health check script can be in any language but executable (use 'chmod a+x')
- within '/root/health_checks/' directory. The placed script must do the following:
-
+ within '/root/health_checks/' directory. The placed script must do the following:
+
#. Accept a command line parameter for check type (basic or advanced) - this
parameter is sent by the internal cron job in the VR (/etc/cron.d/process)
-
+
#. Proceed and perform checks as per the check type - basic or advanced
-
- #. In order to be recognized as a health check and displayed in the list of health
- checks results, it must print some message to STDOUT which is passed back as message
- to management server - if the script doesn’t return anything on its STDOUT, it
+
+ #. In order to be recognized as a health check and displayed in the list of health
+ checks results, it must print some message to STDOUT which is passed back as message
+ to management server - if the script doesn’t return anything on its STDOUT, it
will not be registered as a health check/displayed in the list of the health check results
- #. exit with status of 0 if check was successful and exit with status of 1 if
+ #. exit with status of 0 if check was successful and exit with status of 1 if
check has failed
.. code:: bash
- #!/bin/bash if [$1 == ‘advanced’] { do advance checks and print any message to STDOUT }
+ #!/bin/bash if [$1 == ‘advanced’] { do advance checks and print any message to STDOUT }
else if [$1 == ‘basic’] { do basic checks and print any message to STDOUT } exit(0) if pass or exit(1) if failure
- #. i.e. if the script is intended to be i.e. a basic check, it must checks
- for the presence of the 'basic' as the first parameter sent to it, and execute the
- wanted commands and print some output to STDOUT; otherwise if it receives 'advanced'
+ #. i.e. if the script is intended to be i.e. a basic check, it must checks
+ for the presence of the 'basic' as the first parameter sent to it, and execute the
+ wanted commands and print some output to STDOUT; otherwise if it receives 'advanced'
as the first parameter, it should not execute any commands/logic nor print anything to STDOUT
-5. There are 9 health check scripts written in default systemvm template in '/root/health_checks/'
+5. There are 9 health check scripts written in default systemvm template in '/root/health_checks/'
folder. These indicate the health checks described in executive summary.
-6. The management server will connect periodically to each virtual router to confirm that the
-checks are running as scheduled, and retrieve the results of those checks. Any failing checks
-present in ``router.health.checks.failures.to.restart.vr`` will cause the VR to be recreated.
+6. The management server will connect periodically to each virtual router to confirm that the
+checks are running as scheduled, and retrieve the results of those checks. Any failing checks
+present in ``router.health.checks.failures.to.restart.vr`` will cause the VR to be recreated.
On each check management server will persist only the last executed check results in its database.
-7. UI parses the returned health check results and shows the router 'Health Check'
+7. UI parses the returned health check results and shows the router 'Health Check'
column in 'Failed'/'Passed' if there are health check failures of any type.
Following global configs have been added for configuring health checks:
- - ``router.health.checks.enabled`` - If true, router health checks are allowed
- to be executed and read. If false, all scheduled checks and API calls for on
+ - ``router.health.checks.enabled`` - If true, router health checks are allowed
+ to be executed and read. If false, all scheduled checks and API calls for on
demand checks are disabled. Default is true.
- - ``router.health.checks.basic.interval`` - Interval in minutes at which basic
- router health checks are performed. If set to 0, no tests are scheduled. Default
+ - ``router.health.checks.basic.interval`` - Interval in minutes at which basic
+ router health checks are performed. If set to 0, no tests are scheduled. Default
is 3 mins as per the pre 4.14 monitor services.
- - ``router.health.checks.advanced.interval`` - Interval in minutes at which
- advanced router health checks are performed. If set to 0, no tests are scheduled.
+ - ``router.health.checks.advanced.interval`` - Interval in minutes at which
+ advanced router health checks are performed. If set to 0, no tests are scheduled.
Default value is 10 minutes.
- ``router.health.checks.config.refresh.interval`` - Interval in minutes at which
- router health checks config - such as scheduling intervals, excluded checks, etc
- is updated on virtual routers by the management server. This value should be
- sufficiently high (like 2x) from the router.health.checks.basic.interval and
- router.health.checks.advanced.interval so that there is time between new results
+ router health checks config - such as scheduling intervals, excluded checks, etc
+ is updated on virtual routers by the management server. This value should be
+ sufficiently high (like 2x) from the router.health.checks.basic.interval and
+ router.health.checks.advanced.interval so that there is time between new results
generation for passed data. Default is 10 mins.
- - ``router.health.checks.results.fetch.interval`` - Interval in minutes at which
- router health checks results are fetched by management server. On each result fetch,
- management server evaluates need to recreate VR as per configuration of
- 'router.health.checks.failures.to.recreate.vr'. This value should be sufficiently
- high (like 2x) from the 'router.health.checks.basic.interval' and
- 'router.health.checks.advanced.interval' so that there is time between new
+ - ``router.health.checks.results.fetch.interval`` - Interval in minutes at which
+ router health checks results are fetched by management server. On each result fetch,
+ management server evaluates need to recreate VR as per configuration of
+ 'router.health.checks.failures.to.recreate.vr'. This value should be sufficiently
+ high (like 2x) from the 'router.health.checks.basic.interval' and
+ 'router.health.checks.advanced.interval' so that there is time between new
results generation and fetch.
- - ``router.health.checks.failures.to.recreate.vr`` - Health checks failures defined
- by this config are the checks that should cause router recreation. If empty the
- recreate is not attempted for any health check failure. Possible values are comma
- separated script names from systemvm’s /root/health_scripts/ (namely - cpu_usage_check.py,
- dhcp_check.py, disk_space_check.py, dns_check.py, gateways_check.py, haproxy_check.py,
- iptables_check.py, memory_usage_check.py, router_version_check.py), connectivity.test
+ - ``router.health.checks.failures.to.recreate.vr`` - Health checks failures defined
+ by this config are the checks that should cause router recreation. If empty the
+ recreate is not attempted for any health check failure. Possible values are comma
+ separated script names from systemvm’s /root/health_scripts/ (namely - cpu_usage_check.py,
+ dhcp_check.py, disk_space_check.py, dns_check.py, gateways_check.py, haproxy_check.py,
+ iptables_check.py, memory_usage_check.py, router_version_check.py), connectivity.test
or services (namely - loadbalancing.service, webserver.service, dhcp.service)
- - ``router.health.checks.to.exclude`` - Health checks that should be excluded when
- executing scheduled checks on the router. This can be a comma separated list of
- script names placed in the '/root/health_checks/' folder. Currently the following
- scripts are placed in default systemvm template - cpu_usage_check.py,
- disk_space_check.py, gateways_check.py, iptables_check.py, router_version_check.py,
+ - ``router.health.checks.to.exclude`` - Health checks that should be excluded when
+ executing scheduled checks on the router. This can be a comma separated list of
+ script names placed in the '/root/health_checks/' folder. Currently the following
+ scripts are placed in default systemvm template - cpu_usage_check.py,
+ disk_space_check.py, gateways_check.py, iptables_check.py, router_version_check.py,
dhcp_check.py, dns_check.py, haproxy_check.py, memory_usage_check.py.
- - ``router.health.checks.free.disk.space.threshold`` - Free disk space threshold
+ - ``router.health.checks.free.disk.space.threshold`` - Free disk space threshold
(in MB) on VR below which the check is considered a failure. Default is 100MB.
- - ``router.health.checks.max.cpu.usage.threshold`` - Max CPU Usage threshold as
+ - ``router.health.checks.max.cpu.usage.threshold`` - Max CPU Usage threshold as
% above which check is considered a failure.
- ``router.health.checks.max.memory.usage.threshold`` - Max Memory Usage threshold
as % above which check is considered a failure.
-The scripts for following health checks are provided in '/root/health_checks/'. These
-are not exhaustive and can be modified for covering other scenarios not covered.
+The scripts for following health checks are provided in '/root/health_checks/'. These
+are not exhaustive and can be modified for covering other scenarios not covered.
Details of individual checks:
1. Basic checks:
- a. Services check (ssh, dnsmasq, httpd, haproxy)– this check is still done as
- per existing monitorServices.py script and any services not running are attempted
+ a. Services check (ssh, dnsmasq, httpd, haproxy)– this check is still done as
+ per existing monitorServices.py script and any services not running are attempted
to be restarted.
- b. Disk space check against a threshold – python's ' statvfs' module is used to
- retrieve statistics and compare with the configured threshold given by
+ b. Disk space check against a threshold – python's ' statvfs' module is used to
+ retrieve statistics and compare with the configured threshold given by
management server.
- c. CPU usage check against a threshold – we use 'top' utility to retrieve idle
+ c. CPU usage check against a threshold – we use 'top' utility to retrieve idle
CPU and compare that with the configured max CPU usage threshold given by management
server.
- d. Memory usage check against a threshold – we use 'free' utility to get the
+ d. Memory usage check against a threshold – we use 'free' utility to get the
used memory and compare that with the configured max memory usage threshold.
- e. Router template and scripts version check – is done by comparing the contents
- of the '/etc/cloudstack-release' and '/var/cache/cloud/cloud-scripts-signature'
+ e. Router template and scripts version check – is done by comparing the contents
+ of the '/etc/cloudstack-release' and '/var/cache/cloud/cloud-scripts-signature'
with the data given by management server.
- f. Connectivity to the gateways from router – this is done by analysing the success
+ f. Connectivity to the gateways from router – this is done by analysing the success
or failure of ping to the gateway IPs given by management server.
2. Advanced checks:
- a. DNS config match against MS – this is checked by comparing entries of '/etc/hosts'
+ a. DNS config match against MS – this is checked by comparing entries of '/etc/hosts'
on the VR and VM records passed by management server.
- b. DHCP config match against MS – this is checked by comparing entries of
- '/etc/dhcphosts.txt' on the VR with the VM entries passed by management server.
-
- c. HA Proxy config match against MS (internal LB and public LB) - this is checked
- by verifying the max connections, and entries for each load balancing rule in the
+ b. DHCP config match against MS – this is checked by comparing entries of
+ '/etc/dhcphosts.txt' on the VR with the VM entries passed by management server.
+
+ c. HA Proxy config match against MS (internal LB and public LB) - this is checked
+ by verifying the max connections, and entries for each load balancing rule in the
'/etc/haproxy/haproxy.cfg' file. We do not check for stickiness properties yet.
- d. Port forwarding match against MS in iptables. - this is checked by verifying
- IPs and ports in the 'iptables-save' command output against an expected list of
+ d. Port forwarding match against MS in iptables. - this is checked by verifying
+ IPs and ports in the 'iptables-save' command output against an expected list of
entries from management server.
diff --git a/source/conceptsandterminology/locale/pot/administration_guide.pot b/source/conceptsandterminology/locale/pot/administration_guide.pot
index b26c37d..9d0aa3b 100644
--- a/source/conceptsandterminology/locale/pot/administration_guide.pot
+++ b/source/conceptsandterminology/locale/pot/administration_guide.pot
@@ -839,22 +839,26 @@
#: ../../administration_guide.rst:355
# 1883429edbe74fdd8a5fb620aec5fdb6
-msgid "CPU and memory (RAM) over-provisioning factors can be set for each cluster to change the number of VMs that can run on each host in the cluster. This helps optimize the use of resources. By increasing the over-provisioning ratio, more resource capacity will be used. If the ratio is set to 1, no over-provisioning is done."
+msgid "CPU and memory (RAM) over-provisioning factors can be set for each
+cluster to change the number of VMs that can run on each host in the
+cluster. This helps optimize the use of resources. By increasing the
+over-provisioning factor, more resource capacity will be used. If the
+factor is set to 1, no over-provisioning is done."
msgstr ""
#: ../../administration_guide.rst:357
# 37b343a408374b90a7a4000a86cf66c1
-msgid "The administrator can also set global default over-provisioning ratios in the cpu.overprovisioning.factor and mem.overprovisioning.factor global configuration variables. The default value of these variables is 1: over-provisioning is turned off by default. Over-provisioning ratios are dynamically substituted in CloudStack's capacity calculations. For example:::"
+msgid "The administrator can also set global default over-provisioning factors in the cpu.overprovisioning.factor and mem.overprovisioning.factor global configuration variables. The default value of these variables is 1: over-provisioning is turned off by default. over-provisioning factors are dynamically substituted in CloudStack's capacity calculations. For example:::"
msgstr ""
#: ../../administration_guide.rst:367
# 10a7f91d1b664361837ca349ac15d8fe
-msgid "The administrator can specify a memory over-provisioning ratio, and can specify both CPU and memory over-provisioning ratios on a per-cluster basis. In any given cloud, the optimum number of VMs for each host is affected by such things as the hypervisor, storage, and hardware configuration. These may be different for each cluster in the same cloud. A single global over-provisioning setting can not provide the best utilization for all the different clusters in the cloud. It has to be set for the lowest common denominator. The per-cluster setting provides a finer granularity for better utilization of resources, no matter where the CloudStack placement algorithm decides to place a VM."
+msgid "The administrator can specify a memory over-provisioning factor, and can specify both CPU and memory over-provisioning factors on a per-cluster basis. In any given cloud, the optimum number of VMs for each host is affected by such things as the hypervisor, storage, and hardware configuration. These may be different for each cluster in the same cloud. A single global over-provisioning setting can not provide the best utilization for all the different clusters in the cloud. It has to be set for the lowest common denominator. The per-cluster setting provides a finer granularity for better utilization of resources, no matter where the CloudStack placement algorithm decides to place a VM."
msgstr ""
#: ../../administration_guide.rst:370
# b0413938593f4a7786b951b21e507d09
-msgid "The overprovisioning settings can be used along with dedicated resources (assigning a specific cluster to an account) to effectively offer different levels of service to different accounts. For example, an account paying for a more expensive level of service could be assigned to a dedicated cluster with an over-provisioning ratio of 1, and a lower-paying account to a cluster with a ratio of 2."
+msgid "The overprovisioning settings can be used along with dedicated resources (assigning a specific cluster to an account) to effectively offer different levels of service to different accounts. For example, an account paying for a more expensive level of service could be assigned to a dedicated cluster with an over-provisioning factor of 1, and a ower-paying account to a cluster with a factor of 2."
msgstr ""
#: ../../administration_guide.rst:372
@@ -956,22 +960,22 @@
#: ../../administration_guide.rst:422
# 842b46aac75e4b55bc95a2884df153b1
-msgid "Setting Over-Provisioning Rations"
+msgid "Setting over-provisioning factorns"
msgstr ""
#: ../../administration_guide.rst:424
# 8d093dbea4db42028ab4bf0469d67452
-msgid "There are two ways the root admin can set CPU and RAM over-provisioning ratios. First, the global configuration settings cpu.overprovisioning.factor and mem.overprovisioning.factor will be applied when a new cluster is created. Later, the ratios can be modified for an existing cluster."
+msgid "There are two ways the root admin can set CPU and RAM over-provisioning factors. First, the global configuration settings cpu.overprovisioning.factor and mem.overprovisioning.factor will be applied when a new cluster is created. Later, the ratios can be modified for an existing cluster."
msgstr ""
#: ../../administration_guide.rst:426
# d585ebbb38104db185a30519f122ef38
-msgid "Only VMs deployed after the change are affected by the new setting. If you want VMs deployed before the change to adopt the new over-provisioning ratio, you must stop and restart the VMs. When this is done, CloudStack recalculates or scales the used and reserved capacities based on the new over-provisioning ratios, to ensure that CloudStack is correctly tracking the amount of free capacity."
+msgid "Only VMs deployed after the change are affected by the new setting. If you want VMs deployed before the change to adopt the new over-provisioning factor, you must stop and restart the VMs. When this is done, CloudStack recalculates or scales the used and reserved capacities based on the new over-provisioning factors, to ensure that CloudStack is correctly tracking the amount of free capacity."
msgstr ""
#: ../../administration_guide.rst:428
# b3bf39b26142443c92ac98f1aa4e7be4
-msgid "To change the over-provisioning ratios for an existing cluster:"
+msgid "To change the over-provisioning factors for an existing cluster:"
msgstr ""
#: ../../administration_guide.rst:430
@@ -981,17 +985,17 @@
#: ../../administration_guide.rst:432
# a64dd51e12c547658db1ade7de98ebd2
-msgid "Under Clusters, click View All."
+msgid "Select Clusters."
msgstr ""
#: ../../administration_guide.rst:433
# 23c09f71b4e04bad89d9fc8af656468c
-msgid "Select the cluster you want to work with, and click the Edit button."
+msgid "Search for overprovisioning."
msgstr ""
#: ../../administration_guide.rst:434
# 0e804d9f17db4c8a981a54fd41556317
-msgid "Fill in your desired over-provisioning multipliers in the fields CPU overcommit ratio and RAM overcommit ratio. The value which is intially shown in these fields is the default value inherited from the global configuration settings."
+msgid "Fill in your desired over-provisioning multipliers in the fields CPU overcommit factor and RAM overcommit factor. The value which is intially shown in these fields is the default value inherited from the global configuration settings."
msgstr ""
#: ../../administration_guide.rst:437
diff --git a/source/conceptsandterminology/network_setup.rst b/source/conceptsandterminology/network_setup.rst
index e78a450..feed58a 100644
--- a/source/conceptsandterminology/network_setup.rst
+++ b/source/conceptsandterminology/network_setup.rst
@@ -26,13 +26,13 @@
CloudStack provides two styles of networking:.
**Basic**
-For AWS-style networking. Provides a single network where guest isolation can
-be provided through layer-3 means such as security groups (IP address source
+For AWS-style networking. Provides a single network where guest isolation can
+be provided through layer-3 means such as security groups (IP address source
filtering).
**Advanced**
-For more sophisticated network topologies. This network model provides the
-most flexibility in defining guest networks, but requires more configuration
+For more sophisticated network topologies. This network model provides the
+most flexibility in defining guest networks, but requires more configuration
steps than basic networking.
Each zone has either basic or advanced networking. Once the choice of
@@ -515,15 +515,15 @@
#. Deploy and configure Cisco VNMC.
- For more information, see
- `Installing Cisco Virtual Network Management Center
+ For more information, see
+ `Installing Cisco Virtual Network Management Center
<http://www.cisco.com/en/US/docs/switches/datacenter/vsg/sw/4_2_1_VSG_2_1_1/install_upgrade/guide/b_Cisco_VSG_for_VMware_vSphere_Rel_4_2_1_VSG_2_1_1_and_Cisco_VNMC_Rel_2_1_Installation_and_Upgrade_Guide_chapter_011.html>`_
- and `Configuring Cisco Virtual Network Management Center
+ and `Configuring Cisco Virtual Network Management Center
<http://www.cisco.com/en/US/docs/unified_computing/vnmc/sw/1.2/VNMC_GUI_Configuration/b_VNMC_GUI_Configuration_Guide_1_2_chapter_010.html>`_.
#. Register Cisco Nexus 1000v dvSwitch with Cisco VNMC.
- For more information, see `Registering a Cisco Nexus 1000V with Cisco VNMC
+ For more information, see `Registering a Cisco Nexus 1000V with Cisco VNMC
<http://www.cisco.com/en/US/docs/switches/datacenter/vsg/sw/4_2_1_VSG_1_2/vnmc_and_vsg_qi/guide/vnmc_vsg_install_5register.html#wp1064301>`_.
#. Create Inside and Outside port profiles in Cisco Nexus 1000v dvSwitch.
@@ -532,7 +532,7 @@
#. Deploy and Cisco ASA 1000v appliance.
- For more information, see `Setting Up the ASA 1000V Using VNMC
+ For more information, see `Setting Up the ASA 1000V Using VNMC
<http://www.cisco.com/en/US/docs/security/asa/quick_start/asa1000V/setup_vnmc.html>`_.
Typically, you create a pool of ASA 1000v appliances and register
@@ -668,7 +668,7 @@
#. Log in to the CloudStack UI as a user or admin.
-#. From the Select Offering drop-down, choose Network Offering.
+#. Naviagte to Service Offerings and choose Network OfferingPublic IP Addresses.
#. Click Add Network Offering.
@@ -987,7 +987,7 @@
#. On your network infrastructure, install Traffic Sentinel and
configure it to gather traffic data. For installation and
- configuration steps, see inMon documentation at
+ configuration steps, see inMon documentation at
`Traffic Sentinel Documentation <http://inmon.com.>`_.
#. In the Traffic Sentinel UI, configure Traffic Sentinel to accept
@@ -1002,7 +1002,7 @@
CloudStack API command addTrafficMonitor. Pass in the URL of the
Traffic Sentinel as protocol + host + port (optional); for example,
http://10.147.28.100:8080. For the addTrafficMonitor command syntax,
- see the API Reference at `API Documentation
+ see the API Reference at `API Documentation
<https://cloudstack.apache.org/api.html>`_.
For information about how to call the CloudStack API, see the
diff --git a/source/developersguide/developer_guide.rst b/source/developersguide/developer_guide.rst
index 4add3fb..e4484b5 100644
--- a/source/developersguide/developer_guide.rst
+++ b/source/developersguide/developer_guide.rst
@@ -46,7 +46,7 @@
To build and test CloudStack from source you will need the following
installed:
-* jdk 8+ (openjdk-8-jdk)
+* jdk 11+ (openjdk-11-jdk)
* maven 3+
* git
* python-pip
@@ -60,7 +60,7 @@
::
apt update
- apt install openjdk-8-jdk-headless maven git python-pip mkisofs git mysql-server
+ apt install openjdk-11-jdk-headless maven git python-pip mkisofs git mysql-server
Example CentOS 7
~~~~~~~~~~~~~~~~
@@ -69,7 +69,7 @@
yum install -y epel-release
yum localinstall -y http://dev.mysql.com/get/mysql-community-release-el7-5.noarch.rpm
- yum install -y java-1.8.0-openjdk-devel maven python-setuptools python-pip genisoimage git mysql-community-server
+ yum install -y java-1.11.0-openjdk-devel maven python-setuptools python-pip genisoimage git mysql-community-server
Installing CloudStack from Source
----------------------------------
