search

opentelekomcloud-docs / elastic-cloud-server

Open Telekom Cloud Elastic Cloud Server docs
Apache License 2.0
3 stars 4 forks source link

Propagate changes to elastic-cloud-server-api-ref from PreProd environment #136

Closed otcbot[bot] closed 11 months ago

otcbot[bot] commented 1 year ago

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/183.

There were patch conflicts, please review original patch file.

otcbot[bot] commented 1 year 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)
@@ -16,6 +16,7 @@ Change History
 +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 2023-05-10                        | Modified the following content:                                                                                                                                                                                                                                                      |
 |                                   |                                                                                                                                                                                                                                                                                      |
+|                                   | -  Added E6 ECSs in :ref:`Large-Memory ECSs <en-us_topic_0038024694>`.                                                                                                                                                                                                               |
 |                                   | -  Added the following I3 flavors in :ref:`Ultra-high I/O ECSs <en-us_topic_0094118976>`: i3.2xlarge.8, i3.4xlarge.8, i3.8xlarge.8, i3.12xlarge.8, and i3.16xlarge.8.                                                                                                                |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 2023-03-04                        | Added the following content:                                                                                                                                                                                                                                                         |
diff a/umn/source/service_overview/ecs_specifications_and_types/large-memory_ecss.rst b/umn/source/service_overview/ecs_specifications_and_types/large-memory_ecss.rst  (rejected hunks)
@@ -18,7 +18,22 @@ Large-memory ECSs provide an even larger amount of memory than memory-optimized

    OLAP and OLTP applications with hyper-threading enabled

-.. table:: **Table 1** E3 ECS specifications
+Specifications
+--------------
+
+.. table:: **Table 1** E6 ECS specifications
+
+   +----------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
+   | Flavor         | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | Virtualization | Hardware                       |
+   |                |       |        |                        |          |                 |           |                |                                |
+   |                |       | (GiB)  | (Gbit/s)               | (10,000) |                 |           |                |                                |
+   +================+=======+========+========================+==========+=================+===========+================+================================+
+   | e6.26xlarge.28 | 104   | 2948   | 30/20                  | 550      | 16              | 8         | KVM            | CPU: Intel® Xeon® Skylake 8280 |
+   +----------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
+   | e6.52xlarge.28 | 208   | 5896   | 40/40                  | 1,000    | 32              | 8         | KVM            |                                |
+   +----------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
+
+.. table:: **Table 2** E3 ECS specifications

    +----------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+--------------------------------+
    | Flavor         | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | Virtualization | Hardware                       |
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)
@@ -355,7 +367,7 @@ High-Performance Computing
 GPU-accelerated
 ---------------

-.. table:: **Table 13** G7 ECS specifications
+.. table:: **Table 14** G7 ECS specifications

    +---------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+------------+----------------+
    | Flavor        | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs           | GPU Memory | Virtualization |
@@ -367,7 +379,7 @@ GPU-accelerated
    | g7.24xlarge.8 | 96    | 768    | 40/36                  | 850      | 16              | 8         | 2 x NVIDIA-A40 | 2 x 48     | KVM            |
    +---------------+-------+--------+------------------------+----------+-----------------+-----------+----------------+------------+----------------+

-.. table:: **Table 14** G6 ECS specifications
+.. table:: **Table 15** G6 ECS specifications

    +---------------+-------+--------+------------------------+----------+-----------------+-----------+--------+------------+----------------+-------------------------------------+
    | Flavor        | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs   | GPU Memory | Virtualization | Hardware                            |
@@ -381,7 +393,7 @@ GPU-accelerated
    | g6.20xlarge.7 | 80    | 560    | 30/30                  | 400      | 32              | 16        | 2 x T4 | 32         | KVM            |                                     |
    +---------------+-------+--------+------------------------+----------+-----------------+-----------+--------+------------+----------------+-------------------------------------+

-.. table:: **Table 15** P3 ECS specifications
+.. table:: **Table 16** P3 ECS specifications

    +---------------+-------+--------+---------------------------------+----------+-----------------+-----------+----------------------+------------+----------------+
    | Flavor        | vCPUs | Memory | Max./Assured Bandwidth (Gbit/s) | Max. PPS | Max. NIC Queues | Max. NICs | GPUs                 | GPU Memory | Virtualization |
@@ -397,7 +409,7 @@ GPU-accelerated
    | p3.16xlarge.8 | 64    | 512    | 36/30                           | 700      | 32              | 8         | 8 x NVIDIA A100 80GB | 640        | KVM            |
    +---------------+-------+--------+---------------------------------+----------+-----------------+-----------+----------------------+------------+----------------+

-.. table:: **Table 16** P2s ECS specifications
+.. table:: **Table 17** 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                                                 |
@@ -413,7 +425,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 17** P2v ECS specifications
+.. table:: **Table 18** 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                                  |
@@ -429,7 +441,7 @@ GPU-accelerated
    | p2v.16xlarge.8 | 64    | 512    | 30/30                           | 400               | 32              | 8         | 8 x V100 | NVLink         | 8 x 16 GiB | KVM            |                                           |
    +----------------+-------+--------+---------------------------------+-------------------+-----------------+-----------+----------+----------------+------------+----------------+-------------------------------------------+

-.. table:: **Table 18** P2 ECS specifications
+.. table:: **Table 19** P2 ECS specifications

    +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+------------------+----------------+----------------------------------------+
    | Flavor       | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs     | GPU Memory | Local Disks      | Virtualization | Hardware                               |
@@ -443,7 +455,7 @@ GPU-accelerated
    | 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 19** P1 ECS specifications
+.. table:: **Table 20** P1 ECS specifications

    +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+
    | Flavor       | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs     | GPU Memory | Local Disks | Virtualization | Hardware                               |
@@ -457,7 +469,7 @@ GPU-accelerated
    | p1.8xlarge.8 | 32    | 256    | 10/6.5                 | 140      | 8               | 12        | 4 x P100 | 4 x 16     | 4 x 800     | KVM            |                                        |
    +--------------+-------+--------+------------------------+----------+-----------------+-----------+----------+------------+-------------+----------------+----------------------------------------+

-.. table:: **Table 20** Pi2 ECS specifications
+.. table:: **Table 21** Pi2 ECS specifications

    +----------------+-------+--------+------------------------+----------+-----------------+-----------+--------+------------+-------------+----------------+----------------------------------------------------------------------------------+
    | Flavor         | vCPUs | Memory | Max./Assured Bandwidth | Max. PPS | Max. NIC Queues | Max. NICs | GPUs   | GPU Memory | Local Disks | Virtualization | Hardware                                                                         |
vladimirhasko commented 1 year ago

recheck

otc-zuul[bot] commented 11 months ago

Build succeeded. https://zuul.otc-service.com/t/eco/buildset/0fd04679155c4f7295f74bdecc39a66e

:heavy_check_mark: noop SUCCESS in 0s :heavy_check_mark: otc-tox-docs SUCCESS in 17m 21s :heavy_check_mark: build-otc-umn SUCCESS in 9m 52s