Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions api-ref/source/auth.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Create the following file **openrc**:

.. code-block:: bash

#For OTC, use this IAM endpoint:
#For T-Cloud Public, use this IAM endpoint:
export OS_AUTH_URL=https://iam.eu-de.otc.t-systems.com:443/v3

#For Swiss OTC, use this IAM endpoint:
#For Swiss T-Cloud Public, use this IAM endpoint:
#export OS_AUTH_URL=https://iam-pub.eu-ch2.sc.otc.t-systems.com/v3

export OS_IDENTITY_API_VERSION=3
Expand All @@ -47,8 +47,8 @@ Get the OSTOKEN

For all REST requests, set the `OSTOKEN` in the HTTP header `X-Auth-Token` to authenticate it. For examples:

2.1. Requests for OTC
^^^^^^^^^^^^^^^^^^^^^
2.1. Requests for T-Cloud Public
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. code-block:: bash

Expand All @@ -58,16 +58,16 @@ For all REST requests, set the `OSTOKEN` in the HTTP header `X-Auth-Token` to a
--request GET \
https://designer.otc-service.com/api/v2/templates

2.2. Requests for Swiss OTC
^^^^^^^^^^^^^^^^^^^^^^^^^^^
2.2. Requests for Swiss T-Cloud Public
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. code-block:: bash

curl \
--header "X-Auth-Token: $OSTOKEN" \
--header "X-Auth-Location: OTC-EU-CH2" \ # Add this header for Swiss OTC
--header "X-Auth-Location: OTC-EU-CH2" \ # Add this header for Swiss T-Cloud Public
--request GET \
https://designer.otc-service.com/api/v2/templates

.. important::
**TTL token limit**: The OSTOKEN issued by Open Telekom Cloud has a default TTL of 24 hours. However, Cloud Create only accepts the OSTOKEN with the TTL of 30 minutes to limit a stolen token. After 30 minutes, you should get a new one.
**TTL token limit**: The OSTOKEN issued by T-Cloud Public has a default TTL of 24 hours. However, Cloud Create only accepts the OSTOKEN with the TTL of 30 minutes to limit a stolen token. After 30 minutes, you should get a new one.
2 changes: 1 addition & 1 deletion api-ref/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
master_doc = 'index'

# General information about the project.
copyright = u'2022-present, Open Telekom Cloud'
copyright = u'2022-present, T-Cloud Public'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
12 changes: 6 additions & 6 deletions api-ref/source/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Examples
********

1. Example to quick deploy OpenShift on Swiss OTC
=================================================
1. Example to quick deploy OpenShift on Swiss T-Cloud Public
============================================================

Step 1. (Optional) Show the template
------------------------------------
Expand All @@ -15,7 +15,7 @@ Request
curl \
--header "Accept: application/json" \
--header "X-Auth-Token: $OSTOKEN" \
--header "X-Auth-Location: OTC-EU-CH2" \ # Add this header for Swiss OTC
--header "X-Auth-Location: OTC-EU-CH2" \ # Add this header for Swiss T-Cloud Public
--request GET \
https://designer.otc-service.com/api/v2/templates/OpenShift:4.16.19

