otcbot[bot]
commented
4 months ago I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.
BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.
In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually.
Following is the patch remainder:
diff a/umn/source/change_history.rst b/umn/source/change_history.rst (rejected hunks)
@@ -8,6 +8,22 @@ Change History
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Released On | Description |
+===================================+===========================================================================================================================================================================================================================================================================================================================================================================================================================+
+| 2024-05-11 | Modified the following content: |
+| | |
+| | Terminated M2 ECSs in :ref:`Memory-optimized ECSs <en-us_topic_0035550301>`. |
+| | |
+| | Terminated P1 and P2 ECSs in :ref:`GPU-accelerated ECSs <en-us_topic_0097289624>`. |
+| | |
+| | Deleted section "High-Performance Computing ECSs" and terminated H2 and Hl1 ECSs. |
+| | |
+| | Deleted section "How Can I Check Whether the Network Communication Is Normal Between Two ECSs Equipped with an InfiniBand NIC Driver?" |
+| | |
+| | Deleted section "How Can I Manually Configure an IP Address for an InfiniBand NIC?" |
++-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 2024-04-30 | Modified the following content: |
+| | |
+| | Added the pi2.3xlarge.4 flavor in :ref:`GPU-accelerated ECSs <en-us_topic_0097289624>`. |
++-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2024-01-30 | Added the following content: |
| | |
| | :ref:`Searching for ECSs <en-us_topic_0000001630328828>` |
@@ -96,12 +112,12 @@ Change History
| | |
| | - Modified the constraints in :ref:`Application Scenarios for Using Key Pairs <en-us_topic_0000001278335673>`. |
| | - Modified operations in :ref:`Adding Tags <en-us_topic_0183019669>`. |
-| | - Modified operations in :ref:`Setting Alarm Rules <en-us_topic_0027371531>` and :ref:`Viewing Audit Logs <en-us_topic_0116266207>`. |
+| | - Modified operations in :ref:`Setting Alarm Rules <en-us_topic_0027371531>` and :ref:`Viewing Traces <en-us_topic_0116266207>`. |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2022-07-11 | Modified the following content: |
| | |
| | - Deleted E6 ECSs and modified notes in :ref:`Large-Memory ECSs <en-us_topic_0038024694>`. |
-| | - Added maximum NICs in :ref:`High-Performance Computing ECSs <en-us_topic_0035470100>`. |
+| | - Added maximum NICs in high-performance computing ECSs. |
| | - Modified the description in :ref:`Can I Change the OS of an ECS? <en-us_topic_0018078522>` |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2022-04-20 | Optimized the content in "Passwords and Key Pairs". |
@@ -192,7 +208,7 @@ Change History
| | |
| | - Changed CSBS to CBR in :ref:`ECS and Other Services <en-us_topic_0013771111>`. |
| | - Added CBR to back up ECS data in :ref:`Step 3: Configure Advanced Settings <en-us_topic_0163572591>`. |
-| | - Added CBR to back up ECS data in :ref:`Backup Using CBR <en-us_topic_0096304614>`. |
+| | - Added CBR to back up ECS data in :ref:`CBR <en-us_topic_0096304614>`. |
| | - Added description in notes in :ref:`Migrating an ECS <en-us_topic_0133365988>`, indicating that CBR backups are not affected by cold migrations. |
| | - Added a solution of using CBR in :ref:`Why Does It Take Longer to Create ECSs When I Use a Full-ECS Image? <en-us_topic_0102391480>` |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -387,7 +403,7 @@ Change History
| | |
| | - Modified description in :ref:`Large-Memory ECSs <en-us_topic_0038024694>`, :ref:`Disk-intensive ECSs <en-us_topic_0035470099>`, and :ref:`Can I Attach Multiple Disks to an ECS? <en-us_topic_0018073215>`, allowing an ECS to have up to 60 attached disks. |
| | - Modified description in :ref:`Overview <en-us_topic_0092499768>`, allowing the tags added during ECS creation to be automatically added to the created EIP and EVS disks. |
-| | - Modified description in :ref:`Backup Using CBR <en-us_topic_0096304614>` and :ref:`Why Does It Take Longer to Create ECSs When I Use a Full-ECS Image? <en-us_topic_0102391480>` to support full-ECS images. |
+| | - Modified description in :ref:`CBR <en-us_topic_0096304614>` and :ref:`Why Does It Take Longer to Create ECSs When I Use a Full-ECS Image? <en-us_topic_0102391480>` to support full-ECS images. |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2018-07-03 | Modified the following content: |
| | |
@@ -499,7 +515,7 @@ Change History
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2017-10-18 | Modified the following content: |
| | |
-| | - Changed the OSs supported by H2 and Hl1 ECSs in :ref:`High-Performance Computing ECSs <en-us_topic_0035470100>`. |
+| | - Changed the OSs supported by H2 and Hl1 ECSs in high-performance computing ECSs. |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2017-10-06 | Modified the following content: |
| | |
@@ -523,9 +539,9 @@ Change History
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2017-09-18 | Modified the following content: |
| | |
-| | - Modified the overview, functions, and notes on using Hl1 ECSs in :ref:`High-Performance Computing ECSs <en-us_topic_0035470100>`. |
+| | - Modified the overview, functions, and notes on using Hl1 ECSs in high-performance computing ECSs. |
| | - Modified notes in "Automatically Recovering ECSs". |
-| | - Added notes on using tools, such as ibstat in :ref:`How Can I Check Whether the Network Communication Is Normal Between Two ECSs Equipped with an InfiniBand NIC Driver? <en-us_topic_0058747426>` |
+| | - Added notes on using tools, such as ibstat, in section "How Can I Check Whether the Network Communication Between Two ECSs Equipped with an InfiniBand NIC Driver Is Norma?" |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2017-09-06 | Modified the following content: |
| | |
@@ -553,7 +569,7 @@ Change History
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2017-06-07 | Modified the following content: |
| | |
-| | - Modified notes on using H2 ECSs in :ref:`High-Performance Computing ECSs <en-us_topic_0035470100>`. |
+| | - Modified notes on using H2 ECSs in high-performance computing ECSs. |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2017-06-05 | Modified the following content: |
| | |
@@ -574,7 +590,7 @@ Change History
| | |
| | - :ref:`Obtaining ECS Console Logs <en-us_topic_0057711189>` |
| | - :ref:`Enabling NIC Multi-Queue <en-us_topic_0058758453>` |
-| | - :ref:`How Can I Check Whether the Network Communication Is Normal Between Two ECSs Equipped with an InfiniBand NIC Driver? <en-us_topic_0058747426>` |
+| | - Section "How Can I Check Whether the Network Communication Is Normal Between Two ECSs Equipped with an InfiniBand NIC Driver?" |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2017-04-07 | Added the following content: |
| | |
@@ -656,11 +672,11 @@ Change History
| | |
| | Modified the following content: |
| | |
-| | - Modified the instructions to configure keyboard languages in VNC logins in :ref:`Remotely Logging In to a Windows ECS (Using VNC) <en-us_topic_0027268511>`. |
+| | - Modified the instructions for configuring keyboard languages in VNC logins in :ref:`Remotely Logging In to a Windows ECS (Using VNC) <en-us_topic_0027268511>`. |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2016-09-26 | Modified the following content: |
| | |
-| | - Added the instructions to configure keyboard languages in VNC logins in :ref:`Remotely Logging In to a Windows ECS (Using VNC) <en-us_topic_0027268511>`. |
+| | - Added the instructions for configuring keyboard languages in VNC logins in :ref:`Remotely Logging In to a Windows ECS (Using VNC) <en-us_topic_0027268511>`. |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2016-09-23 | Added the following content: |
| | |
@@ -674,19 +690,19 @@ Change History
| 2016-09-18 | Added the following content: |
| | |
| | - :ref:`Expanding the Local Disks of a Disk-intensive ECS <en-us_topic_0037470901>` |
-| | - :ref:`What Is the cloudbase-init Account in Windows ECSs Used for? <en-us_topic_0037633087>` |
+| | - :ref:`What Is the Cloudbase-Init Account in Windows ECSs Used for? <en-us_topic_0037633087>` |
| | |
| | Modified the following content: |
| | |
| | - Added the description of interactive password reset scripts in :ref:`Resetting the Password for Logging In to a Linux ECS <en-us_topic_0021427650>` |
-| | - Added notes on using various ECSs in :ref:`Memory-optimized ECSs <en-us_topic_0035550301>`, :ref:`Disk-intensive ECSs <en-us_topic_0035470099>`, and :ref:`High-Performance Computing ECSs <en-us_topic_0035470100>`. |
+| | - Added notes on using various ECSs in :ref:`Memory-optimized ECSs <en-us_topic_0035550301>`, :ref:`Disk-intensive ECSs <en-us_topic_0035470099>`, and high-performance computing ECSs. |
+-----------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 2016-08-25 | Added the following content: |
| | |
| | - :ref:`GPU-accelerated ECSs <en-us_topic_0097289624>` |
| | - :ref:`Disk-intensive ECSs <en-us_topic_0035470099>` |
| | - :ref:`Why Is the NIC Not Working? <en-us_topic_0036068717>` |
-| | - :ref:`High-Performance Computing ECSs <en-us_topic_0035470100>` |
+| | - High-Performance Computing ECSs |
| | - :ref:`Detaching an EVS Disk from a Running ECS <en-us_topic_0036046828>` |
| | - :ref:`What Browser Version Is Required to Remotely Log In to an ECS? <en-us_topic_0035233718>` |
| | - :ref:`Why Does the Login to My Linux ECS Using a Key File Fail? <en-us_topic_0031734664>` |
diff a/umn/source/cbr/backing_up_an_ecs.rst b/umn/source/cbr/backing_up_an_ecs.rst (rejected hunks)
@@ -26,7 +26,7 @@ ECS Backup Procedure
#. Under **Computing**, choose **Elastic Cloud Server**.
-#. In the ECS list, locate the target ECS and choose **More** > **Manage Image/Backup** > **Create Server Backup** in the **Operation** column.
+#. In the ECS list, locate the target ECS and choose **More** > **Manage Image/Backup** > **Create Server Backup**.
- If the ECS has been associated with a vault, configure the backup information as prompted.
@@ -56,7 +56,7 @@ EVS Disk Backup Procedure
#. Under **Computing**, choose **Elastic Cloud Server**.
-#. In the ECS list, locate the target ECS and choose **More** > **Manage Image/Backup** > **Create Disk Backup** in the **Operation** column.
+#. In the ECS list, locate the target ECS and choose **More** > **Manage Image/Backup** > **Create Disk Backup**.
- If the ECS has been associated with a vault, configure the backup information as prompted.
diff a/umn/source/passwords_and_key_pairs/passwords/application_scenarios_for_using_passwords.rst b/umn/source/passwords_and_key_pairs/passwords/application_scenarios_for_using_passwords.rst (rejected hunks)
@@ -36,18 +36,18 @@ Background
.. table:: **Table 2** Password complexity requirements
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
- | Parameter | Requirement | Example Value |
- +=======================+==============================================================================================================================================================+===============================================================+
- | Password | - Consists of 8 to 26 characters. | YNbUwp!dUc9MClnv |
- | | - Contains at least three of the following character types: | |
- | | | .. note:: |
- | | - Uppercase letters | |
- | | - Lowercase letters | The example password is generated randomly. Do not use it. |
- | | - Digits | |
- | | - Special characters: ``$!@%-_=+[]:./^,{}?`` | |
- | | | |
- | | - Cannot contain the username or the username spelled backwards. | |
- | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) | |
- | | - Cannot start with a slash (/) for Windows ECSs. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Requirement |
+ +===================================+==============================================================================================================================================================+
+ | Password | - Consists of 8 to 26 characters. |
+ | | - Contains at least three of the following character types: |
+ | | |
+ | | - Uppercase letters |
+ | | - Lowercase letters |
+ | | - Digits |
+ | | - Special characters: ``$!@%-_=+[]:./^,{}?`` |
+ | | |
+ | | - Cannot contain the username or the username spelled backwards. |
+ | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) |
+ | | - Cannot start with a slash (/) for Windows ECSs. |
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff a/umn/source/passwords_and_key_pairs/passwords/resetting_the_password_for_logging_in_to_a_linux_ecs.rst b/umn/source/passwords_and_key_pairs/passwords/resetting_the_password_for_logging_in_to_a_linux_ecs.rst (rejected hunks)
@@ -107,7 +107,7 @@ Procedure
- Change the value of **AllowUsers** to **root**.
- Search for **AllowUsers** in the file. If **AllowUsers** is missing, add it at the end of the file.
+ Search for **AllowUsers** in the file. If **AllowUsers** is missing, add **AllowUsers root** at the end of the file.
#. Stop the temporary ECS, detach the system disk, attach the system disk to the original Linux ECS, and restart the original Linux ECS.
diff a/umn/source/passwords_and_key_pairs/passwords/changing_the_login_password_on_an_ecs.rst b/umn/source/passwords_and_key_pairs/passwords/changing_the_login_password_on_an_ecs.rst (rejected hunks)
@@ -24,21 +24,21 @@ Background
.. table:: **Table 1** Password complexity requirements
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
- | Parameter | Requirement | Example Value |
- +=======================+==============================================================================================================================================================+===============================================================+
- | Password | - Consists of 8 to 26 characters. | YNbUwp!dUc9MClnv |
- | | - Contains at least three of the following character types: | |
- | | | .. note:: |
- | | - Uppercase letters | |
- | | - Lowercase letters | The example password is generated randomly. Do not use it. |
- | | - Digits | |
- | | - Special characters: ``$!@%-_=+[]:./^,{}?`` | |
- | | | |
- | | - Cannot contain the username or the username spelled backwards. | |
- | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) | |
- | | - Cannot start with a slash (/) for Windows ECSs. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Requirement |
+ +===================================+==============================================================================================================================================================+
+ | Password | - Consists of 8 to 26 characters. |
+ | | - Contains at least three of the following character types: |
+ | | |
+ | | - Uppercase letters |
+ | | - Lowercase letters |
+ | | - Digits |
+ | | - Special characters: ``$!@%-_=+[]:./^,{}?`` |
+ | | |
+ | | - Cannot contain the username or the username spelled backwards. |
+ | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) |
+ | | - Cannot start with a slash (/) for Windows ECSs. |
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
Windows
-------
diff a/umn/source/passwords_and_key_pairs/passwords/resetting_the_password_for_logging_in_to_a_windows_ecs.rst b/umn/source/passwords_and_key_pairs/passwords/resetting_the_password_for_logging_in_to_a_windows_ecs.rst (rejected hunks)
@@ -149,20 +149,20 @@ Procedure
.. table:: **Table 1** Password complexity requirements
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
- | Parameter | Requirement | Example Value |
- +=======================+==============================================================================================================================================================+===============================================================+
- | Password | - Consists of 8 to 26 characters. | YNbUwp!dUc9MClnv |
- | | - Contains at least three of the following character types: | |
- | | | .. note:: |
- | | - Uppercase letters | |
- | | - Lowercase letters | The example password is generated randomly. Do not use it. |
- | | - Digits | |
- | | - Special characters: ``$!@%-_=+[]:./^,{}?`` | |
- | | | |
- | | - Cannot contain the username or the username spelled backwards. | |
- | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) | |
- | | - Cannot start with a slash (/) for Windows ECSs. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Requirement |
+ +===================================+==============================================================================================================================================================+
+ | Password | - Consists of 8 to 26 characters. |
+ | | - Contains at least three of the following character types: |
+ | | |
+ | | - Uppercase letters |
+ | | - Lowercase letters |
+ | | - Digits |
+ | | - Special characters: ``$!@%-_=+[]:./^,{}?`` |
+ | | |
+ | | - Cannot contain the username or the username spelled backwards. |
+ | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) |
+ | | - Cannot start with a slash (/) for Windows ECSs. |
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
.. |image1| image:: /_static/images/en-us_image_0210779229.png
diff a/umn/source/faqs/network_configurations/how_can_i_test_network_performance.rst b/umn/source/faqs/network_configurations/how_can_i_test_network_performance.rst (rejected hunks)
@@ -5,7 +5,7 @@
How Can I Test Network Performance?
===================================
-Use netperf and iperf3 to test network performance between ECSs. The test operations include preparations, Transmission Control Protocol (TCP) bandwidth test, User Datagram Protocol (UDP) packets per second (PPS) test, and latency test.
+Use netperf and iperf3 to test network performance between ECSs. The test operations include preparations, TCP bandwidth test, UDP PPS test, and latency test.
Background
----------
diff a/umn/source/permissions_management/creating_a_user_and_granting_ecs_permissions.rst b/umn/source/permissions_management/creating_a_user_and_granting_ecs_permissions.rst (rejected hunks)
@@ -7,7 +7,7 @@ Creating a User and Granting ECS Permissions
Use `IAM <https://docs.otc.t-systems.com/usermanual/iam/iam_01_0026.html>`__ to implement fine-grained permissions control over your ECSs. With IAM, you can:
-- Create IAM users for employees based on your enterprise's organizational structure. Each IAM user will have their own security credentials for accessing ECS resources.
+- Create IAM users for personnel based on your enterprise's organizational structure. Each IAM user will have their own security credentials for accessing ECS resources.
- Grant only the permissions required for users to perform a specific task.
- Delegate access to other accounts or cloud services for efficient O&M.
diff a/umn/source/security/security_groups/configuring_security_group_rules.rst b/umn/source/security/security_groups/configuring_security_group_rules.rst (rejected hunks)
@@ -39,86 +39,84 @@ Procedure
You can click **+** to add more inbound rules.
- .. figure:: /_static/images/en-us_image_0284920908.png
+ .. figure:: /_static/images/en-us_image_0000001865662817.png
:alt: **Figure 1** Add Inbound Rule
**Figure 1** Add Inbound Rule
.. table:: **Table 1** Inbound rule parameter description
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | Parameter | Description | Example Value |
- +=======================+====================================================================================================================================================================================================================================================================================================================================================================================================================+=======================+
- | Protocol & Port | The network protocol used to match traffic in a security group rule. | TCP |
- | | | |
- | | Currently, the value can be **All**, **TCP**, **UDP**, **GRE**, **ICMP**, or more. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | | **Port**: The port or port range over which traffic can reach your ECS. The value can be from 1 to 65535. | 22, or 22-30 |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | Type | Source IP address version. You can select: | IPv4 |
- | | | |
- | | - IPv4 | |
- | | - IPv6 | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | Source | Source of the security group rule. The value can be an IP address, a security group, or an IP address group to allow access from IP addresses or instances in the security group. For example: | 0.0.0.0/0 |
- | | | |
- | | - IP address: | |
- | | | |
- | | - Single IP address: 192.168.10.10/32 | |
- | | - All IP addresses: 0.0.0.0/0 | |
- | | - IP address range: 192.168.1.0/24 | |
- | | | |
- | | - **Security group**: The source is from another security group. You can select a security group in the same region under the current account from the drop-down list. Instance A is in security group A and instance B is in security group B. If security group A has an inbound rule with **Action** set to **Allow** and **Source** set to security group B, access from instance B is allowed to instance A. | |
- | | - **IP address group**: An IP address group is a collection of one or more IP addresses. You can select an available IP address group from the drop-down list. An IP address group can help you manage IP address ranges and IP addresses with same security requirements in a more simple way. | |
- | | | |
- | | If the source is a security group, this rule will apply to all instances associated with the selected security group. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | Description | Supplementary information about the security group rule. This parameter is optional. | N/A |
- | | | |
- | | The security group rule description can contain a maximum of 255 characters and cannot contain angle brackets (< or >). | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Parameter | Description | Example Value |
+ +=======================+===============================================================================================================================================================================================================================================================================================================================================================+=======================+
+ | Protocol | The network protocol used to match traffic in a security group rule. | TCP |
+ | | | |
+ | | Currently, the value can be **All**, **TCP**, **UDP**, **GRE**, **ICMP**, or more. | |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Port | The port or port range over which traffic can reach your ECS. The value can be from 1 to 65535. | 22, or 22-30 |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Type | Source IP address version. You can select: | IPv4 |
+ | | | |
+ | | - IPv4 | |
+ | | - IPv6 | |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Source | Source of the security group rule. The value can be an IP address or a security group to allow access from IP addresses or instances in the security group. | 0.0.0.0/0 |
+ | | | |
+ | | - IP address: | |
+ | | | |
+ | | - Single IP address: 192.168.10.10/32 | |
+ | | - All IP addresses: 0.0.0.0/0 | |
+ | | - IP address range: 192.168.1.0/24 | |
+ | | | |
+ | | - **Security group**: The source is from another security group. You can select a security group in the same region from the drop-down list. If there is instance A in security group A and instance B in security group B, and the inbound rule of security group A allows traffic from security group B, traffic is allowed from instance B to instance A. | |
+ | | | |
+ | | If the source is a security group, this rule will apply to all instances associated with the selected security group. | |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Description | Supplementary information about the security group rule. This parameter is optional. | N/A |
+ | | | |
+ | | The security group rule description can contain a maximum of 255 characters and cannot contain angle brackets (< or >). | |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
#. Configure required parameters.
You can click **+** to add more outbound rules.
- .. figure:: /_static/images/en-us_image_0284993717.png
+ .. figure:: /_static/images/en-us_image_0000001865582629.png
:alt: **Figure 2** Add Outbound Rule
**Figure 2** Add Outbound Rule
.. table:: **Table 2** Outbound rule parameter description
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | Parameter | Description | Example Value |
- +=======================+============================================================================================================================================================================================================================================================================================================================================================================================================================================+=======================+
- | Protocol & Port | The network protocol used to match traffic in a security group rule. | TCP |
- | | | |
- | | Currently, the value can be **All**, **TCP**, **UDP**, **GRE**, **ICMP**, or more. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | | **Port**: The port or port range over which traffic can leave your ECS. The value can be from 1 to 65535. | 22, or 22-30 |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | Type | Source IP address version. You can select: | IPv4 |
- | | | |
- | | - IPv4 | |
- | | - IPv6 | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | Destination | Destination of the security group rule. The value can be an IP address or a security group to allow access to IP addresses or instances in the security group. For example: | 0.0.0.0/0 |
- | | | |
- | | - IP address: | |
- | | | |
- | | - Single IP address: 192.168.10.10/32 | |
- | | - All IP addresses: 0.0.0.0/0 | |
- | | - IP address range: 192.168.1.0/24 | |
- | | | |
- | | - **Security group**: The destination is from another security group. You can select a security group in the same region under the current account from the drop-down list. For example, instance A is in security group A and instance B is in security group B. If security group A has an outbound rule with **Action** set to **Allow** and **Destination** set to security group B, access from instance A is allowed to instance B. | |
- | | - IP address group: A collection of one or more IP addresses. You can select an available IP address group from the drop-down list. An IP address group can help you manage IP address ranges and IP addresses with same security requirements in a more simple way. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
- | Description | Supplementary information about the security group rule. This parameter is optional. | N/A |
- | | | |
- | | The security group rule description can contain a maximum of 255 characters and cannot contain angle brackets (< or >). | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Parameter | Description | Example Value |
+ +=======================+===============================================================================================================================================================================================================================================================================================================================================================+=======================+
+ | Protocol | The network protocol used to match traffic in a security group rule. | TCP |
+ | | | |
+ | | Currently, the value can be **All**, **TCP**, **UDP**, **GRE**, **ICMP**, or more. | |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Port | The port or port range over which traffic can leave your ECS. The value can be from 1 to 65535. | 22, or 22-30 |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Type | Source IP address version. You can select: | IPv4 |
+ | | | |
+ | | - IPv4 | |
+ | | - IPv6 | |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Destination | Destination of the security group rule. The value can be an IP address or a security group to allow access to IP addresses or instances in the security group. | 0.0.0.0/0 |
+ | | | |
+ | | - IP address: | |
+ | | | |
+ | | - Single IP address: 192.168.10.10/32 | |
+ | | - All IP addresses: 0.0.0.0/0 | |
+ | | - IP address range: 192.168.1.0/24 | |
+ | | | |
+ | | - **Security group**: The source is from another security group. You can select a security group in the same region from the drop-down list. If there is instance A in security group A and instance B in security group B, and the inbound rule of security group A allows traffic from security group B, traffic is allowed from instance B to instance A. | |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
+ | Description | Supplementary information about the security group rule. This parameter is optional. | N/A |
+ | | | |
+ | | The security group rule description can contain a maximum of 255 characters and cannot contain angle brackets (< or >). | |
+ +-----------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------+
#. Click **OK** to complete the security rule configuration.
diff a/umn/source/security/security_groups/default_security_group_and_rules.rst b/umn/source/security/security_groups/default_security_group_and_rules.rst (rejected hunks)
@@ -5,10 +5,10 @@
Default Security Group and Rules
================================
-If you have not created any security groups yet, the system automatically creates a default security group for you and associates it with the instance when you create it. A default security group has the following rules:
+Note the following when using default security group rules:
-- Inbound rules control incoming traffic to instances in a security group. Only instances in the same security group can communicate with each other, and all inbound requests are denied.
-- Outbound rules allow all outbound traffic and response traffic to the outbound requests.
+- Inbound rules control incoming traffic to instances in the default security group. The instances can only communicate with each other but cannot be accessed from external networks.
+- Outbound rules allow all traffic from the instances in the default security group to external networks.
:ref:`Figure 1 <en-us_topic_0140323154__fig11890174421819>` shows the default security group.
diff a/umn/source/service_overview/ecs_specifications_and_types/gpu-accelerated_ecss.rst b/umn/source/service_overview/ecs_specifications_and_types/gpu-accelerated_ecss.rst (rejected hunks)
@@ -15,23 +15,21 @@ GPU-accelerated ECSs are classified as G series and P series of ECSs.
GPU-accelerated ECS Types
-------------------------
-Recommended: :ref:`Computing-accelerated P2s <en-us_topic_0097289624__section1454714546567>`, :ref:`Inference-accelerated Pi2 <en-us_topic_0097289624__section1846114713182>`, and :ref:`Graphics-accelerated Enhancement G6 <en-us_topic_0097289624__section131302034104515>`
+Recommended: :ref:`Computing-accelerated P2s <en-us_topic_0097289624__section1454714546567>`, :ref:`Inference-accelerated Pi2 <en-us_topic_0097289624__section1846114713182>`, and :ref:`GPU-accelerated Enhancement G6 <en-us_topic_0097289624__section131302034104515>`
Available now: All GPU models except the recommended ones. If available ECSs are sold out, use the recommended ones.
- G series
- - :ref:`Graphics-accelerated Enhancement G7v <en-us_topic_0097289624__section168054357432>`
+ - :ref:`GPU-accelerated Enhancement G7v <en-us_topic_0097289624__section168054357432>`
- :ref:`Graphics-accelerated Enhancement G7 <en-us_topic_0097289624__section2325028104711>`
- - :ref:`Graphics-accelerated Enhancement G6 <en-us_topic_0097289624__section131302034104515>`
+ - :ref:`GPU-accelerated Enhancement G6 <en-us_topic_0097289624__section131302034104515>`
- P series
- :ref:`Computing-accelerated P3 <en-us_topic_0097289624__section48861652193>`
- :ref:`Computing-accelerated P2s <en-us_topic_0097289624__section1454714546567>` (recommended)
- :ref:`Computing-accelerated P2v <en-us_topic_0097289624__section208472383415>`
- - :ref:`Computing-accelerated P2 <en-us_topic_0097289624__section5477185118234>`
- - :ref:`Computing-accelerated P1 <en-us_topic_0097289624__section1124594913391>`
- :ref:`Inference-accelerated Pi2 <en-us_topic_0097289624__section1846114713182>` (recommended)
Helpful links:
@@ -94,22 +92,6 @@ Images Supported by GPU-accelerated ECSs
| | | - Windows Server 2016 Standard 64bit |
| | | - Windows Server 2012 R2 Standard 64bit |
+-----------------------+-----------------------+------------------------------------------+
- | Computing-accelerated | P2 | - CentOS 7.9 64bit |
- | | | - EulerOS 2.5 64bit |
- | | | - Oracle Linux Server release 7.6 64bit |
- | | | - Ubuntu 20.04 Server 64bit |
- | | | - Ubuntu 18.04 Server 64bit |
- | | | - Windows Server 2019 Standard 64bit |
- | | | - Windows Server 2016 Standard 64bit |
- | | | - Windows Server 2012 R2 Standard 64bit |
- +-----------------------+-----------------------+------------------------------------------+
- | Computing-accelerated | P1 | - CentOS 7.9 64bit |
- | | | - Ubuntu 20.04 Server 64bit |
- | | | - Ubuntu 18.04 Server 64bit |
- | | | - Debian GNU/Linux 11 64bit |
- | | | - Debian GNU/Linux 10 64bit |
- | | | - Oracle Linux Server release 7.6 64bit |
- +-----------------------+-----------------------+------------------------------------------+
| Inference-accelerated | Pi2 | - CentOS 7.9 64bit |
| | | - Oracle Linux Server release 7.6 64bit |
| | | - Ubuntu 20.04 Server 64bit |
@@ -121,8 +103,8 @@ Images Supported by GPU-accelerated ECSs
.. _en-us_topic_0097289624__section168054357432:
-Graphics-accelerated Enhancement G7v
-------------------------------------
+GPU-accelerated Enhancement G7v
+-------------------------------
**Overview**
@@ -188,9 +170,7 @@ G7v ECSs are used in graphics acceleration scenarios, such as video rendering, c
Resources will be released after a G7v ECS is stopped. If resources are insufficient at the next start, the start may fail. If you want to use such an ECS for a long period of time, do not stop the ECS.
- G7v ECSs created using a public image have had the GRID driver of a specific version installed by default. However, you need to purchase and configure a GRID license by yourself. Ensure that the GRID driver version meets service requirements.
-
- If a G7v ECS is created using a private image, make sure that the GRID driver was installed during the private image creation. If the GRID driver has not been installed, install the driver for graphics acceleration after the ECS is created.
-
- GPU-accelerated ECSs differ greatly in general-purpose and heterogeneous computing power. Their specifications can only be changed to other specifications of the same instance type.
.. _en-us_topic_0097289624__section2325028104711:
@@ -410,7 +390,6 @@ P3 ECSs are used in computing acceleration scenarios, such as deep learning trai
Resources will be released after a P3 ECS is stopped. If resources are insufficient at the next start, the start may fail. If you want to use such an ECS for a long period of time, do not stop the ECS.
- If a P3 ECS is created using a private image, make sure that the Tesla driver was installed during the private image creation. If not, install the driver for computing acceleration after the ECS is created. For details, see :ref:`Installing a Tesla Driver and CUDA Toolkit on a GPU-accelerated ECS <en-us_topic_0149470468>`.
-
- GPU-accelerated ECSs differ greatly in general-purpose and heterogeneous computing power. Their specifications can only be changed to other specifications of the same instance type.
.. _en-us_topic_0097289624__section1454714546567:
@@ -566,178 +545,8 @@ P2v ECSs are used in computing acceleration scenarios, such as deep learning tra
Resources will be released after a P2v ECS is stopped. If resources are insufficient at the next start, the start may fail. If you want to use such an ECS for a long period of time, do not stop the ECS.
- By default, P2v ECSs created using a Windows public image have the Tesla driver installed.
-
- By default, P2v ECSs created using a Linux public image do not have a Tesla driver installed. After the ECS is created, install a driver on it for computing acceleration. For details, see :ref:`Installing a Tesla Driver and CUDA Toolkit on a GPU-accelerated ECS <en-us_topic_0149470468>`.
-
- If a P2v ECS is created using a private image, make sure that the Tesla driver was installed during the private image creation. If not, install the driver for computing acceleration after the ECS is created. For details, see :ref:`Installing a Tesla Driver and CUDA Toolkit on a GPU-accelerated ECS <en-us_topic_0149470468>`.
-
-- GPU-accelerated ECSs differ greatly in general-purpose and heterogeneous computing power. Their specifications can only be changed to other specifications of the same instance type.
-
-.. _en-us_topic_0097289624__section5477185118234:
-
-Computing-accelerated P2
-------------------------
-
-**Overview**
-
-Compared with P1 ECSs, P2 ECSs use NVIDIA Tesla V100 GPUs, which have improved both single- and double-precision computing capabilities by 50% and offer 112 TFLOPS of deep learning.
-
-**Specifications**
-
-.. table:: **Table 8** P2 ECS specifications
-
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
- | Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Local Disks | Virtualization | Hardware |
- | | | | | | | | | | | | |
- | | | (GiB) | (Gbit/s) | (10,000) | | | | (GiB) | | | |
- +==============+=======+========+========================+==========+=================+===========+==========+============+==================+================+========================================+
- | p2.2xlarge.8 | 8 | 64 | 5/1.6 | 35 | 2 | 12 | 1 x V100 | 1 x 16 | 1 x 800 GiB NVMe | KVM | CPU: Intel® Xeon® Processor E5-2690 v4 |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
- | p2.4xlarge.8 | 16 | 128 | 8/3.2 | 70 | 4 | 12 | 2 x V100 | 2 x 16 | 2 x 800 GiB NVMe | KVM | |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
- | p2.8xlarge.8 | 32 | 256 | 10/6.5 | 140 | 8 | 12 | 4 x V100 | 4 x 16 | 4 x 800 GiB NVMe | KVM | |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
-
-**P2 ECS Features**
-
-- CPU: Intel® Xeon® Processor E5-2690 v4 (2.6 GHz)
-
-- NVIDIA Tesla V100 GPUs
-
-- GPU hardware passthrough
-
-- 14 TFLOPS of single-precision computing, 7 TFLOPS of double-precision computing, and 112 TFLOPS of deep learning
-
-- Maximum network bandwidth of 12 Gbit/s
-
-- 16 GiB of HBM2 GPU memory with a bandwidth of 900 Gbit/s
-
-- 800 GiB NVMe SSDs for temporary local storage
-
-- Comprehensive basic capabilities
-
- - User-defined network with flexible subnet division and network access policy configuration
- - Mass storage, elastic expansion, and backup and restoration
- - Elastic scaling
-
-- Flexibility
-
- Similar to other types of ECSs, P2 ECSs can be provisioned in a few minutes.
-
-- Excellent supercomputing ecosystem
-
- The supercomputing ecosystem allows you to build up a flexible, high-performance, cost-effective computing platform. A large number of HPC applications and deep-learning frameworks can run on P2 ECSs.
-
-**Supported Common Software**
-
-P2 ECSs are used in computing acceleration scenarios, such as deep learning training, inference, scientific computing, molecular modeling, and seismic analysis. If the software requires GPU CUDA parallel computing, use P2 ECSs. P2 ECSs support the following commonly used software:
-
-- Common deep learning frameworks, such as TensorFlow, Caffe, PyTorch, and MXNet
-- CUDA GPU rendering supported by RedShift for Autodesk 3dsMax and V-Ray for 3ds Max
-- Agisoft PhotoScan
-- MapD
-
-**Notes**
-
-- The system disk of a P2 ECS must be greater than or equal to 15 GiB. It is recommended that the system disk be greater than 40 GiB.
-- P2 ECSs have local NVMe SSDs attached, which will continue to be billed after the ECSs are stopped. To stop the ECS from being billed, delete it and its associated resources.
-- The local NVMe SSDs attached to P2 ECSs are dedicated for services with strict requirements on storage I/O performance, such as deep learning training and HPC. Local disks are attached to the ECSs of specified flavors and cannot be separately bought. In addition, you are not allowed to detach a local disk and then attach it to another ECS.
-
- .. note::
-
- Data may be lost on the local NVMe SSDs attached to P2 ECSs due to a fault, for example, due to a disk or host fault. Therefore, you are suggested to store only temporary data in local NVMe SSDs. If you store important data in such a disk, securely back up the data.
-
-- P2 ECSs do not support specifications modification.
-- After you delete a P2 ECS, the data stored in local NVMe SSDs is automatically cleared.
-- By default, P2 ECSs created using a Linux public image do not have a Tesla driver installed. After the ECS is created, install a driver on it for computing acceleration. For details, see :ref:`Installing a Tesla Driver and CUDA Toolkit on a GPU-accelerated ECS <en-us_topic_0149470468>`.
-- If a P2 ECS is created using a private image, make sure that the Tesla driver was installed during the private image creation. If not, install the driver for computing acceleration after the ECS is created. For details, see :ref:`Installing a Tesla Driver and CUDA Toolkit on a GPU-accelerated ECS <en-us_topic_0149470468>`.
-- GPU-accelerated ECSs differ greatly in general-purpose and heterogeneous computing power. Their specifications can only be changed to other specifications of the same instance type.
-
-.. _en-us_topic_0097289624__section1124594913391:
-
-Computing-accelerated P1
-------------------------
-
-**Overview**
-
-P1 ECSs use NVIDIA Tesla P100 GPUs and provide flexibility, high performance, and cost-effectiveness. These ECSs support GPU Direct for direct communication between GPUs, improving data transmission efficiency. P1 ECSs provide outstanding general computing capabilities and have strengths in deep learning, graphic databases, high-performance databases, Computational Fluid Dynamics (CFD), computing finance, seismic analysis, molecular modeling, and genomics. They are designed for scientific computing.
-
-**Specifications**
-
-.. table:: **Table 9** P1 ECS specifications
-
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
- | Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Local Disks | Virtualization | Hardware |
- | | | | | | | | | | | | |
- | | | (GiB) | (Gbit/s) | (10,000) | | | | (GiB) | (GiB) | | |
- +==============+=======+========+========================+==========+=================+===========+==========+============+=============+================+========================================+
- | p1.2xlarge.8 | 8 | 64 | 5/1.6 | 35 | 2 | 12 | 1 x P100 | 1 x 16 | 1 x 800 | KVM | CPU: Intel® Xeon® Processor E5-2690 v4 |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
- | p1.4xlarge.8 | 16 | 128 | 8/3.2 | 70 | 4 | 12 | 2 x P100 | 2 x 16 | 2 x 800 | KVM | |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
- | p1.8xlarge.8 | 32 | 256 | 10/6.5 | 140 | 8 | 12 | 4 x P100 | 4 x 16 | 4 x 800 | KVM | |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
-
-**P1 ECS Features**
-
-- CPU: Intel® Xeon® E5-2690 v4 processors (2.6 GHz of base frequency and 3.5 GHz of turbo frequency)
-
-- Up to four NVIDIA Tesla P100 GPUs on a P1 ECS (If eight P100 GPUs are required on an instance, use BMS.)
-
-- GPU hardware passthrough
-
-- 9.3 TFLOPS of single-precision computing and 4.7 TFLOPS of double-precision computing
-
-- Maximum network bandwidth of 10 Gbit/s
-
-- 16 GiB of HBM2 GPU memory with a bandwidth of 732 Gbit/s
-
-- 800 GiB NVMe SSDs for temporary local storage
-
-- Comprehensive basic capabilities
-
- - User-defined network with flexible subnet division and network access policy configuration
- - Mass storage, elastic expansion, and backup and restoration
- - Elastic scaling
-
-- Flexibility
-
- Similar to other types of ECSs, P1 ECSs can be provisioned in a few minutes. You can configure specifications as needed. P1 ECSs with two, four, and eight GPUs will be supported later.
-
-- Excellent supercomputing ecosystem
-
- The supercomputing ecosystem allows you to build up a flexible, high-performance, cost-effective computing platform. A large number of HPC applications and deep-learning frameworks can run on P1 ECSs.
-
-**Supported Common Software**
-
-P1 ECSs are used in computing acceleration scenarios, such as deep learning training, inference, scientific computing, molecular modeling, and seismic analysis. If the software requires GPU CUDA parallel computing, use P1 ECSs. P1 ECSs support the following commonly used software:
-
-- Deep learning frameworks, such as TensorFlow, Caffe, PyTorch, and MXNet
-- RedShift for Autodesk 3dsMax, V-Ray for 3ds Max
-- Agisoft PhotoScan
-- MapD
-
-**Notes**
-
-- It is recommended that the system disk of a P1 ECS be greater than 40 GiB.
-- P1 ECSs have local NVMe SSDs attached, which will continue to be billed after the ECSs are stopped. To stop the ECS from being billed, delete it and its associated resources.
-- The local NVMe SSDs attached to P1 ECSs are dedicated for services with strict requirements on storage I/O performance, such as deep learning training and HPC. Local disks are attached to the ECSs of specified flavors and cannot be separately bought. In addition, you are not allowed to detach a local disk and then attach it to another ECS.
-
- .. note::
-
- Data may be lost on the local NVMe SSDs attached to P1 ECSs due to a fault, for example, due to a disk or host fault. Therefore, you are suggested to store only temporary data in local NVMe SSDs. If you store important data in such a disk, securely back up the data.
-
-- After a P1 ECS is created, you must install the NVIDIA driver for computing acceleration. For details, see :ref:`Installing a Tesla Driver and CUDA Toolkit on a GPU-accelerated ECS <en-us_topic_0149470468>`.
-- P1 ECSs do not support specifications change.
-- P1 ECSs do not support automatic recovery.
-
- - If the host is faulty or subhealthy, you need to stop the ECS for hardware repair.
- - In case of system maintenance or hardware faults, the ECS will be redeployed (to ensure HA) and cold migrated to another host. The local disk data of the ECS will not be retained.
-
-- After you delete a P1 ECS, the data stored in local NVMe SSDs is automatically cleared.
-- By default, P1 ECSs created using a Windows public image have the Tesla driver installed.
-- By default, P1 ECSs created using a Linux public image do not have a Tesla driver installed. After the ECS is created, install a driver on it for computing acceleration. For details, see :ref:`Installing a Tesla Driver and CUDA Toolkit on a GPU-accelerated ECS <en-us_topic_0149470468>`.
-- If a P1 ECS is created using a private image, make sure that the Tesla driver was installed during the private image creation. If not, install the driver for computing acceleration after the ECS is created. For details, see :ref:`Installing a Tesla Driver and CUDA Toolkit on a GPU-accelerated ECS <en-us_topic_0149470468>`.
- GPU-accelerated ECSs differ greatly in general-purpose and heterogeneous computing power. Their specifications can only be changed to other specifications of the same instance type.
.. _en-us_topic_0097289624__section1846114713182:
@@ -751,7 +560,7 @@ Pi2 ECSs use NVIDIA Tesla T4 GPUs dedicated for real-time AI inference. These EC
**Specifications**
-.. table:: **Table 10** Pi2 ECS specifications
+.. table:: **Table 8** Pi2 ECS specifications
+----------------+-------+--------+------------------------+----------+-----------------+-----------+--------+------------+-------------+----------------+----------------------------------------------------------------------------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Local Disks | Virtualization | Hardware |
diff a/umn/source/service_overview/ecs_specifications_and_types/dedicated_general-purpose_ecss.rst b/umn/source/service_overview/ecs_specifications_and_types/dedicated_general-purpose_ecss.rst (rejected hunks)
@@ -105,6 +105,10 @@ Specifications
| c7t.28xlarge.4.physical | 112 | 512 | 64/64 | 3000 | 32 | 32 | BMS |
+-------------------------+--------+--------+------------------------+----------+-----------------+-----------+----------------+
+.. note::
+
+ C7t ECSs do not support ECS groups.
+
.. table:: **Table 3** C4 ECS specifications
+---------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+-------------------------------------+
diff a/umn/source/service_overview/ecs_specifications_and_types/memory-optimized_ecss.rst b/umn/source/service_overview/ecs_specifications_and_types/memory-optimized_ecss.rst (rejected hunks)
@@ -11,7 +11,6 @@ Overview
- M7n ECSs use the third-generation Intel® Xeon® Scalable processors to provide enhanced computing, security, and stability. Each M7n ECS can have a maximum number of 96 vCPUs and a memory speed of 3,200 MHz, and provide a secure and trusted cloud environment for memory-intensive computing applications.
- M4 ECSs use the second-generation Intel® Xeon® Scalable processors with technologies optimized to offer powerful and stable computing performance. Using 25GE high-speed intelligent NICs, M4 ECSs provide a maximum memory size of 512 GiB based on DDR4 for memory-intensive applications with high requirements on network bandwidth and Packets Per Second (PPS).
- M3 ECSs are developed based on the KVM virtualization platform and designed for processing large-scale data sets in the memory. They use Intel® Xeon® Scalable processors, network acceleration engines, and DPDK rapid packet processing mechanism to provide higher network performance and up to 512 GiB of DDR4 memory for memory-intensive computing applications.
-- M2 ECSs use Intel Xeon E5-2690 v4 CPUs and are designed for memory-optimized applications.
Specifications
--------------
@@ -92,18 +91,6 @@ Specifications
| m3.15xlarge.8 | 60 | 512 | 17/17 | 500 | 16 | 12 | KVM | |
+---------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
-.. table:: **Table 4** M2 ECS specifications
-
- +--------------+--------+--------+------------------------+----------+-----------------+----------------+----------------------------------------+
- | Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Virtualization | Hardware |
- | | | | | | | | |
- | | | (GiB) | (Gbit/s) | (10,000) | | | |
- +==============+========+========+========================+==========+=================+================+========================================+
- | m2.4xlarge.8 | 16 | 128 | 8/5 | 40 | 4 | KVM | CPU: Intel® Xeon® Processor E5-2690 v4 |
- +--------------+--------+--------+------------------------+----------+-----------------+----------------+----------------------------------------+
- | m2.8xlarge.8 | 32 | 256 | 13/8 | 60 | 8 | KVM | |
- +--------------+--------+--------+------------------------+----------+-----------------+----------------+----------------------------------------+
-
Scenarios
---------
@@ -115,11 +102,11 @@ Scenarios
Notes
-----
-:ref:`Table 5 <en-us_topic_0035550301__table192771727112217>` lists the OSs supported by memory-optimized ECSs.
+:ref:`Table 4 <en-us_topic_0035550301__table192771727112217>` lists the OSs supported by memory-optimized ECSs.
.. _en-us_topic_0035550301__table192771727112217:
-.. table:: **Table 5** Supported OS versions
+.. table:: **Table 4** Supported OS versions
+-----------------------------------+-----------------------------------------------------+
| OS | Version |
diff a/umn/source/service_overview/ecs_specifications_and_types/a_summary_list_of_ecs_specifications.rst b/umn/source/service_overview/ecs_specifications_and_types/a_summary_list_of_ecs_specifications.rst (rejected hunks)
@@ -348,22 +348,10 @@ Memory-optimized
| m3.15xlarge.8 | 60 | 512 | 17/17 | 500 | 16 | 12 | KVM | |
+---------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
-.. table:: **Table 10** M2 ECS specifications
-
- +--------------+--------+--------+------------------------+----------+-----------------+----------------+----------------------------------------+
- | Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Virtualization | Hardware |
- | | | | | | | | |
- | | | (GiB) | (Gbit/s) | (10,000) | | | |
- +==============+========+========+========================+==========+=================+================+========================================+
- | m2.4xlarge.8 | 16 | 128 | 8/5 | 40 | 4 | KVM | CPU: Intel® Xeon® Processor E5-2690 v4 |
- +--------------+--------+--------+------------------------+----------+-----------------+----------------+----------------------------------------+
- | m2.8xlarge.8 | 32 | 256 | 13/8 | 60 | 8 | KVM | |
- +--------------+--------+--------+------------------------+----------+-----------------+----------------+----------------------------------------+
-
Large-Memory
------------
-.. table:: **Table 11** E6 ECS specifications
+.. table:: **Table 10** E6 ECS specifications
+----------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | Virtualization | Hardware |
@@ -375,7 +363,7 @@ Large-Memory
| e6.52xlarge.28 | 208 | 5896 | 40/40 | 1,000 | 32 | 8 | KVM | |
+----------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
-.. table:: **Table 12** E3 ECS specifications
+.. table:: **Table 11** E3 ECS specifications
+----------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | Virtualization | Hardware |
@@ -394,7 +382,7 @@ Large-Memory
Disk-intensive
--------------
-.. table:: **Table 13** D2 ECS specifications
+.. table:: **Table 12** D2 ECS specifications
+---------------+-------+--------+------------------------+----------+-----------------+----------------+-------------+-----------------------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Virtualization | Local Disks | Hardware |
@@ -417,7 +405,7 @@ Disk-intensive
Ultra-high I/O
--------------
-.. table:: **Table 14** I3 ECS specifications
+.. table:: **Table 13** I3 ECS specifications
+---------------+-------+--------+------------------------+----------+-----------------+-----------+--------------------+----------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | Local Disks | Virtualization |
@@ -445,31 +433,10 @@ Ultra-high I/O
| i3.16xlarge.8 | 64 | 512 | 40/32 | 1,000 | 32 | 8 | 8 x 3,200 GiB NVMe | KVM |
+---------------+-------+--------+------------------------+----------+-----------------+-----------+--------------------+----------------+
-High-Performance Computing
---------------------------
-
-.. table:: **Table 15** Hl1 ECS specifications
-
- +---------------+-------+--------------+---------------------------------+-------------------+-----------------+-----------+----------------+---------------------------+----------------------------------------+
- | Flavor | vCPUs | Memory (GiB) | Max./Assured Bandwidth (Gbit/s) | Max. PPS (10,000) | Max. NIC Queues | Max. NICs | Virtualization | Network | Hardware |
- +===============+=======+==============+=================================+===================+=================+===========+================+===========================+========================================+
- | hl1.8xlarge.8 | 32 | 256 | 9/9 | 90 | 8 | 12 | KVM | 100 Gbit/s EDR InfiniBand | CPU: Intel® Xeon® Processor E5-2690 v4 |
- +---------------+-------+--------------+---------------------------------+-------------------+-----------------+-----------+----------------+---------------------------+----------------------------------------+
-
-.. table:: **Table 16** H2 ECS specifications
-
- +---------------+-------+--------------+---------------------------------+-------------------+-----------------+-----------+----------------+-------------+-----------------+---------------------------+------------------------------+
- | Flavor | vCPUs | Memory (GiB) | Max./Assured Bandwidth (Gbit/s) | Max. PPS (10,000) | Max. NIC Queues | Max. NICs | Virtualization | Local Disks | Local Disk (TB) | Network | Hardware |
- +===============+=======+==============+=================================+===================+=================+===========+================+=============+=================+===========================+==============================+
- | h2.3xlarge.10 | 16 | 128 | 13/13 | 90 | 8 | 12 | KVM | 1 | 3.2 | 100 Gbit/s EDR InfiniBand | CPU: Intel® Xeon® E5-2667 v4 |
- +---------------+-------+--------------+---------------------------------+-------------------+-----------------+-----------+----------------+-------------+-----------------+---------------------------+------------------------------+
- | h2.3xlarge.20 | 16 | 256 | 13/13 | 90 | 8 | 12 | KVM | 1 | 3.2 | 100 Gbit/s EDR InfiniBand | |
- +---------------+-------+--------------+---------------------------------+-------------------+-----------------+-----------+----------------+-------------+-----------------+---------------------------+------------------------------+
-
GPU-accelerated
---------------
-.. table:: **Table 17** G7v ECS specifications
+.. table:: **Table 14** G7v ECS specifications
+---------------+-------+--------+------------------------+----------+-----------------+-----------+--------------------+------------+----------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Virtualization |
@@ -483,7 +450,7 @@ GPU-accelerated
| g7v.6xlarge.8 | 24 | 192 | 25/9 | 200 | 8 | 8 | 1 x NVIDIA-A40-24Q | 24 | KVM |
+---------------+-------+--------+------------------------+----------+-----------------+-----------+--------------------+------------+----------------+
-.. table:: **Table 18** G7 ECS specifications
+.. table:: **Table 15** G7 ECS specifications
+---------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+------------+----------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Virtualization |
@@ -495,7 +462,7 @@ GPU-accelerated
| g7.24xlarge.8 | 96 | 768 | 40/36 | 850 | 16 | 8 | 2 x NVIDIA-A40 | 2 x 48 | KVM |
+---------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+------------+----------------+
-.. table:: **Table 19** G6 ECS specifications
+.. table:: **Table 16** G6 ECS specifications
+---------------+-------+--------+------------------------+----------+-----------------+-----------+--------+------------+----------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Virtualization |
@@ -509,7 +476,7 @@ GPU-accelerated
| g6.20xlarge.7 | 80 | 560 | 30/30 | 400 | 32 | 16 | 2 x T4 | 32 | KVM |
+---------------+-------+--------+------------------------+----------+-----------------+-----------+--------+------------+----------------+
-.. table:: **Table 20** P3 ECS specifications
+.. table:: **Table 17** P3 ECS specifications
+---------------+-------+--------+---------------------------------+----------+-----------------+-----------+----------------------+------------+----------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth (Gbit/s) | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Virtualization |
@@ -525,7 +492,7 @@ GPU-accelerated
| p3.16xlarge.8 | 64 | 512 | 36/30 | 700 | 32 | 8 | 8 x NVIDIA A100 80GB | 640 | KVM |
+---------------+-------+--------+---------------------------------+----------+-----------------+-----------+----------------------+------------+----------------+
-.. table:: **Table 21** P2s ECS specifications
+.. table:: **Table 18** P2s ECS specifications
+----------------+-------+--------+---------------------------------+-------------------+-----------------+-----------+----------+----------------+------------------+----------------+----------------------------------------------------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth (Gbit/s) | Max. PPS (10,000) | Max. NIC Queues | Max. NICs | GPUs | GPU Connection | GPU Memory (GiB) | Virtualization | Hardware |
@@ -541,7 +508,7 @@ GPU-accelerated
| p2s.16xlarge.8 | 64 | 512 | 30/30 | 400 | 32 | 8 | 8 x V100 | PCIe Gen3 | 8 x 32 GiB | KVM | |
+----------------+-------+--------+---------------------------------+-------------------+-----------------+-----------+----------+----------------+------------------+----------------+----------------------------------------------------------+
-.. table:: **Table 22** P2v ECS specifications
+.. table:: **Table 19** P2v ECS specifications
+----------------+-------+--------+---------------------------------+-------------------+-----------------+-----------+----------+----------------+------------+----------------+-------------------------------------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth (Gbit/s) | Max. PPS (10,000) | Max. NIC Queues | Max. NICs | GPUs | GPU Connection | GPU Memory | Virtualization | Hardware |
@@ -557,35 +524,7 @@ GPU-accelerated
| p2v.16xlarge.8 | 64 | 512 | 30/30 | 400 | 32 | 8 | 8 x V100 | NVLink | 8 x 16 GiB | KVM | |
+----------------+-------+--------+---------------------------------+-------------------+-----------------+-----------+----------+----------------+------------+----------------+-------------------------------------------+
-.. table:: **Table 23** P2 ECS specifications
-
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
- | Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Local Disks | Virtualization | Hardware |
- | | | | | | | | | | | | |
- | | | (GiB) | (Gbit/s) | (10,000) | | | | (GiB) | | | |
- +==============+=======+========+========================+==========+=================+===========+==========+============+==================+================+========================================+
- | p2.2xlarge.8 | 8 | 64 | 5/1.6 | 35 | 2 | 12 | 1 x V100 | 1 x 16 | 1 x 800 GiB NVMe | KVM | CPU: Intel® Xeon® Processor E5-2690 v4 |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
- | p2.4xlarge.8 | 16 | 128 | 8/3.2 | 70 | 4 | 12 | 2 x V100 | 2 x 16 | 2 x 800 GiB NVMe | KVM | |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
- | p2.8xlarge.8 | 32 | 256 | 10/6.5 | 140 | 8 | 12 | 4 x V100 | 4 x 16 | 4 x 800 GiB NVMe | KVM | |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
-
-.. table:: **Table 24** P1 ECS specifications
-
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
- | Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Local Disks | Virtualization | Hardware |
- | | | | | | | | | | | | |
- | | | (GiB) | (Gbit/s) | (10,000) | | | | (GiB) | (GiB) | | |
- +==============+=======+========+========================+==========+=================+===========+==========+============+=============+================+========================================+
- | p1.2xlarge.8 | 8 | 64 | 5/1.6 | 35 | 2 | 12 | 1 x P100 | 1 x 16 | 1 x 800 | KVM | CPU: Intel® Xeon® Processor E5-2690 v4 |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
- | p1.4xlarge.8 | 16 | 128 | 8/3.2 | 70 | 4 | 12 | 2 x P100 | 2 x 16 | 2 x 800 | KVM | |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
- | p1.8xlarge.8 | 32 | 256 | 10/6.5 | 140 | 8 | 12 | 4 x P100 | 4 x 16 | 4 x 800 | KVM | |
- +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
-
-.. table:: **Table 25** Pi2 ECS specifications
+.. table:: **Table 20** Pi2 ECS specifications
+----------------+-------+--------+------------------------+----------+-----------------+-----------+--------+------------+-------------+----------------+----------------------------------------------------------------------------------+
| Flavor | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs | GPU Memory | Local Disks | Virtualization | Hardware |
diff a/umn/source/service_overview/instances/ecs_types.rst b/umn/source/service_overview/instances/ecs_types.rst (rejected hunks)
@@ -69,8 +71,10 @@ The intranet bandwidth and PPS of an ECS are determined by the ECS flavor.
- Maximum NICs: indicates the maximum number of NICs that can be attached to an ECS.
- .. note::
+- Maximum supplementary NICs: indicates the maximum number of supplementary NICs that can be attached to an ECS.
+
+.. note::
- - For instructions about how to test PPS, see :ref:`How Can I Test Network Performance? <en-us_topic_0115820205>`.
- - For instructions about how to enable NIC multi-queue, see :ref:`Enabling NIC Multi-Queue <en-us_topic_0058758453>`.
- - The maximum bandwidth is the total bandwidth allocated to an ECS. If an ECS has multiple NICs, the sum of the maximum bandwidths allocated to all NICs cannot exceed the maximum bandwidth allocated to the ECS.
+ - For instructions about how to test PPS, see :ref:`How Can I Test Network Performance? <en-us_topic_0115820205>`.
+ - For instructions about how to enable NIC multi-queue, see :ref:`Enabling NIC Multi-Queue <en-us_topic_0058758453>`.
+ - The maximum bandwidth is the total bandwidth allocated to an ECS. If an ECS has multiple NICs, the sum of the maximum bandwidths allocated to all NICs cannot exceed the maximum bandwidth allocated to the ECS.
diff a/umn/source/getting_started/logging_in_to_an_ecs.rst b/umn/source/getting_started/logging_in_to_an_ecs.rst (rejected hunks)
@@ -43,17 +43,17 @@ You can log in to a Linux ECS using either VNC or SSH key provided on the manage
**Figure 2** Linux ECS login modes
-#. Select a login method and log in to the ECS.
+Select a login method and log in to the ECS.
- - VNC
+- VNC
- For details, see :ref:`Remotely Logging In to a Linux ECS (Using VNC) <en-us_topic_0093263550>`.
+ For details, see :ref:`Remotely Logging In to a Linux ECS (Using VNC) <en-us_topic_0093263550>`.
- - SSH key
+- SSH key
- When you log in to the ECS using the SSH key, bind an EIP to the ECS.
+ When you log in to the ECS using the SSH key, bind an EIP to the ECS.
- For details, see :ref:`Remotely Logging In to a Linux ECS (Using an SSH Key Pair) <en-us_topic_0017955380>`.
+ For details, see :ref:`Remotely Logging In to a Linux ECS (Using an SSH Key Pair) <en-us_topic_0017955380>`.
Follow-up Procedure
-------------------
diff a/umn/source/getting_started/initializing_evs_data_disks/initializing_a_windows_data_disk_windows_server_2019.rst b/umn/source/getting_started/initializing_evs_data_disks/initializing_a_windows_data_disk_windows_server_2019.rst (rejected hunks)
@@ -105,7 +105,7 @@ Procedure
The **Assign Drive Letter or Path** page is displayed.
- .. figure:: /_static/images/en-us_image_0175083510.png
+ .. figure:: /_static/images/en-us_image_0000001809029936.png
:alt: **Figure 7** Assign Drive Letter or Path
**Figure 7** Assign Drive Letter or Path
diff a/umn/source/getting_started/initializing_evs_data_disks/initializing_a_windows_data_disk_windows_server_2008.rst b/umn/source/getting_started/initializing_evs_data_disks/initializing_a_windows_data_disk_windows_server_2008.rst (rejected hunks)
@@ -62,37 +62,35 @@ Procedure
If the disk is offline, you need to bring it online before initializing it.
-#. After making the disk online, the disk status changes from **Offline** to **Not Initialized**. Right-click the disk status and choose **Initialize Disk** from the shortcut menu, as shown in :ref:`Figure 3 <en-us_topic_0085634796__en-us_topic_0044524740_fig409808111224>`.
+#. After making the disk online, the disk status changes from **Offline** to **Not Initialized**. Right-click the disk status and choose **Initialize Disk** from the shortcut menu.
- .. _en-us_topic_0085634796__en-us_topic_0044524740_fig409808111224:
- .. figure:: /_static/images/en-us_image_0132360430.png
+ .. figure:: /_static/images/en-us_image_0000001809189756.png
:alt: **Figure 3** Initialize Disk
**Figure 3** Initialize Disk
-#. .. _en-us_topic_0085634796__en-us_topic_0044524740_li34991214122212:
+#. .. _en-us_topic_0085634796__en-us_topic_0000001855867909_en-us_topic_0000001855169053_li34991214122212:
- In the **Initialize Disk** dialog box, select the target disk, click **MBR (Master Boot Record)** or **GPT (GUID Partition Table)**, and click **OK**, as shown in :ref:`Figure 4 <en-us_topic_0085634796__en-us_topic_0044524740_fig68332918241>`.
+ In the **Initialize Disk** dialog box, select the target disk, click **MBR (Master Boot Record)** or **GPT (GUID Partition Table)**, and click **OK**.
- .. _en-us_topic_0085634796__en-us_topic_0044524740_fig68332918241:
+ .. _en-us_topic_0085634796__en-us_topic_0000001855867909_en-us_topic_0000001855169053_fig68332918241:
- .. figure:: /_static/images/en-us_image_0097597141.png
+ .. figure:: /_static/images/en-us_image_0000001855868557.png
:alt: **Figure 4** Unallocated space
**Figure 4** Unallocated space
.. important::
- The maximum disk size supported by MBR is 2 TiB, and that supported by GPT is 18 EiB. Because an EVS data disk currently supports up to 32 TiB, use GPT if your disk size is larger than 2 TiB.
+ The maximum disk size supported by MBR is 2 TiB, and that supported by GPT is 18 EiB. Because an EVS data disk currently supports up to 32 TiB, use GPT if your disk size is greater than 2 TiB.
If the partition style is changed after the disk has been used, all data on the disk will be lost, so take care to select an appropriate partition style when initializing the disk. If you must change the partition style to GPT after a disk has been used, it is recommended that you back up the disk data before the change.
-#. Right-click at the unallocated space and choose **New Simple Volume** from the shortcut menu, as shown in :ref:`Figure 5 <en-us_topic_0085634796__en-us_topic_0044524740_fig1945583522619>`.
+#. Right-click at the unallocated space and choose **New Simple Volume** from the shortcut menu.
- .. _en-us_topic_0085634796__en-us_topic_0044524740_fig1945583522619:
- .. figure:: /_static/images/en-us_image_0097597143.png
+ .. figure:: /_static/images/en-us_image_0000001855948589.png
:alt: **Figure 5** New Simple Volume
**Figure 5** New Simple Volume
@@ -116,7 +114,7 @@ Procedure
#. Assign the drive letter and click **Next**.
- .. figure:: /_static/images/en-us_image_0097597149.png
+ .. figure:: /_static/images/en-us_image_0000001855868569.png
:alt: **Figure 8** Assign Drive Letter or Path
**Figure 8** Assign Drive Letter or Path
@@ -139,11 +137,10 @@ Procedure
The partition sizes supported by file systems vary. Choose an appropriate file system format based on your service requirements.
-#. Click **Finish**. Wait for the initialization to complete. When the volume status changes to **Healthy**, the initialization has finished successfully, as shown in :ref:`Figure 11 <en-us_topic_0085634796__en-us_topic_0044524740_fig14464150329>`.
+#. Click **Finish**. Wait for the initialization to complete. When the volume status changes to **Healthy**, the initialization has finished successfully.
- .. _en-us_topic_0085634796__en-us_topic_0044524740_fig14464150329:
- .. figure:: /_static/images/en-us_image_0097597155.png
+ .. figure:: /_static/images/en-us_image_0000001809189772.png
:alt: **Figure 11** Disk initialization succeeded
**Figure 11** Disk initialization succeeded
diff a/umn/source/getting_started/initializing_evs_data_disks/initializing_a_linux_data_disk_fdisk.rst b/umn/source/getting_started/initializing_evs_data_disks/initializing_a_linux_data_disk_fdisk.rst (rejected hunks)
@@ -102,7 +102,7 @@ The following example shows you how a new primary partition can be created on a
.. note::
- If MBR is used, a maximum of 4 primary partitions, or 3 primary partitions plus 1 extended partition can be created. The extended partition must be divided into logical partitions before use.
+ If MBR is used, a maximum of four primary partitions, or three primary partitions plus one extended partition can be created. The extended partition must be divided into logical partitions before use.
Disk partitions created using GPT are not categorized.
diff a/umn/source/instances/optional_installing_a_driver_and_toolkit/installing_a_grid_driver_on_a_gpu-accelerated_ecs.rst b/umn/source/instances/optional_installing_a_driver_and_toolkit/installing_a_grid_driver_on_a_gpu-accelerated_ecs.rst (rejected hunks)
@@ -82,8 +82,6 @@ Downloading GRID Driver and Software License Packages
P3 GPU passthrough Select a version as needed. x86_64
P2s GPU passthrough Select a version as needed. x86_64
P2v GPU passthrough Select a version as needed. x86_64
- P2 GPU passthrough Select a version as needed. x86_64
- P1 GPU passthrough Select a version as needed. x86_64
PI2 GPU passthrough Select a version as needed. x86_64
======== ================== =========================== ================
diff a/umn/source/instances/obtaining_metadata_and_passing_user_data/passing_user_data_to_ecss.rst b/umn/source/instances/obtaining_metadata_and_passing_user_data/passing_user_data_to_ecss.rst (rejected hunks)
@@ -245,21 +245,21 @@ This case illustrates how to use the user data passing function to set the passw
.. table:: **Table 3** Password complexity requirements
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
- | Parameter | Requirement | Example Value |
- +=======================+==============================================================================================================================================================+===============================================================+
- | Password | - Consists of 8 to 26 characters. | YNbUwp!dUc9MClnv |
- | | - Contains at least three of the following character types: | |
- | | | .. note:: |
- | | - Uppercase letters | |
- | | - Lowercase letters | The example password is generated randomly. Do not use it. |
- | | - Digits | |
- | | - Special characters: ``$!@%-_=+[]:./^,{}?`` | |
- | | | |
- | | - Cannot contain the username or the username spelled backwards. | |
- | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) | |
- | | - Cannot start with a slash (/) for Windows ECSs. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Requirement |
+ +===================================+==============================================================================================================================================================+
+ | Password | - Consists of 8 to 26 characters. |
+ | | - Contains at least three of the following character types: |
+ | | |
+ | | - Uppercase letters |
+ | | - Lowercase letters |
+ | | - Digits |
+ | | - Special characters: ``$!@%-_=+[]:./^,{}?`` |
+ | | |
+ | | - Cannot contain the username or the username spelled backwards. |
+ | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) |
+ | | - Cannot start with a slash (/) for Windows ECSs. |
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
User data example:
@@ -309,21 +309,21 @@ In this example, the password of user **root** is reset to **\*****\***.
.. table:: **Table 4** Password complexity requirements
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
- | Parameter | Requirement | Example Value |
- +=======================+==============================================================================================================================================================+===============================================================+
- | Password | - Consists of 8 to 26 characters. | YNbUwp!dUc9MClnv |
- | | - Contains at least three of the following character types: | |
- | | | .. note:: |
- | | - Uppercase letters | |
- | | - Lowercase letters | The example password is generated randomly. Do not use it. |
- | | - Digits | |
- | | - Special characters: ``$!@%-_=+[]:./^,{}?`` | |
- | | | |
- | | - Cannot contain the username or the username spelled backwards. | |
- | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) | |
- | | - Cannot start with a slash (/) for Windows ECSs. | |
- +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Requirement |
+ +===================================+==============================================================================================================================================================+
+ | Password | - Consists of 8 to 26 characters. |
+ | | - Contains at least three of the following character types: |
+ | | |
+ | | - Uppercase letters |
+ | | - Lowercase letters |
+ | | - Digits |
+ | | - Special characters: ``$!@%-_=+[]:./^,{}?`` |
+ | | |
+ | | - Cannot contain the username or the username spelled backwards. |
+ | | - Cannot contain more than two consecutive characters in the same sequence as they appear in the username. (This requirement applies only to Windows ECSs.) |
+ | | - Cannot start with a slash (/) for Windows ECSs. |
+ +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
User data example (Retain the indentation in the following script):
diff a/umn/source/instances/managing_ecss/changing_the_os.rst b/umn/source/instances/managing_ecss/changing_the_os.rst (rejected hunks)
@@ -18,7 +18,7 @@ Constraints
-----------
- The OS change takes about 10 to 20 minutes During this process, the ECS status is **Changing OS**.
-- Do not perform any operations on the ECS before the system injects the password or key pair. Otherwise, the login will fail.
+- Do not perform any operations on the ECS before the system injects the password or key. Otherwise, the login will fail.
- The ECS for which you want to change the OS must be in any of the following states: **Stopped**, **Reinstallation failed**, or **Failed to change the OS**.
- The target ECS must have a system disk attached.
- The EVS disk quota must be greater than 0.
@@ -39,7 +39,6 @@ Notes
- After the OS is changed, the IP and MAC addresses of the ECS remain unchanged.
- After the OS is changed, customized configurations, such as DNS and hostname of the original OS will be reset and require reconfiguration.
- It takes about 10 to 20 minutes to change the OS. During this process, the ECS is in **Changing OS** state.
-- Do not perform any operations on the ECS immediately after its OS is changed. Wait for several minutes until the system successfully injects the password or key. Otherwise, the injection may fail, and the ECS cannot be logged in to.
- After the OS is changed, the password for logging in to the ECS is reset. To retrieve the password, perform the following operations:
- For a Linux ECS, log in to it using the key and set a new password. For instructions about how to log in to an ECS using a key pair, see :ref:`Remotely Logging In to a Linux ECS (Using an SSH Key Pair) <en-us_topic_0017955380>`.
diff a/umn/source/instances/modifying_ecs_specifications/general_operations.rst b/umn/source/instances/modifying_ecs_specifications/general_operations.rst (rejected hunks)
@@ -29,7 +29,7 @@ Notes
-----
- Downgrading ECS specifications (vCPU or memory) will reduce performance.
-- Certain ECS types do not support specifications modification currently. For details about available ECS types as well as their functions and usage, see "NOTE" in :ref:`ECS Types <en-us_topic_0035470096>`.
+- Certain ECS types do not support specifications modification currently. For details about available ECS types and functions, see :ref:`ECS Types <en-us_topic_0035470096>`. For details about restrictions on using different types of ECSs, see their notes.
- When the disk status is **Expanding**, you are not allowed to modify the specifications of the ECS where the disk is attached.
- Before modifying the specifications of a Windows ECS, modify the SAN policy by following the instructions provided in :ref:`Why Does a Disk Attached to a Windows ECS Go Offline? <en-us_topic_0114225937>` to prevent disks from going offline after the specifications are modified.
- Before modifying specifications, make sure that the ECS has been stopped.
This is an automatically created Pull Request for changes to elastic-cloud-server-api-ref to promote changes down the pipeline to Production environment.
The original change can be found under https://gitea.eco.tsi-dev.otc-service.com/docs/elastic-cloud-server/pulls/254.
There were patch conflicts, please review original patch file.