Expand All @@ -31,7 +31,7 @@ Response
"template_author": "Dr. Tri Vo",
"public_template": true,
"documentation_link": "https://docs.otc.t-systems.com/cloud-create/umn/service_catalogs/openshift.html",
"description": "This template deploys a Self-managed OpenShift Container Platform on Open Telekom Cloud with worker nodes in one availability zone...",
"description": "This template deploys a Self-managed OpenShift Container Platform on T-Cloud Public with worker nodes in one availability zone...",
"creation_date": "2024-11-27T14:56:00.353+00:00",
"last_update_date": "2024-11-27T14:56:00.353+00:00",
"inputs": {
Expand Down Expand Up @@ -184,7 +184,7 @@ Request
--header "Content-Type: application/JSON" \
--header "Accept: application/JSON" \
--header "X-Auth-Token: $OSTOKEN" \
--header "X-Auth-Location: OTC-EU-CH2" \ # Add this header for Swiss OTC
--header "X-Auth-Location: OTC-EU-CH2" \ # Add this header for Swiss T-Cloud Public
--request POST \
--data @payload.json \
https://designer.otc-service.com/api/v2/deployments
Expand Down Expand Up @@ -213,7 +213,7 @@ Request
curl \
--header "Accept: application/json" \
--header "X-Auth-Token: $OSTOKEN" \
--header "X-Auth-Location: OTC-EU-CH2" \ # Add this header for Swiss OTC
--header "X-Auth-Location: OTC-EU-CH2" \ # Add this header for Swiss T-Cloud Public
--request GET \
https://designer.otc-service.com/api/v2/deployments/c853667c-2901-4274-aaec-f747e6649cdd

Expand Down
2 changes: 1 addition & 1 deletion api-ref/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Cloud Create API

.. note::

APIv2 has been released. With the new API, you can quick-deploy applications from premade templates (e.g., OpenShift, CCE, ArgoCD, etc.). The API supports both Open Telekom Cloud and Swiss Open Telekom Cloud.
APIv2 has been released. With the new API, you can quick-deploy applications from premade templates (e.g., OpenShift, CCE, ArgoCD, etc.). The API supports both T-Cloud Public and Swiss T-Cloud Public.

.. toctree::
:maxdepth: 1
Expand Down
4 changes: 2 additions & 2 deletions api-ref/source/v2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Sample responses
"template_name": "OpenShift",
"template_version": "4.16.19",
"public_template": true,
"description": "This template deploys a Self-managed OpenShift Container Platform on Open Telekom Cloud with worker nodes in one availability zone..."
"description": "This template deploys a Self-managed OpenShift Container Platform on T-Cloud Public with worker nodes in one availability zone..."
},
{
"id": "08e591c9-d241-4334-be0a-dba4dee0b6a6",
Expand Down Expand Up @@ -93,7 +93,7 @@ Sample responses
"template_author": "Dr. Tri Vo",
"public_template": true,
"documentation_link": "https://docs.otc.t-systems.com/cloud-create/umn/service_catalogs/openshift.html",
"description": "This template deploys a Self-managed OpenShift Container Platform on Open Telekom Cloud with worker nodes in one availability zone...",
"description": "This template deploys a Self-managed OpenShift Container Platform on T-Cloud Public with worker nodes in one availability zone...",
"creation_date": "2024-11-27T14:56:00.353+00:00",
"last_update_date": "2024-11-27T14:56:00.353+00:00",
"inputs": {
Expand Down
8 changes: 4 additions & 4 deletions umn/source/components_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Components overview

This section shows an overview of all components that you can use to design your application. Some components are not yet supported but we can add more upon requests.

.. hint:: If you want to suggest a feature or ask a quick question, please `ask a question in the Open Telekom Cloud Community <https://community.open-telekom-cloud.com/community?id=community_ask_question>`_. Choose the forum **Orchestration and Automation** and select topic **Cloud Create** to ask a question.
.. hint:: If you want to suggest a feature or ask a quick question, please `ask a question in the T-Cloud Public Community <https://community.open-telekom-cloud.com/community?id=community_ask_question>`_. Choose the forum **Orchestration and Automation** and select topic **Cloud Create** to ask a question.

Network
=======

====================== =========================================================================================== ==================== ==============
Components Scenarios Open Telekom Cloud Google Cloud
Components Scenarios T-Cloud Public Google Cloud
====================== =========================================================================================== ==================== ==============
Public network :ref:`Connect a compute to a public network <public network>` Yes Yes
Public network Reuse an existing floating IP and assign to a compute Yes No
Expand All @@ -33,7 +33,7 @@ Storage
=======

================ ===================================================================================================== ==================== ==============
Components Scenarios Open Telekom Cloud Google Cloud
Components Scenarios T-Cloud Public Google Cloud
================ ===================================================================================================== ==================== ==============
Block storage :ref:`Create a block storage with given size <EVS>` Yes Yes
Block storage :ref:`Mount and format a block storage <EVS>` Yes Yes
Expand All @@ -45,7 +45,7 @@ PaaS
====

+-----------------------------+------------------------------------------+--------------------+--------------+
| Components | Scenarios | Open Telekom Cloud | Google Cloud |
| Components | Scenarios | T-Cloud Public | Google Cloud |
+=============================+==========================================+====================+==============+
| Relational Database Service | :ref:`Create a RDS with databases <rds>` | Yes | No |
+-----------------------------+------------------------------------------+--------------------+--------------+
Expand Down
2 changes: 1 addition & 1 deletion umn/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
master_doc = 'index'

# General information about the project.
copyright = u'2022-present, Open Telekom Cloud'
copyright = u'2022-present, T-Cloud Public'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
8 changes: 4 additions & 4 deletions umn/source/getting_started/deploy_app.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ How to choose a cloud provider to deploy
.. tip::
You can create multiple environents (e.g., development, test, production). In each enviroment, you can deploy an application in a cloud provider. To create an additional environment, click on **Configure Environments**.

3. Choose **OTC**. This will deploy the application in the region :code:`eu-de` of Open Telekom Cloud.
4. (Optional) Click on **Configure cloud provider** if you wish to configure any properties of Open Telekom Cloud resources (e.g., keypair or flavor of a Compute etc.)
3. Choose **T-Cloud Public**. This will deploy the application in the region :code:`eu-de` of T-Cloud Public.
4. (Optional) Click on **Configure cloud provider** if you wish to configure any properties of T-Cloud Public resources (e.g., keypair or flavor of a Compute etc.)
5. Click **Deploy** to start.

.. figure:: /_static/images/2-compute-deploy-otc.png
:width: 800

Figure 2. Deploy the application on OTC
Figure 2. Deploy the application on T-Cloud Public

.. note::
Cloud Create deploys your application on Open Telekom Cloud for free of charge (i.e., you only need to pay for the cloud resources you create on Open Telekom Cloud).
Cloud Create deploys your application on T-Cloud Public for free of charge (i.e., you only need to pay for the cloud resources you create on T-Cloud Public).
To deploy your application on Google Cloud, refer to the :ref:`Google deploy`.
8 changes: 4 additions & 4 deletions umn/source/getting_started/specify_image_flavor.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ How to specify a flavor, image, keypair, and availability zone for a compute
.. figure:: /_static/images/2-compute-deploy-matching.png
:width: 800

Figure 1. The matching phase proposes a matched flavor and image of OTC
Figure 1. The matching phase proposes a matched flavor and image of T-Cloud Public

When we designed our :code:`HelloWorld` application, we specified CPU, RAM, and the operating system for the compute component. However, we did not specify a flavor and image. In the above Figure, the designer shows all available flavors and images that Open Telekom Cloud offers. For examples:
When we designed our :code:`HelloWorld` application, we specified CPU, RAM, and the operating system for the compute component. However, we did not specify a flavor and image. In the above Figure, the designer shows all available flavors and images that T-Cloud Public offers. For examples:

* If we input :code:`1CPU`, :code:`1GB RAM`, and the operating system :code:`ubuntu` for the compute, the designer shows the matching flavor :code:`s2.medium.1` and available ubuntu versions: :code:`18.04`, :code:`20.04`, and :code:`22.04`.

* If we input :code:`3GB RAM`, the designer will show the matching flavor :code:`s2.medium.4` with :code:`4GB RAM` (because Open Telekom Cloud does not offer a flavor with 3GB RAM).
* If we input :code:`3GB RAM`, the designer will show the matching flavor :code:`s2.medium.4` with :code:`4GB RAM` (because T-Cloud Public does not offer a flavor with 3GB RAM).

2. How to specify a keypair & availability zone
===============================================

1. Select a **Compute**, the popup shows the following optional properties to configure:
2. **availability_zone**: Choose an availability zone for the compute (e.g., :code:`eu-de-01`).
3. **key_pair**: Click on the drop box to show a list of key pairs of the current user. If no key pairs are shown, go to the `console of Open Telekom Cloud <https://console.otc.t-systems.com/ecm/#/login>`_ and create one. Then go back to refresh the keypair list.
3. **key_pair**: Click on the drop box to show a list of key pairs of the current user. If no key pairs are shown, go to the `console of T-Cloud Public <https://console.otc.t-systems.com/ecm/#/login>`_ and create one. Then go back to refresh the keypair list.

.. figure:: /_static/images/2-compute-deploy-matching-keypair.png
:width: 800
Expand Down
6 changes: 3 additions & 3 deletions umn/source/getting_started/start_deploy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ How to deploy & debug
1. Deploy the app
=================

1. When the app is deployed, the **Review** tab shows which cloud resources are being created on Open Telekom Cloud. In this example, a virtual router, network, port, floating IP, and a Virtual Machine (VM) are created.
1. When the app is deployed, the **Review** tab shows which cloud resources are being created on T-Cloud Public. In this example, a virtual router, network, port, floating IP, and a Virtual Machine (VM) are created.

2. Click on a component (e.g., **Compute**) to show the deployment logs of it:

Expand All @@ -16,12 +16,12 @@ How to deploy & debug

3. In the above example, the logs show that the Terraform configuration for the Compute is generated and being applied.

4. In the console of Open Telekom Cloud, you can see the VM :code:`ctd-Compute-0` is created as well:
4. In the console of T-Cloud Public, you can see the VM :code:`ctd-Compute-0` is created as well:

.. figure:: /_static/images/2-compute-deploy-review-2.png
:width: 800

Figure 2. OTC Console shows the new VM ctd-Compute-0
Figure 2. The Web console shows the new VM ctd-Compute-0

5. After the VM is created, the orchestration engine tests the SSH connection to the VM. After the test, the VM is ready to install a service catalog.

Expand Down
2 changes: 1 addition & 1 deletion umn/source/google/how_to_deploy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Step 4. Choose an availability zone and keypair (optional)

Figure 6. Choose a zone and keypair

.. tip:: If the keypair dropbox is empty, you can create a keypair from the Open Telekom Cloud console and refresh the page to display it.
.. tip:: If the keypair dropbox is empty, you can create a keypair from the T-Cloud Public console and refresh the page to display it.

Step 5. Deploy
--------------
Expand Down
Loading
Loading