From 7819013b04fc9e9a9f1e784418acc5e4810a870d Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:46:10 +0300 Subject: [PATCH 001/102] Update hw-02.md --- 02/hw-02.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/02/hw-02.md b/02/hw-02.md index aafadb13..5fc8607b 100644 --- a/02/hw-02.md +++ b/02/hw-02.md @@ -32,15 +32,18 @@ 5. Инициализируйте проект, выполните код. Исправьте намеренно допущенные синтаксические ошибки. Ищите внимательно, посимвольно. Ответьте, в чём заключается их суть. 6. Подключитесь к консоли ВМ через ssh и выполните команду ``` curl ifconfig.me```. Примечание: К OS ubuntu "out of a box, те из коробки" необходимо подключаться под пользователем ubuntu: ```"ssh ubuntu@vm_ip_address"```. Предварительно убедитесь, что ваш ключ добавлен в ssh-агент: ```eval $(ssh-agent) && ssh-add``` Вы познакомитесь с тем как при создании ВМ создать своего пользователя в блоке metadata в следующей лекции.; -8. Ответьте, как в процессе обучения могут пригодиться параметры ```preemptible = true``` и ```core_fraction=5``` в параметрах ВМ. +8. Ответьте, как в процессе обучения могут пригодиться параметры ```preemptible = true``` и ```core_fraction=5``` в параметрах ВМ.\ +> Прерываемые виртуальные машины, могут быть принудительно остановлены в любой момент. Гарантированная доля CPU, остальное предоставляется по возможности.\ +> Эти параметры помогает экономить финансы. -В качестве решения приложите: + В качестве решения приложите: -- скриншот ЛК Yandex Cloud с созданной ВМ, где видно внешний ip-адрес; -- скриншот консоли, curl должен отобразить тот же внешний ip-адрес; +- скриншот ЛК Yandex Cloud с созданной ВМ, где видно внешний ip-адрес;\ +![ter-homeworks-02-task1-1](https://github.com/user-attachments/assets/adb36344-d7dc-42ef-acdd-acdb4421bb51) \ +- скриншот консоли, curl должен отобразить тот же внешний ip-адрес;\ +![ter-homeworks-02-task1-2](https://github.com/user-attachments/assets/26c7f965-142d-4066-8810-34c63d96196e) - ответы на вопросы. - ### Задание 2 1. Замените все хардкод-**значения** для ресурсов **yandex_compute_image** и **yandex_compute_instance** на **отдельные** переменные. К названиям переменных ВМ добавьте в начало префикс **vm_web_** . Пример: **vm_web_name**. From c15772ab1ce0a6c91080fae1dae229a691528199 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:49:00 +0300 Subject: [PATCH 002/102] Update hw-02.md --- 02/hw-02.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/02/hw-02.md b/02/hw-02.md index 5fc8607b..8f3ea98c 100644 --- a/02/hw-02.md +++ b/02/hw-02.md @@ -32,18 +32,16 @@ 5. Инициализируйте проект, выполните код. Исправьте намеренно допущенные синтаксические ошибки. Ищите внимательно, посимвольно. Ответьте, в чём заключается их суть. 6. Подключитесь к консоли ВМ через ssh и выполните команду ``` curl ifconfig.me```. Примечание: К OS ubuntu "out of a box, те из коробки" необходимо подключаться под пользователем ubuntu: ```"ssh ubuntu@vm_ip_address"```. Предварительно убедитесь, что ваш ключ добавлен в ssh-агент: ```eval $(ssh-agent) && ssh-add``` Вы познакомитесь с тем как при создании ВМ создать своего пользователя в блоке metadata в следующей лекции.; -8. Ответьте, как в процессе обучения могут пригодиться параметры ```preemptible = true``` и ```core_fraction=5``` в параметрах ВМ.\ -> Прерываемые виртуальные машины, могут быть принудительно остановлены в любой момент. Гарантированная доля CPU, остальное предоставляется по возможности.\ -> Эти параметры помогает экономить финансы. +8. Ответьте, как в процессе обучения могут пригодиться параметры ```preemptible = true``` и ```core_fraction=5``` в параметрах ВМ. - В качестве решения приложите: +В качестве решения приложите: - скриншот ЛК Yandex Cloud с созданной ВМ, где видно внешний ip-адрес;\ ![ter-homeworks-02-task1-1](https://github.com/user-attachments/assets/adb36344-d7dc-42ef-acdd-acdb4421bb51) \ - скриншот консоли, curl должен отобразить тот же внешний ip-адрес;\ ![ter-homeworks-02-task1-2](https://github.com/user-attachments/assets/26c7f965-142d-4066-8810-34c63d96196e) -- ответы на вопросы. - +- ответы на вопросы.\ +> Прерываемые виртуальные машины, могут быть принудительно остановлены в любой момент. Гарантированная доля CPU, остальное предоставляется по возможности. Эти параметры помогает экономить финансы. ### Задание 2 1. Замените все хардкод-**значения** для ресурсов **yandex_compute_image** и **yandex_compute_instance** на **отдельные** переменные. К названиям переменных ВМ добавьте в начало префикс **vm_web_** . Пример: **vm_web_name**. From 8046b34c73571062314d08c58d7284b022988626 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 12:28:56 +0300 Subject: [PATCH 003/102] Update variables.tf --- 02/src/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/variables.tf b/02/src/variables.tf index 162cad0e..c049c7f3 100644 --- a/02/src/variables.tf +++ b/02/src/variables.tf @@ -36,6 +36,6 @@ variable "vpc_name" { variable "vms_ssh_root_key" { type = string - default = "" + default = "1111" description = "ssh-keygen -t ed25519" } From 26295560156f87bf67a870cd141cbc3525de34f2 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 12:51:54 +0300 Subject: [PATCH 004/102] Update variables.tf --- 02/src/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/variables.tf b/02/src/variables.tf index c049c7f3..d536a6f7 100644 --- a/02/src/variables.tf +++ b/02/src/variables.tf @@ -36,6 +36,6 @@ variable "vpc_name" { variable "vms_ssh_root_key" { type = string - default = "1111" + default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDCpYiAOHRWfQngzfWfpjq8tIe+Czk08aER7ytsEgj/Dn9rSN1c32dSBp55UIJOHE9Sc6EHmIe/1FPqEzR1CYzcqIA1nk4DuBgtCwwEbUAqRBHQjKGAyp7n2Mtiyv82X5M12NDB6v2iHf47vEakFRK4zxAWU+yw1C8bvkIKTG5LTGmqRJy+rZmQRuzhoA+UAyg2CRnrosFRcu3sa/GV/atsNCv838i+HoPhTiPyRPA9rWxQr1fTVmqVWaswMylOBV1jvsHzICvdL71QIUkvi2Cq798/Zsi8tP6BrsB0snnIMuXAwjNPWaqIHU/JbSsNLSbc+sFSpUw1TQhsd6S2mr6Fz7xV356XBhL1JfEdPty+29O5x/tnSp28AtO4CAscK+6ea2arFjDiurhlGz1AUu2xALT5DbiiHouWIjdcnT+CLcMy6V0Nod2cDZ3apDb54IEleMFllYLe8jbbg+XUklQqqWEy0wN2WsHgo9kQG6uyUKbJrPVd53O5Gik/BnOWtSU=" description = "ssh-keygen -t ed25519" } From 8e197da1cb36b3b746375e06adc3b2cf570a08be Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:10:55 +0300 Subject: [PATCH 005/102] Update variables.tf --- 02/src/variables.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/02/src/variables.tf b/02/src/variables.tf index d536a6f7..d9348c71 100644 --- a/02/src/variables.tf +++ b/02/src/variables.tf @@ -1,16 +1,19 @@ ###cloud vars variable "token" { type = string + dafault = ${YC_TOKEN} description = "OAuth-token; https://cloud.yandex.ru/docs/iam/concepts/authorization/oauth-token" } variable "cloud_id" { type = string + default = ${YC_CLOUD_ID} description = "https://cloud.yandex.ru/docs/resource-manager/operations/cloud/get-id" } variable "folder_id" { type = string + default = ${YC_FOLDER_ID} description = "https://cloud.yandex.ru/docs/resource-manager/operations/folder/get-id" } @@ -33,7 +36,6 @@ variable "vpc_name" { ###ssh vars - variable "vms_ssh_root_key" { type = string default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDCpYiAOHRWfQngzfWfpjq8tIe+Czk08aER7ytsEgj/Dn9rSN1c32dSBp55UIJOHE9Sc6EHmIe/1FPqEzR1CYzcqIA1nk4DuBgtCwwEbUAqRBHQjKGAyp7n2Mtiyv82X5M12NDB6v2iHf47vEakFRK4zxAWU+yw1C8bvkIKTG5LTGmqRJy+rZmQRuzhoA+UAyg2CRnrosFRcu3sa/GV/atsNCv838i+HoPhTiPyRPA9rWxQr1fTVmqVWaswMylOBV1jvsHzICvdL71QIUkvi2Cq798/Zsi8tP6BrsB0snnIMuXAwjNPWaqIHU/JbSsNLSbc+sFSpUw1TQhsd6S2mr6Fz7xV356XBhL1JfEdPty+29O5x/tnSp28AtO4CAscK+6ea2arFjDiurhlGz1AUu2xALT5DbiiHouWIjdcnT+CLcMy6V0Nod2cDZ3apDb54IEleMFllYLe8jbbg+XUklQqqWEy0wN2WsHgo9kQG6uyUKbJrPVd53O5Gik/BnOWtSU=" From 9f6b4582c8125a0eb2800e03eb2e0fa621cfb53c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Sep 2024 14:53:54 +0300 Subject: [PATCH 006/102] Update README.md --- 02/src/main.tf | 4 ++-- 02/src/providers.tf | 2 +- 02/src/variables.tf | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 49baf600..0de3564e 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -14,9 +14,9 @@ data "yandex_compute_image" "ubuntu" { } resource "yandex_compute_instance" "platform" { name = "netology-develop-platform-web" - platform_id = "standart-v4" + platform_id = "standard-v1" resources { - cores = 1 + cores = 2 memory = 1 core_fraction = 5 } diff --git a/02/src/providers.tf b/02/src/providers.tf index fae4dc37..8a414e57 100644 --- a/02/src/providers.tf +++ b/02/src/providers.tf @@ -12,5 +12,5 @@ provider "yandex" { cloud_id = var.cloud_id folder_id = var.folder_id zone = var.default_zone - service_account_key_file = file("~/.authorized_key.json") + service_account_key_file = file("~/key.json") } diff --git a/02/src/variables.tf b/02/src/variables.tf index d9348c71..9c35bba4 100644 --- a/02/src/variables.tf +++ b/02/src/variables.tf @@ -1,19 +1,16 @@ ###cloud vars variable "token" { type = string - dafault = ${YC_TOKEN} description = "OAuth-token; https://cloud.yandex.ru/docs/iam/concepts/authorization/oauth-token" } variable "cloud_id" { type = string - default = ${YC_CLOUD_ID} description = "https://cloud.yandex.ru/docs/resource-manager/operations/cloud/get-id" } variable "folder_id" { type = string - default = ${YC_FOLDER_ID} description = "https://cloud.yandex.ru/docs/resource-manager/operations/folder/get-id" } @@ -34,10 +31,9 @@ variable "vpc_name" { description = "VPC network & subnet name" } - ###ssh vars variable "vms_ssh_root_key" { type = string - default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDCpYiAOHRWfQngzfWfpjq8tIe+Czk08aER7ytsEgj/Dn9rSN1c32dSBp55UIJOHE9Sc6EHmIe/1FPqEzR1CYzcqIA1nk4DuBgtCwwEbUAqRBHQjKGAyp7n2Mtiyv82X5M12NDB6v2iHf47vEakFRK4zxAWU+yw1C8bvkIKTG5LTGmqRJy+rZmQRuzhoA+UAyg2CRnrosFRcu3sa/GV/atsNCv838i+HoPhTiPyRPA9rWxQr1fTVmqVWaswMylOBV1jvsHzICvdL71QIUkvi2Cq798/Zsi8tP6BrsB0snnIMuXAwjNPWaqIHU/JbSsNLSbc+sFSpUw1TQhsd6S2mr6Fz7xV356XBhL1JfEdPty+29O5x/tnSp28AtO4CAscK+6ea2arFjDiurhlGz1AUu2xALT5DbiiHouWIjdcnT+CLcMy6V0Nod2cDZ3apDb54IEleMFllYLe8jbbg+XUklQqqWEy0wN2WsHgo9kQG6uyUKbJrPVd53O5Gik/BnOWtSU=" + default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" description = "ssh-keygen -t ed25519" } From 34287369fda8a5e58f3115ce7c1b41dc93acb74a Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:03:22 +0300 Subject: [PATCH 007/102] Update hw-02.md --- 02/hw-02.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/02/hw-02.md b/02/hw-02.md index 8f3ea98c..28245e9f 100644 --- a/02/hw-02.md +++ b/02/hw-02.md @@ -30,17 +30,18 @@ 2. Создайте сервисный аккаунт и ключ. [service_account_key_file](https://terraform-provider.yandexcloud.net). 4. Сгенерируйте новый или используйте свой текущий ssh-ключ. Запишите его открытую(public) часть в переменную **vms_ssh_public_root_key**. 5. Инициализируйте проект, выполните код. Исправьте намеренно допущенные синтаксические ошибки. Ищите внимательно, посимвольно. Ответьте, в чём заключается их суть. -6. Подключитесь к консоли ВМ через ssh и выполните команду ``` curl ifconfig.me```. +> В большенстве своём параметры либо не указаны, либо указаны не верно +7. Подключитесь к консоли ВМ через ssh и выполните команду ``` curl ifconfig.me```. Примечание: К OS ubuntu "out of a box, те из коробки" необходимо подключаться под пользователем ubuntu: ```"ssh ubuntu@vm_ip_address"```. Предварительно убедитесь, что ваш ключ добавлен в ssh-агент: ```eval $(ssh-agent) && ssh-add``` Вы познакомитесь с тем как при создании ВМ создать своего пользователя в блоке metadata в следующей лекции.; 8. Ответьте, как в процессе обучения могут пригодиться параметры ```preemptible = true``` и ```core_fraction=5``` в параметрах ВМ. В качестве решения приложите: - скриншот ЛК Yandex Cloud с созданной ВМ, где видно внешний ip-адрес;\ -![ter-homeworks-02-task1-1](https://github.com/user-attachments/assets/adb36344-d7dc-42ef-acdd-acdb4421bb51) \ +![ter-homeworks-02-task1-1](https://github.com/user-attachments/assets/fafd6433-e136-4a02-b293-701592d40cd6) \ - скриншот консоли, curl должен отобразить тот же внешний ip-адрес;\ -![ter-homeworks-02-task1-2](https://github.com/user-attachments/assets/26c7f965-142d-4066-8810-34c63d96196e) -- ответы на вопросы.\ +![ter-homeworks-02-task1-2](https://github.com/user-attachments/assets/2100b261-82ed-4ea1-b03f-937dc845ced5) \ +- ответы на вопросы. > Прерываемые виртуальные машины, могут быть принудительно остановлены в любой момент. Гарантированная доля CPU, остальное предоставляется по возможности. Эти параметры помогает экономить финансы. ### Задание 2 From a2e4d97630b1933a0c456b23d5ea05b82cd3ab64 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:10:59 +0300 Subject: [PATCH 008/102] Update main.tf --- 02/src/main.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 0de3564e..b426c092 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -10,15 +10,15 @@ resource "yandex_vpc_subnet" "develop" { data "yandex_compute_image" "ubuntu" { - family = "ubuntu-2004-lts" + family = var.vm_web_yandex_compute_image_family } resource "yandex_compute_instance" "platform" { - name = "netology-develop-platform-web" - platform_id = "standard-v1" + name = var.vm_web_yandex_compute_instance_name + platform_id = var.vm_web_yandex_compute_instance_platform_id resources { - cores = 2 - memory = 1 - core_fraction = 5 + cores = var.vm_web_yandex_compute_instance_resources_cores + memory = var.vm_web_yandex_compute_instance_resources_memory + core_fraction = var.vm_web_yandex_compute_instance_resources_core_fraction } boot_disk { initialize_params { From 2339ab5a46915e7f053f36587c82b80b0cc406ad Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:16:40 +0300 Subject: [PATCH 009/102] Update variables.tf --- 02/src/variables.tf | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/02/src/variables.tf b/02/src/variables.tf index 9c35bba4..e2dfc416 100644 --- a/02/src/variables.tf +++ b/02/src/variables.tf @@ -31,6 +31,37 @@ variable "vpc_name" { description = "VPC network & subnet name" } + +variables "vm_web_yandex_compute_image_family" { + type = string + default = "ubuntu-2004-lts" +} + +variables "vm_web_yandex_compute_instance_name" { + type = string + default = "netology-develop-platform-web" +} + +variables "vm_web_yandex_compute_instance_platform_id" { + type = string + default = "standard-v1" +} + +variables "vm_web_yandex_compute_instance_resources_cores" { + type = string + default = 2 +} + +variables "vm_web_yandex_compute_instance_resources_memory"" { + type = string + default = 1 +} + +variables "vm_web_yandex_compute_instance_resources_core_fraction"" { + type = string + default = 5 +} + ###ssh vars variable "vms_ssh_root_key" { type = string From 95404f76e91b80f38901c4beffad69608777092a Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:19:49 +0300 Subject: [PATCH 010/102] Update variables.tf --- 02/src/variables.tf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/02/src/variables.tf b/02/src/variables.tf index e2dfc416..007fb5fe 100644 --- a/02/src/variables.tf +++ b/02/src/variables.tf @@ -32,33 +32,33 @@ variable "vpc_name" { } -variables "vm_web_yandex_compute_image_family" { +variable "vm_web_yandex_compute_image_family" { type = string default = "ubuntu-2004-lts" } -variables "vm_web_yandex_compute_instance_name" { +variable "vm_web_yandex_compute_instance_name" { type = string default = "netology-develop-platform-web" } -variables "vm_web_yandex_compute_instance_platform_id" { +variable "vm_web_yandex_compute_instance_platform_id" { type = string default = "standard-v1" } -variables "vm_web_yandex_compute_instance_resources_cores" { - type = string +variable "vm_web_yandex_compute_instance_resources_cores" { + type = number default = 2 } -variables "vm_web_yandex_compute_instance_resources_memory"" { - type = string +variable "vm_web_yandex_compute_instance_resources_memory" { + type = number default = 1 } -variables "vm_web_yandex_compute_instance_resources_core_fraction"" { - type = string +variable "vm_web_yandex_compute_instance_resources_core_fraction" { + type = number default = 5 } From c908c8e0e0a322bf5eb118f5453ba2327f22117a Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Sep 2024 15:22:10 +0300 Subject: [PATCH 011/102] Update README.md --- 02/src/vms_platform.tf | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 02/src/vms_platform.tf diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf new file mode 100644 index 00000000..007fb5fe --- /dev/null +++ b/02/src/vms_platform.tf @@ -0,0 +1,70 @@ +###cloud vars +variable "token" { + type = string + description = "OAuth-token; https://cloud.yandex.ru/docs/iam/concepts/authorization/oauth-token" +} + +variable "cloud_id" { + type = string + description = "https://cloud.yandex.ru/docs/resource-manager/operations/cloud/get-id" +} + +variable "folder_id" { + type = string + description = "https://cloud.yandex.ru/docs/resource-manager/operations/folder/get-id" +} + +variable "default_zone" { + type = string + default = "ru-central1-a" + description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" +} +variable "default_cidr" { + type = list(string) + default = ["10.0.1.0/24"] + description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" +} + +variable "vpc_name" { + type = string + default = "develop" + description = "VPC network & subnet name" +} + + +variable "vm_web_yandex_compute_image_family" { + type = string + default = "ubuntu-2004-lts" +} + +variable "vm_web_yandex_compute_instance_name" { + type = string + default = "netology-develop-platform-web" +} + +variable "vm_web_yandex_compute_instance_platform_id" { + type = string + default = "standard-v1" +} + +variable "vm_web_yandex_compute_instance_resources_cores" { + type = number + default = 2 +} + +variable "vm_web_yandex_compute_instance_resources_memory" { + type = number + default = 1 +} + +variable "vm_web_yandex_compute_instance_resources_core_fraction" { + type = number + default = 5 +} + +###ssh vars +variable "vms_ssh_root_key" { + type = string + default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" + description = "ssh-keygen -t ed25519" +} From ed31ce6ed59f9b40e353afba8505d7c759666081 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:25:26 +0300 Subject: [PATCH 012/102] Update main.tf --- 02/src/main.tf | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index b426c092..9cc99ee5 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -8,10 +8,10 @@ resource "yandex_vpc_subnet" "develop" { v4_cidr_blocks = var.default_cidr } - data "yandex_compute_image" "ubuntu" { family = var.vm_web_yandex_compute_image_family } + resource "yandex_compute_instance" "platform" { name = var.vm_web_yandex_compute_instance_name platform_id = var.vm_web_yandex_compute_instance_platform_id @@ -32,10 +32,34 @@ resource "yandex_compute_instance" "platform" { subnet_id = yandex_vpc_subnet.develop.id nat = true } - metadata = { serial-port-enable = 1 ssh-keys = "ubuntu:${var.vms_ssh_root_key}" } +} +resource "yandex_compute_instance" "platform" { + name = var.vm_db_yandex_compute_instance_name + platform_id = var.vm_db_yandex_compute_instance_platform_id + resources { + cores = var.db_web_yandex_compute_instance_resources_cores + memory = var.db_web_yandex_compute_instance_resources_memory + core_fraction = var.db_web_yandex_compute_instance_resources_core_fraction + } + boot_disk { + initialize_params { + image_id = data.yandex_compute_image.ubuntu.image_id + } + } + scheduling_policy { + preemptible = true + } + network_interface { + subnet_id = yandex_vpc_subnet.develop.id + nat = true + } + metadata = { + serial-port-enable = 1 + ssh-keys = "ubuntu:${var.vms_ssh_root_key}" + } } From 565efd2a021dd676c1fb26b8e4e56d71a93fb38b Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:29:57 +0300 Subject: [PATCH 013/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 007fb5fe..a9b9d036 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -62,6 +62,44 @@ variable "vm_web_yandex_compute_instance_resources_core_fraction" { default = 5 } + +variable "db_default_zone" { + type = string + default = "ru-central1-b" + description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" +} + +variable "vm_db_yandex_compute_image_family" { + type = string + default = "ubuntu-2004-lts" +} + +variable "vm_db_yandex_compute_instance_name" { + type = string + default = "netology-develop-platform-web" +} + +variable "vm_db_yandex_compute_instance_platform_id" { + type = string + default = "standard-v1" +} + +variable "vm_db_yandex_compute_instance_resources_cores" { + type = number + default = 2 +} + +variable "vm_db_yandex_compute_instance_resources_memory" { + type = number + default = 2 +} + +variable "vm_db_yandex_compute_instance_resources_core_fraction" { + type = number + default = 20 +} + + ###ssh vars variable "vms_ssh_root_key" { type = string From fa8ece2657be1cc0d72db9c1cd20d8c2b1b41df1 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:46:20 +0300 Subject: [PATCH 014/102] Update main.tf --- 02/src/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/02/src/main.tf b/02/src/main.tf index 9cc99ee5..4cf452d3 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -41,6 +41,7 @@ resource "yandex_compute_instance" "platform" { resource "yandex_compute_instance" "platform" { name = var.vm_db_yandex_compute_instance_name platform_id = var.vm_db_yandex_compute_instance_platform_id + zone = "ru-central1-b" resources { cores = var.db_web_yandex_compute_instance_resources_cores memory = var.db_web_yandex_compute_instance_resources_memory From 6ec1d62e076218184458ab1ba21e50b0d9f07332 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:50:45 +0300 Subject: [PATCH 015/102] Update main.tf --- 02/src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 4cf452d3..ff251e18 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -12,7 +12,7 @@ data "yandex_compute_image" "ubuntu" { family = var.vm_web_yandex_compute_image_family } -resource "yandex_compute_instance" "platform" { +resource "yandex_compute_instance" "platform-web" { name = var.vm_web_yandex_compute_instance_name platform_id = var.vm_web_yandex_compute_instance_platform_id resources { @@ -38,7 +38,7 @@ resource "yandex_compute_instance" "platform" { } } -resource "yandex_compute_instance" "platform" { +resource "yandex_compute_instance" "platform-db" { name = var.vm_db_yandex_compute_instance_name platform_id = var.vm_db_yandex_compute_instance_platform_id zone = "ru-central1-b" From acbcee8bea49a8076fcc80b13c08abb1f2951eb4 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:52:52 +0300 Subject: [PATCH 016/102] Update main.tf --- 02/src/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index ff251e18..e7643ae7 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -43,9 +43,9 @@ resource "yandex_compute_instance" "platform-db" { platform_id = var.vm_db_yandex_compute_instance_platform_id zone = "ru-central1-b" resources { - cores = var.db_web_yandex_compute_instance_resources_cores - memory = var.db_web_yandex_compute_instance_resources_memory - core_fraction = var.db_web_yandex_compute_instance_resources_core_fraction + cores = var.vm_db_yandex_compute_instance_resources_cores + memory = var.vm_db_yandex_compute_instance_resources_memory + core_fraction = var.vm.db_yandex_compute_instance_resources_core_fraction } boot_disk { initialize_params { From 87df691a4b4b77b403c311d1dea939bb860768c5 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:54:10 +0300 Subject: [PATCH 017/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index a9b9d036..61e25bbd 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -63,12 +63,6 @@ variable "vm_web_yandex_compute_instance_resources_core_fraction" { } -variable "db_default_zone" { - type = string - default = "ru-central1-b" - description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" -} - variable "vm_db_yandex_compute_image_family" { type = string default = "ubuntu-2004-lts" From 33ff8f39f12aee27d6ba5632761517533ee254fd Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 15:54:59 +0300 Subject: [PATCH 018/102] Update main.tf --- 02/src/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/main.tf b/02/src/main.tf index e7643ae7..91d984a6 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -45,7 +45,7 @@ resource "yandex_compute_instance" "platform-db" { resources { cores = var.vm_db_yandex_compute_instance_resources_cores memory = var.vm_db_yandex_compute_instance_resources_memory - core_fraction = var.vm.db_yandex_compute_instance_resources_core_fraction + core_fraction = var.vm_db_yandex_compute_instance_resources_core_fraction } boot_disk { initialize_params { From 28b3c848865613b3e828de2845f5c26c4cecc5f8 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:09:55 +0300 Subject: [PATCH 019/102] Update variables.tf --- 02/src/variables.tf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/02/src/variables.tf b/02/src/variables.tf index 007fb5fe..819234fa 100644 --- a/02/src/variables.tf +++ b/02/src/variables.tf @@ -14,11 +14,18 @@ variable "folder_id" { description = "https://cloud.yandex.ru/docs/resource-manager/operations/folder/get-id" } -variable "default_zone" { +variable "default_zone-web" { type = string default = "ru-central1-a" description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" } + +variable "default_zone-db" { + type = string + default = "ru-central1-b" + description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" +} + variable "default_cidr" { type = list(string) default = ["10.0.1.0/24"] From 1ac08880d40b4936ff358094869adfb063ee49ff Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:11:30 +0300 Subject: [PATCH 020/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 61e25bbd..37e20519 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -14,11 +14,17 @@ variable "folder_id" { description = "https://cloud.yandex.ru/docs/resource-manager/operations/folder/get-id" } -variable "default_zone" { +variable "default_zone-web" { type = string default = "ru-central1-a" description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" } +variable "default_zone-db" { + type = string + default = "ru-central1-b" + description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" +} + variable "default_cidr" { type = list(string) default = ["10.0.1.0/24"] From aa4958939d452ddaa591bafc10c856da9381d24a Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:11:53 +0300 Subject: [PATCH 021/102] Update variables.tf --- 02/src/variables.tf | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/02/src/variables.tf b/02/src/variables.tf index 819234fa..79bea7b8 100644 --- a/02/src/variables.tf +++ b/02/src/variables.tf @@ -14,18 +14,12 @@ variable "folder_id" { description = "https://cloud.yandex.ru/docs/resource-manager/operations/folder/get-id" } -variable "default_zone-web" { +variable "default_zone" { type = string default = "ru-central1-a" description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" } -variable "default_zone-db" { - type = string - default = "ru-central1-b" - description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" -} - variable "default_cidr" { type = list(string) default = ["10.0.1.0/24"] From 336c1e7ea6d029786fe824d3feb717736756ab7c Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:14:32 +0300 Subject: [PATCH 022/102] Update main.tf --- 02/src/main.tf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 91d984a6..6d9078ed 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -1,9 +1,15 @@ resource "yandex_vpc_network" "develop" { name = var.vpc_name } -resource "yandex_vpc_subnet" "develop" { +resource "yandex_vpc_subnet" "developweb" { name = var.vpc_name - zone = var.default_zone + zone = var.default_zone-web + network_id = yandex_vpc_network.develop.id + v4_cidr_blocks = var.default_cidr +} +resource "yandex_vpc_subnet" "develop-db" { + name = var.vpc_name + zone = var.default_zone-db network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr } @@ -29,7 +35,7 @@ resource "yandex_compute_instance" "platform-web" { preemptible = true } network_interface { - subnet_id = yandex_vpc_subnet.develop.id + subnet_id = yandex_vpc_subnet.develop-web.id nat = true } metadata = { @@ -56,7 +62,7 @@ resource "yandex_compute_instance" "platform-db" { preemptible = true } network_interface { - subnet_id = yandex_vpc_subnet.develop.id + subnet_id = yandex_vpc_subnet.develop-db.id nat = true } metadata = { From c3be8f24c72ad9634a7cc1e92d6d15cb1e900ba4 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:20:52 +0300 Subject: [PATCH 023/102] Update providers.tf --- 02/src/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/providers.tf b/02/src/providers.tf index 8a414e57..f10ca241 100644 --- a/02/src/providers.tf +++ b/02/src/providers.tf @@ -11,6 +11,6 @@ provider "yandex" { # token = var.token cloud_id = var.cloud_id folder_id = var.folder_id - zone = var.default_zone + zone = var.default_zone-web service_account_key_file = file("~/key.json") } From ec5b07e3e98401cbcee73b7c9e1f700cc5c68984 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:22:16 +0300 Subject: [PATCH 024/102] Update main.tf --- 02/src/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/main.tf b/02/src/main.tf index 6d9078ed..1932b63c 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -1,7 +1,7 @@ resource "yandex_vpc_network" "develop" { name = var.vpc_name } -resource "yandex_vpc_subnet" "developweb" { +resource "yandex_vpc_subnet" "develop-web" { name = var.vpc_name zone = var.default_zone-web network_id = yandex_vpc_network.develop.id From b690625839d7c4b602d76bbb4da8397482ac8bb3 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:26:21 +0300 Subject: [PATCH 025/102] Update main.tf --- 02/src/main.tf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 1932b63c..d2a9af8f 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -1,6 +1,10 @@ -resource "yandex_vpc_network" "develop" { - name = var.vpc_name +resource "yandex_vpc_network" "develop-web" { + name = var.vpc_name-web } +resource "yandex_vpc_network" "develop-db" { + name = var.vpc_name-db +} + resource "yandex_vpc_subnet" "develop-web" { name = var.vpc_name zone = var.default_zone-web From 00193d49e84e3241c28eef194173aa316e26dfe7 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:27:46 +0300 Subject: [PATCH 026/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 37e20519..3e1eba83 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -25,15 +25,25 @@ variable "default_zone-db" { description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" } -variable "default_cidr" { +variable "default_cidr-web" { + type = list(string) + default = ["10.0.1.0/24"] + description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" +} +variable "default_cidr-db" { type = list(string) default = ["10.0.1.0/24"] description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" } -variable "vpc_name" { +variable "vpc_name-web" { + type = string + default = "develop-web" + description = "VPC network & subnet name" +} +variable "vpc_name-db" { type = string - default = "develop" + default = "develop-db" description = "VPC network & subnet name" } From cc512aa18f2206e27ae20abb4bb4f9881cd65fc5 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:28:45 +0300 Subject: [PATCH 027/102] Update main.tf --- 02/src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index d2a9af8f..8c8b8290 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -6,13 +6,13 @@ resource "yandex_vpc_network" "develop-db" { } resource "yandex_vpc_subnet" "develop-web" { - name = var.vpc_name + name = var.vpc_name-web zone = var.default_zone-web network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr } resource "yandex_vpc_subnet" "develop-db" { - name = var.vpc_name + name = var.vpc_name-db zone = var.default_zone-db network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr From a7152aa69d12cbd4fcc18150a1581e287caad654 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:29:40 +0300 Subject: [PATCH 028/102] Update main.tf --- 02/src/main.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 8c8b8290..17e96163 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -8,14 +8,14 @@ resource "yandex_vpc_network" "develop-db" { resource "yandex_vpc_subnet" "develop-web" { name = var.vpc_name-web zone = var.default_zone-web - network_id = yandex_vpc_network.develop.id - v4_cidr_blocks = var.default_cidr + network_id = yandex_vpc_network-web.develop.id + v4_cidr_blocks = var.default_cidr-web } resource "yandex_vpc_subnet" "develop-db" { name = var.vpc_name-db zone = var.default_zone-db - network_id = yandex_vpc_network.develop.id - v4_cidr_blocks = var.default_cidr + network_id = yandex_vpc_network-db.develop.id + v4_cidr_blocks = var.default_cidr-db } data "yandex_compute_image" "ubuntu" { From 88314db52fc9399c2605d486cbd4b9a3860703cf Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:30:43 +0300 Subject: [PATCH 029/102] Update main.tf --- 02/src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 17e96163..588bc184 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -8,13 +8,13 @@ resource "yandex_vpc_network" "develop-db" { resource "yandex_vpc_subnet" "develop-web" { name = var.vpc_name-web zone = var.default_zone-web - network_id = yandex_vpc_network-web.develop.id + network_id = yandex_vpc_network.develop-web.id v4_cidr_blocks = var.default_cidr-web } resource "yandex_vpc_subnet" "develop-db" { name = var.vpc_name-db zone = var.default_zone-db - network_id = yandex_vpc_network-db.develop.id + network_id = yandex_vpc_network.develop-db.id v4_cidr_blocks = var.default_cidr-db } From aead6ea34c7e28ad5816eb292e5a48453c4cf3f4 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:37:51 +0300 Subject: [PATCH 030/102] Update main.tf --- 02/src/main.tf | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 588bc184..c38fc5dd 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -1,18 +1,15 @@ -resource "yandex_vpc_network" "develop-web" { - name = var.vpc_name-web -} -resource "yandex_vpc_network" "develop-db" { - name = var.vpc_name-db +resource "yandex_vpc_network" "develop" { + name = var.vpc_name } resource "yandex_vpc_subnet" "develop-web" { - name = var.vpc_name-web + name = var.vpc_name zone = var.default_zone-web network_id = yandex_vpc_network.develop-web.id v4_cidr_blocks = var.default_cidr-web } resource "yandex_vpc_subnet" "develop-db" { - name = var.vpc_name-db + name = var.vpc_name zone = var.default_zone-db network_id = yandex_vpc_network.develop-db.id v4_cidr_blocks = var.default_cidr-db From c4cca15c3406eae021cf7ad3c0ebf20e6e252667 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:39:05 +0300 Subject: [PATCH 031/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 3e1eba83..97f05836 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -36,14 +36,9 @@ variable "default_cidr-db" { description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" } -variable "vpc_name-web" { +variable "vpc_name" { type = string - default = "develop-web" - description = "VPC network & subnet name" -} -variable "vpc_name-db" { - type = string - default = "develop-db" + default = "develop" description = "VPC network & subnet name" } From d6ac021a0b41bd3c7fb9f4c35df981c49678138e Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:41:41 +0300 Subject: [PATCH 032/102] Update main.tf --- 02/src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index c38fc5dd..7cab0ca3 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -5,13 +5,13 @@ resource "yandex_vpc_network" "develop" { resource "yandex_vpc_subnet" "develop-web" { name = var.vpc_name zone = var.default_zone-web - network_id = yandex_vpc_network.develop-web.id + network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr-web } resource "yandex_vpc_subnet" "develop-db" { name = var.vpc_name zone = var.default_zone-db - network_id = yandex_vpc_network.develop-db.id + network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr-db } From 880d09d5f50d171e542f6c5a92e5b3b97260eb44 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:42:51 +0300 Subject: [PATCH 033/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 97f05836..5b04d314 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -32,7 +32,7 @@ variable "default_cidr-web" { } variable "default_cidr-db" { type = list(string) - default = ["10.0.1.0/24"] + default = ["10.0.2.0/24"] description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" } From 5df32e038dc4cecd5e5619e8469fe4b370b302cb Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:45:19 +0300 Subject: [PATCH 034/102] Update main.tf --- 02/src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 7cab0ca3..a24c62e7 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -3,13 +3,13 @@ resource "yandex_vpc_network" "develop" { } resource "yandex_vpc_subnet" "develop-web" { - name = var.vpc_name + name = develop-web zone = var.default_zone-web network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr-web } resource "yandex_vpc_subnet" "develop-db" { - name = var.vpc_name + name = develo-db zone = var.default_zone-db network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr-db From fb7a3fdab3a5cba1745b64634ba2e8e2a51e7994 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:40:10 +0300 Subject: [PATCH 035/102] Update main.tf --- 02/src/main.tf | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index a24c62e7..8705f88b 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -2,17 +2,17 @@ resource "yandex_vpc_network" "develop" { name = var.vpc_name } -resource "yandex_vpc_subnet" "develop-web" { - name = develop-web - zone = var.default_zone-web +resource "yandex_vpc_subnet" "develop-a" { + name = var.name.zone-a + zone = var.default_zone-a network_id = yandex_vpc_network.develop.id - v4_cidr_blocks = var.default_cidr-web + v4_cidr_blocks = var.default_cidr-zone-a } -resource "yandex_vpc_subnet" "develop-db" { - name = develo-db - zone = var.default_zone-db +resource "yandex_vpc_subnet" "develop-b" { + name = var.name.zone-b + zone = var.default_zone-b network_id = yandex_vpc_network.develop.id - v4_cidr_blocks = var.default_cidr-db + v4_cidr_blocks = var.default_cidr-zone-b } data "yandex_compute_image" "ubuntu" { @@ -22,6 +22,7 @@ data "yandex_compute_image" "ubuntu" { resource "yandex_compute_instance" "platform-web" { name = var.vm_web_yandex_compute_instance_name platform_id = var.vm_web_yandex_compute_instance_platform_id + zone = var.default_zone-a resources { cores = var.vm_web_yandex_compute_instance_resources_cores memory = var.vm_web_yandex_compute_instance_resources_memory @@ -36,7 +37,7 @@ resource "yandex_compute_instance" "platform-web" { preemptible = true } network_interface { - subnet_id = yandex_vpc_subnet.develop-web.id + subnet_id = yandex_vpc_subnet.develop-a.id nat = true } metadata = { @@ -48,7 +49,7 @@ resource "yandex_compute_instance" "platform-web" { resource "yandex_compute_instance" "platform-db" { name = var.vm_db_yandex_compute_instance_name platform_id = var.vm_db_yandex_compute_instance_platform_id - zone = "ru-central1-b" + zone = var.default_zone-b resources { cores = var.vm_db_yandex_compute_instance_resources_cores memory = var.vm_db_yandex_compute_instance_resources_memory @@ -63,7 +64,7 @@ resource "yandex_compute_instance" "platform-db" { preemptible = true } network_interface { - subnet_id = yandex_vpc_subnet.develop-db.id + subnet_id = yandex_vpc_subnet.develop-b.id nat = true } metadata = { From 43ea244df7e6f7889ebaf72a97d1c03bcab1881f Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:43:48 +0300 Subject: [PATCH 036/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 5b04d314..82902b29 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -14,23 +14,33 @@ variable "folder_id" { description = "https://cloud.yandex.ru/docs/resource-manager/operations/folder/get-id" } -variable "default_zone-web" { +variable "name_zone-a" { type = string - default = "ru-central1-a" + default = "develop-ru-central1-a" description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" } -variable "default_zone-db" { +variable "default_zone-a" { type = string - default = "ru-central1-b" + default = "ru-central1-a" description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" } - -variable "default_cidr-web" { +variable "default_cidr-a" { type = list(string) default = ["10.0.1.0/24"] description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" } -variable "default_cidr-db" { + +variable "name_zone-b" { + type = string + default = "develop-ru-central1-b" + description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" +} +variable "default_zone-b" { + type = string + default = "ru-central1-b" + description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" +} +variable "default_cidr-b" { type = list(string) default = ["10.0.2.0/24"] description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" From 73ea610176acc98f655e7ec34222b0bd137cb321 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:47:31 +0300 Subject: [PATCH 037/102] Update providers.tf --- 02/src/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/providers.tf b/02/src/providers.tf index f10ca241..aca7a0db 100644 --- a/02/src/providers.tf +++ b/02/src/providers.tf @@ -11,6 +11,6 @@ provider "yandex" { # token = var.token cloud_id = var.cloud_id folder_id = var.folder_id - zone = var.default_zone-web + zone = var.default_zone-a service_account_key_file = file("~/key.json") } From 8b6c15dd383475c1d1b822a1532f42ab57893c78 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:49:22 +0300 Subject: [PATCH 038/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 82902b29..d2db1fc3 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -24,7 +24,7 @@ variable "default_zone-a" { default = "ru-central1-a" description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" } -variable "default_cidr-a" { +variable "default_cidr-zone-a" { type = list(string) default = ["10.0.1.0/24"] description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" @@ -40,7 +40,7 @@ variable "default_zone-b" { default = "ru-central1-b" description = "https://cloud.yandex.ru/docs/overview/concepts/geo-scope" } -variable "default_cidr-b" { +variable "default_cidr-zone-b" { type = list(string) default = ["10.0.2.0/24"] description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" From 22448165bbc9b8f0afc39f4917beb1ca2089a96e Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:49:57 +0300 Subject: [PATCH 039/102] Update main.tf --- 02/src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 8705f88b..daaefdb1 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -3,13 +3,13 @@ resource "yandex_vpc_network" "develop" { } resource "yandex_vpc_subnet" "develop-a" { - name = var.name.zone-a + name = var.name_zone-a zone = var.default_zone-a network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr-zone-a } resource "yandex_vpc_subnet" "develop-b" { - name = var.name.zone-b + name = var.name_zone-b zone = var.default_zone-b network_id = yandex_vpc_network.develop.id v4_cidr_blocks = var.default_cidr-zone-b From a7e4a0c11de36472f25883d08bf9e6e495450a80 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:57:44 +0300 Subject: [PATCH 040/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index d2db1fc3..ba8e7260 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -3,17 +3,20 @@ variable "token" { type = string description = "OAuth-token; https://cloud.yandex.ru/docs/iam/concepts/authorization/oauth-token" } - variable "cloud_id" { type = string description = "https://cloud.yandex.ru/docs/resource-manager/operations/cloud/get-id" } - variable "folder_id" { type = string description = "https://cloud.yandex.ru/docs/resource-manager/operations/folder/get-id" } +variable "vpc_name" { + type = string + default = "develop" + description = "VPC network & subnet name" +} variable "name_zone-a" { type = string default = "develop-ru-central1-a" @@ -46,14 +49,7 @@ variable "default_cidr-zone-b" { description = "https://cloud.yandex.ru/docs/vpc/operations/subnet-create" } -variable "vpc_name" { - type = string - default = "develop" - description = "VPC network & subnet name" -} - - -variable "vm_web_yandex_compute_image_family" { +variable "vm_yandex_compute_image_family" { type = string default = "ubuntu-2004-lts" } @@ -62,53 +58,39 @@ variable "vm_web_yandex_compute_instance_name" { type = string default = "netology-develop-platform-web" } - variable "vm_web_yandex_compute_instance_platform_id" { type = string default = "standard-v1" } - variable "vm_web_yandex_compute_instance_resources_cores" { type = number default = 2 } - variable "vm_web_yandex_compute_instance_resources_memory" { type = number default = 1 } - variable "vm_web_yandex_compute_instance_resources_core_fraction" { type = number default = 5 } - -variable "vm_db_yandex_compute_image_family" { - type = string - default = "ubuntu-2004-lts" -} - variable "vm_db_yandex_compute_instance_name" { type = string - default = "netology-develop-platform-web" + default = "netology-develop-platform-db" } - variable "vm_db_yandex_compute_instance_platform_id" { type = string default = "standard-v1" } - variable "vm_db_yandex_compute_instance_resources_cores" { type = number default = 2 } - variable "vm_db_yandex_compute_instance_resources_memory" { type = number default = 2 } - variable "vm_db_yandex_compute_instance_resources_core_fraction" { type = number default = 20 From ebbdfa99bd9c1fe79e7a5de37aa04a68e1ae19c8 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:59:08 +0300 Subject: [PATCH 041/102] Update main.tf --- 02/src/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/main.tf b/02/src/main.tf index daaefdb1..0c3acdd6 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -16,7 +16,7 @@ resource "yandex_vpc_subnet" "develop-b" { } data "yandex_compute_image" "ubuntu" { - family = var.vm_web_yandex_compute_image_family + family = var.vm_yandex_compute_image_family } resource "yandex_compute_instance" "platform-web" { From d4c596882bb0b9a76784bdfea60d3e3023b93b0e Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:02:16 +0300 Subject: [PATCH 042/102] Update hw-02.md --- 02/hw-02.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/hw-02.md b/02/hw-02.md index 28245e9f..24c61935 100644 --- a/02/hw-02.md +++ b/02/hw-02.md @@ -30,7 +30,7 @@ 2. Создайте сервисный аккаунт и ключ. [service_account_key_file](https://terraform-provider.yandexcloud.net). 4. Сгенерируйте новый или используйте свой текущий ssh-ключ. Запишите его открытую(public) часть в переменную **vms_ssh_public_root_key**. 5. Инициализируйте проект, выполните код. Исправьте намеренно допущенные синтаксические ошибки. Ищите внимательно, посимвольно. Ответьте, в чём заключается их суть. -> В большенстве своём параметры либо не указаны, либо указаны не верно +> В большенстве своём параметры либо не указаны, либо указаны не верно. 7. Подключитесь к консоли ВМ через ssh и выполните команду ``` curl ifconfig.me```. Примечание: К OS ubuntu "out of a box, те из коробки" необходимо подключаться под пользователем ubuntu: ```"ssh ubuntu@vm_ip_address"```. Предварительно убедитесь, что ваш ключ добавлен в ssh-агент: ```eval $(ssh-agent) && ssh-add``` Вы познакомитесь с тем как при создании ВМ создать своего пользователя в блоке metadata в следующей лекции.; 8. Ответьте, как в процессе обучения могут пригодиться параметры ```preemptible = true``` и ```core_fraction=5``` в параметрах ВМ. From c324846818bea3189096a8d870300615134050ea Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:11:51 +0300 Subject: [PATCH 043/102] Update outputs.tf --- 02/src/outputs.tf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index e69de29b..a072d64b 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -0,0 +1,11 @@ +output "instance_name" { + value = yandex_compute_instance.*.name +} + +output "fqdn" { + value = yandex_compute_instance.*.hostname +} + +output "external_ip" { + value = yandex_vpc_address.*.external_ipv4_address.0.address +} From 183161e8b0a8a3f8ffec34822fd2a34eac8f4ab6 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:20:46 +0300 Subject: [PATCH 044/102] Update outputs.tf --- 02/src/outputs.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index a072d64b..28a2af32 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,11 +1,11 @@ output "instance_name" { - value = yandex_compute_instance.*.name + value = yandex_compute_instance.vm.*.name } output "fqdn" { - value = yandex_compute_instance.*.hostname + value = yandex_compute_instance.vm.*.hostname } output "external_ip" { - value = yandex_vpc_address.*.external_ipv4_address.0.address + value = yandex_compute_instance.vm.*.network_interface.[0].nat_ip_address } From 20eaa33f8293c8fe340252451400fa67678414b1 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:25:04 +0300 Subject: [PATCH 045/102] Update outputs.tf --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 28a2af32..32952ff7 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -7,5 +7,5 @@ output "fqdn" { } output "external_ip" { - value = yandex_compute_instance.vm.*.network_interface.[0].nat_ip_address + value = yandex_compute_instance.vm.*.network_interface.0.nat_ip_address } From efe2dc2589f808705f1faeab9ae1a7dad7ba3d7f Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:25:42 +0300 Subject: [PATCH 046/102] Update outputs.tf --- 02/src/outputs.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 32952ff7..751a886b 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,11 +1,11 @@ output "instance_name" { - value = yandex_compute_instance.vm.*.name + value = yandex_compute_instance.*.name } output "fqdn" { - value = yandex_compute_instance.vm.*.hostname + value = yandex_compute_instance.*.hostname } output "external_ip" { - value = yandex_compute_instance.vm.*.network_interface.0.nat_ip_address + value = yandex_compute_instance.*.network_interface.0.nat_ip_address } From f5c013c27465d0e64eaa4cc85ebb0e4f03e314fe Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:26:31 +0300 Subject: [PATCH 047/102] Update outputs.tf --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 751a886b..54911fa7 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,5 +1,5 @@ output "instance_name" { - value = yandex_compute_instance.*.name + value = yandex_compute_instance.name } output "fqdn" { From 06b3b9941f5183f06f2002e4874c66b31b76065e Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:30:30 +0300 Subject: [PATCH 048/102] Update --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 54911fa7..751a886b 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,5 +1,5 @@ output "instance_name" { - value = yandex_compute_instance.name + value = yandex_compute_instance.*.name } output "fqdn" { From 04c9da04cc54dc2c7e3afc10cfbc6a40b727e9e6 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:39:27 +0300 Subject: [PATCH 049/102] Update --- 02/src/outputs.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 751a886b..45b37f12 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,11 +1,11 @@ output "instance_name" { - value = yandex_compute_instance.*.name + value = yandex_compute_instance.name } output "fqdn" { - value = yandex_compute_instance.*.hostname + value = yandex_compute_instance.hostname } output "external_ip" { - value = yandex_compute_instance.*.network_interface.0.nat_ip_address + value = yandex_compute_instance.network_interface.0.nat_ip_address } From ac659c618367e62bce50f54d69dc2c388105d816 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:41:50 +0300 Subject: [PATCH 050/102] Update --- 02/src/outputs.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 45b37f12..751a886b 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,11 +1,11 @@ output "instance_name" { - value = yandex_compute_instance.name + value = yandex_compute_instance.*.name } output "fqdn" { - value = yandex_compute_instance.hostname + value = yandex_compute_instance.*.hostname } output "external_ip" { - value = yandex_compute_instance.network_interface.0.nat_ip_address + value = yandex_compute_instance.*.network_interface.0.nat_ip_address } From c43bc7bfbb13b34166c4938f66ee74a775f1251b Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:45:45 +0300 Subject: [PATCH 051/102] U --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 751a886b..3d6a2a00 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,5 +1,5 @@ output "instance_name" { - value = yandex_compute_instance.*.name + value = yandex_compute_instance.platform-web.name } output "fqdn" { From 2859069da8ef351d3d4e8dc18a847fc027706542 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:46:36 +0300 Subject: [PATCH 052/102] U --- 02/src/outputs.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 3d6a2a00..565400a4 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -3,9 +3,9 @@ output "instance_name" { } output "fqdn" { - value = yandex_compute_instance.*.hostname + value = yandex_compute_instance.platform-web.hostname } output "external_ip" { - value = yandex_compute_instance.*.network_interface.0.nat_ip_address + value = yandex_compute_instance.platform-web.network_interface.0.nat_ip_address } From e3fee8e6fe30d1a2ffa477000fbc8122ba704bd1 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:55:01 +0300 Subject: [PATCH 053/102] u --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 565400a4..a66431e0 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,5 +1,5 @@ output "instance_name" { - value = yandex_compute_instance.platform-web.name + value = yandex_compute_instance.name.* } output "fqdn" { From 676d9c0b122745f0b4a23d1d9670075c96d2fd4d Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:57:54 +0300 Subject: [PATCH 054/102] u --- 02/src/outputs.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index a66431e0..ac26986f 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,9 +1,9 @@ output "instance_name" { - value = yandex_compute_instance.name.* + value = yandex_compute_instance.platform-web.name } output "fqdn" { - value = yandex_compute_instance.platform-web.hostname + value = yandex_compute_instance.platform-web.fqdn } output "external_ip" { From 61a41baafd407536c77b84c8770942ff21535362 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:05:49 +0300 Subject: [PATCH 055/102] u --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index ac26986f..b4534024 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,5 +1,5 @@ output "instance_name" { - value = yandex_compute_instance.platform-web.name + value = yandex_compute_instance.vm_*.name } output "fqdn" { From abf33134d352b3334478f2dcd555e1863f9bf4be Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:06:37 +0300 Subject: [PATCH 056/102] u --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index b4534024..d21e8e3e 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,5 +1,5 @@ output "instance_name" { - value = yandex_compute_instance.vm_*.name + value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name } output "fqdn" { From a321c00cb6c174f17d2c8a36098cf190f1cdb458 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:07:14 +0300 Subject: [PATCH 057/102] u --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index d21e8e3e..ec2d3b7b 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,5 +1,5 @@ output "instance_name" { - value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name + value = yandex_compute_instance.vm_*_yandex_compute_instance_name.name } output "fqdn" { From 11d1b7fc820fdf381463ffb9e91df907b4e9ac9e Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:08:48 +0300 Subject: [PATCH 058/102] u --- 02/src/outputs.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index ec2d3b7b..93994d78 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -3,9 +3,9 @@ output "instance_name" { } output "fqdn" { - value = yandex_compute_instance.platform-web.fqdn + value = yandex_compute_instance.vm_*_yandex_compute_instance_name.fqdn } output "external_ip" { - value = yandex_compute_instance.platform-web.network_interface.0.nat_ip_address + value = yandex_compute_instance.vm_*_yandex_compute_instance_name.network_interface.0.nat_ip_address } From ed6bd676c0773d80b2ccafbdbd071b3efae6f8ac Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:09:50 +0300 Subject: [PATCH 059/102] u --- 02/src/outputs.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 93994d78..8d641c2f 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,5 +1,6 @@ output "instance_name" { - value = yandex_compute_instance.vm_*_yandex_compute_instance_name.name + value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name + value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name } output "fqdn" { From 0036e2bb267c6bf02a6375dae2881f2241c6527a Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:11:05 +0300 Subject: [PATCH 060/102] u --- 02/src/outputs.tf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 8d641c2f..93994d78 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,5 @@ output "instance_name" { - value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name - value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name + value = yandex_compute_instance.vm_*_yandex_compute_instance_name.name } output "fqdn" { From 9636a36ae12d89a8149029f9c9891d1a79eada6a Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:45:49 +0300 Subject: [PATCH 061/102] u --- 02/src/outputs.tf | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 93994d78..c0fc0420 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,11 +1,23 @@ -output "instance_name" { - value = yandex_compute_instance.vm_*_yandex_compute_instance_name.name +output "netology-develop-platform-web instance_name" { + value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name } -output "fqdn" { - value = yandex_compute_instance.vm_*_yandex_compute_instance_name.fqdn +output "netology-develop-platform-web fqdn" { + value = yandex_compute_instance.vm_web_yandex_compute_instance_name.fqdn } -output "external_ip" { - value = yandex_compute_instance.vm_*_yandex_compute_instance_name.network_interface.0.nat_ip_address +output "netology-develop-platform-web external_ip" { + value = yandex_compute_instance.vm_web_yandex_compute_instance_name.network_interface.0.nat_ip_address } + +output "netology-develop-platform-db instance_name" { + value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name +} + +output "netology-develop-platform-db fqdn" { + value = yandex_compute_instance.vm_db_yandex_compute_instance_name.fqdn +} + +output "netology-develop-platform-db external_ip" { + value = yandex_compute_instance.vm_db_yandex_compute_instance_name.network_interface.0.nat_ip_address +} \ No newline at end of file From 3f94bfcbba8be6055ee5fb768ee45459e80f55ba Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:46:33 +0300 Subject: [PATCH 062/102] uu --- 02/src/outputs.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index c0fc0420..0c7a2c44 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,23 +1,23 @@ -output "netology-develop-platform-web instance_name" { +output "netology_develop_platform_web instance_name" { value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name } -output "netology-develop-platform-web fqdn" { +output "netology_develop_platform_web fqdn" { value = yandex_compute_instance.vm_web_yandex_compute_instance_name.fqdn } -output "netology-develop-platform-web external_ip" { +output "netology_develop_platform_web external_ip" { value = yandex_compute_instance.vm_web_yandex_compute_instance_name.network_interface.0.nat_ip_address } -output "netology-develop-platform-db instance_name" { +output "netology_develop_platform_db instance_name" { value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name } -output "netology-develop-platform-db fqdn" { +output "netology_develop_platform_db fqdn" { value = yandex_compute_instance.vm_db_yandex_compute_instance_name.fqdn } -output "netology-develop-platform-db external_ip" { +output "netology_develop_platform_db external_ip" { value = yandex_compute_instance.vm_db_yandex_compute_instance_name.network_interface.0.nat_ip_address } \ No newline at end of file From 111bb63c5d64fab0226aa81c3f053ee244ef3c39 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:47:23 +0300 Subject: [PATCH 063/102] u --- 02/src/outputs.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 0c7a2c44..a6437212 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,23 +1,23 @@ -output "netology_develop_platform_web instance_name" { +output "netology_develop_platform_web_instance_name" { value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name } -output "netology_develop_platform_web fqdn" { +output "netology_develop_platform_web_fqdn" { value = yandex_compute_instance.vm_web_yandex_compute_instance_name.fqdn } -output "netology_develop_platform_web external_ip" { +output "netology_develop_platform_web_external_ip" { value = yandex_compute_instance.vm_web_yandex_compute_instance_name.network_interface.0.nat_ip_address } -output "netology_develop_platform_db instance_name" { +output "netology_develop_platform_db_instance_name" { value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name } -output "netology_develop_platform_db fqdn" { +output "netology_develop_platform_db_fqdn" { value = yandex_compute_instance.vm_db_yandex_compute_instance_name.fqdn } -output "netology_develop_platform_db external_ip" { +output "netology_develop_platform_db_external_ip" { value = yandex_compute_instance.vm_db_yandex_compute_instance_name.network_interface.0.nat_ip_address } \ No newline at end of file From 8f62b3f969c889f9fceef24738907f1bddf350ef Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:50:03 +0300 Subject: [PATCH 064/102] u --- 02/src/outputs.tf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index a6437212..fffa47cd 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,14 +1,14 @@ -output "netology_develop_platform_web_instance_name" { - value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name -} +#output "netology_develop_platform_web_instance_name" { +# value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name +#} -output "netology_develop_platform_web_fqdn" { - value = yandex_compute_instance.vm_web_yandex_compute_instance_name.fqdn -} +#output "netology_develop_platform_web_fqdn" { +# value = yandex_compute_instance.vm_web_yandex_compute_instance_name.fqdn +#} -output "netology_develop_platform_web_external_ip" { - value = yandex_compute_instance.vm_web_yandex_compute_instance_name.network_interface.0.nat_ip_address -} +#output "netology_develop_platform_web_external_ip" { +# value = yandex_compute_instance.vm_web_yandex_compute_instance_name.network_interface.0.nat_ip_address +#} output "netology_develop_platform_db_instance_name" { value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name From b5313e614002b6c5efa557d4b07995840235d6f2 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:53:04 +0300 Subject: [PATCH 065/102] u --- 02/src/outputs.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index fffa47cd..7432d6c9 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -11,13 +11,13 @@ #} output "netology_develop_platform_db_instance_name" { - value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name + value = yandex_compute_instance.vm_db_yandex_compute_instance.name } output "netology_develop_platform_db_fqdn" { - value = yandex_compute_instance.vm_db_yandex_compute_instance_name.fqdn + value = yandex_compute_instance.vm_db_yandex_compute_instance.fqdn } output "netology_develop_platform_db_external_ip" { - value = yandex_compute_instance.vm_db_yandex_compute_instance_name.network_interface.0.nat_ip_address + value = yandex_compute_instance.vm_db_yandex_compute_instance.network_interface.0.nat_ip_address } \ No newline at end of file From f97409b4d4edcb43366e6636e99bc2d7d7f1ccd2 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:55:59 +0300 Subject: [PATCH 066/102] u --- 02/src/outputs.tf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 7432d6c9..2f9bef79 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -11,13 +11,13 @@ #} output "netology_develop_platform_db_instance_name" { - value = yandex_compute_instance.vm_db_yandex_compute_instance.name + value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name } -output "netology_develop_platform_db_fqdn" { - value = yandex_compute_instance.vm_db_yandex_compute_instance.fqdn -} +#output "netology_develop_platform_db_fqdn" { +# value = yandex_compute_instance.vm_db_yandex_compute_instance.fqdn +#} -output "netology_develop_platform_db_external_ip" { - value = yandex_compute_instance.vm_db_yandex_compute_instance.network_interface.0.nat_ip_address -} \ No newline at end of file +#output "netology_develop_platform_db_external_ip" { +# value = yandex_compute_instance.vm_db_yandex_compute_instance.network_interface.0.nat_ip_address +#} \ No newline at end of file From 5dd588e819751b3ac32f9b00a0ad30b402b59ea4 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:01:28 +0300 Subject: [PATCH 067/102] u --- 02/src/outputs.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 2f9bef79..a081a8f8 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -10,8 +10,8 @@ # value = yandex_compute_instance.vm_web_yandex_compute_instance_name.network_interface.0.nat_ip_address #} -output "netology_develop_platform_db_instance_name" { - value = yandex_compute_instance.vm_db_yandex_compute_instance_name.name +output "instance_name" { + value = yandex_compute_instance.platform-db.name } #output "netology_develop_platform_db_fqdn" { From 8778ae189551526c234b595e5dfd8532e212e727 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:02:20 +0300 Subject: [PATCH 068/102] u --- 02/src/outputs.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index a081a8f8..a83ad9da 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -11,12 +11,12 @@ #} output "instance_name" { - value = yandex_compute_instance.platform-db.name + value = yandex_compute_instance.platform-*.name } -#output "netology_develop_platform_db_fqdn" { -# value = yandex_compute_instance.vm_db_yandex_compute_instance.fqdn -#} +output "fqdn" { + value = yandex_compute_instance.platform-*.fqdn +} #output "netology_develop_platform_db_external_ip" { # value = yandex_compute_instance.vm_db_yandex_compute_instance.network_interface.0.nat_ip_address From 42da085d183b26ea37dda299839a82c40f2172be Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:02:48 +0300 Subject: [PATCH 069/102] u --- 02/src/outputs.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index a83ad9da..0deaa520 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -11,11 +11,11 @@ #} output "instance_name" { - value = yandex_compute_instance.platform-*.name + value = yandex_compute_instance.platform-db.name } output "fqdn" { - value = yandex_compute_instance.platform-*.fqdn + value = yandex_compute_instance.platform-db.fqdn } #output "netology_develop_platform_db_external_ip" { From ba5edf2b51ab38b4f49344466029b7baf3f22a05 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:04:03 +0300 Subject: [PATCH 070/102] u --- 02/src/outputs.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 0deaa520..3b0d1f1c 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,6 @@ -#output "netology_develop_platform_web_instance_name" { -# value = yandex_compute_instance.vm_web_yandex_compute_instance_name.name -#} +output "instance_name" { + value = yandex_compute_instance.platform-web.name +} #output "netology_develop_platform_web_fqdn" { # value = yandex_compute_instance.vm_web_yandex_compute_instance_name.fqdn @@ -18,6 +18,6 @@ output "fqdn" { value = yandex_compute_instance.platform-db.fqdn } -#output "netology_develop_platform_db_external_ip" { -# value = yandex_compute_instance.vm_db_yandex_compute_instance.network_interface.0.nat_ip_address -#} \ No newline at end of file +output "external_ip" { + value = yandex_compute_instance.platform-db.network_interface.0.nat_ip_address +} \ No newline at end of file From 2d859b0d04e0b4dcc1b54353ee3a3e92c5d39837 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:04:46 +0300 Subject: [PATCH 071/102] u --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 3b0d1f1c..67749ff0 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,4 +1,4 @@ -output "instance_name" { +output "platform_web_instance_name" { value = yandex_compute_instance.platform-web.name } From 2fe2b3e177d33f8a28dd9e365db0e892e7433aa5 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:06:17 +0300 Subject: [PATCH 072/102] uu --- 02/src/outputs.tf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 67749ff0..869ddde2 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -2,22 +2,22 @@ output "platform_web_instance_name" { value = yandex_compute_instance.platform-web.name } -#output "netology_develop_platform_web_fqdn" { -# value = yandex_compute_instance.vm_web_yandex_compute_instance_name.fqdn -#} +output "platform_web_fqdn" { + value = yandex_compute_instance.platform-web.fqdn +} -#output "netology_develop_platform_web_external_ip" { -# value = yandex_compute_instance.vm_web_yandex_compute_instance_name.network_interface.0.nat_ip_address -#} +output "platform_web_external_ip" { + value = yandex_compute_instance.platform-web.network_interface.0.nat_ip_address +} -output "instance_name" { +output "platform_db_instance_name" { value = yandex_compute_instance.platform-db.name } -output "fqdn" { +output "platform_db_fqdn" { value = yandex_compute_instance.platform-db.fqdn } -output "external_ip" { +output "platform_db_external_ip" { value = yandex_compute_instance.platform-db.network_interface.0.nat_ip_address } \ No newline at end of file From 0ed0fc7a02273c07cb7f24b88ee6331914b8c53e Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:40:47 +0300 Subject: [PATCH 073/102] Update vms_platform.tf --- 02/src/vms_platform.tf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index ba8e7260..fd90cc63 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -54,9 +54,18 @@ variable "vm_yandex_compute_image_family" { default = "ubuntu-2004-lts" } +variable "project" { + type = string + default = "netology" +} +variable "env" { + type = string + default = "develop" +} + variable "vm_web_yandex_compute_instance_name" { type = string - default = "netology-develop-platform-web" + default = "${local.name}-platform-web" } variable "vm_web_yandex_compute_instance_platform_id" { type = string From ab424eeb84190b845acc7afa69e7c64256c83431 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:42:46 +0300 Subject: [PATCH 074/102] h --- 02/src/locals.tf | 3 +++ 02/src/vms_platform.tf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/02/src/locals.tf b/02/src/locals.tf index e69de29b..8619e848 100644 --- a/02/src/locals.tf +++ b/02/src/locals.tf @@ -0,0 +1,3 @@ +locals { + name = "${ var.project }-${ var.env }" +} diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index fd90cc63..cc6f3637 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -86,7 +86,7 @@ variable "vm_web_yandex_compute_instance_resources_core_fraction" { variable "vm_db_yandex_compute_instance_name" { type = string - default = "netology-develop-platform-db" + default = "${local.name}-platform-db" } variable "vm_db_yandex_compute_instance_platform_id" { type = string From 2ed4861729b662e5d3dadda988f7ea78f1e6477c Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:43:38 +0300 Subject: [PATCH 075/102] f --- 02/src/vms_platform.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index cc6f3637..e8b0f64f 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -65,7 +65,7 @@ variable "env" { variable "vm_web_yandex_compute_instance_name" { type = string - default = "${local.name}-platform-web" + default = "${local.name}--platform-web" } variable "vm_web_yandex_compute_instance_platform_id" { type = string @@ -86,7 +86,7 @@ variable "vm_web_yandex_compute_instance_resources_core_fraction" { variable "vm_db_yandex_compute_instance_name" { type = string - default = "${local.name}-platform-db" + default = "${local.name}--platform-db" } variable "vm_db_yandex_compute_instance_platform_id" { type = string From 4d92e56d83375555e29ff4ffd6fd81a315126c86 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:45:41 +0300 Subject: [PATCH 076/102] g --- 02/src/vms_platform.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index e8b0f64f..93201f56 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -65,7 +65,7 @@ variable "env" { variable "vm_web_yandex_compute_instance_name" { type = string - default = "${local.name}--platform-web" + default = "netology-develop-platform-web" } variable "vm_web_yandex_compute_instance_platform_id" { type = string @@ -86,7 +86,7 @@ variable "vm_web_yandex_compute_instance_resources_core_fraction" { variable "vm_db_yandex_compute_instance_name" { type = string - default = "${local.name}--platform-db" + default = "netology-develop-platform-db" } variable "vm_db_yandex_compute_instance_platform_id" { type = string From 97e93115d4c4d24d45e9e27b235ffde7c79d084d Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:48:27 +0300 Subject: [PATCH 077/102] t --- 02/src/locals.tf | 2 +- 02/src/main.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/02/src/locals.tf b/02/src/locals.tf index 8619e848..98a1391e 100644 --- a/02/src/locals.tf +++ b/02/src/locals.tf @@ -1,3 +1,3 @@ locals { - name = "${ var.project }-${ var.env }" + name = "${ var.project }-${ var.env }--platform" } diff --git a/02/src/main.tf b/02/src/main.tf index 0c3acdd6..73464b1b 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -20,7 +20,7 @@ data "yandex_compute_image" "ubuntu" { } resource "yandex_compute_instance" "platform-web" { - name = var.vm_web_yandex_compute_instance_name + name = "${local.name}-web" platform_id = var.vm_web_yandex_compute_instance_platform_id zone = var.default_zone-a resources { @@ -47,7 +47,7 @@ resource "yandex_compute_instance" "platform-web" { } resource "yandex_compute_instance" "platform-db" { - name = var.vm_db_yandex_compute_instance_name + name = "${local.name}-db" platform_id = var.vm_db_yandex_compute_instance_platform_id zone = var.default_zone-b resources { From 2f96cc3c78c97f8d1b4f08bc2e24c1bcbb0b04d9 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:49:08 +0300 Subject: [PATCH 078/102] h --- 02/src/locals.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/locals.tf b/02/src/locals.tf index 98a1391e..3c2adbde 100644 --- a/02/src/locals.tf +++ b/02/src/locals.tf @@ -1,3 +1,3 @@ locals { - name = "${ var.project }-${ var.env }--platform" + name = "${ var.project }-${ var.env }-platform" } From a962403f9f368e35d09346dfd63519303a51b821 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:20:11 +0300 Subject: [PATCH 079/102] yy --- 02/src/vms_platform.tf | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 93201f56..66c7a2b0 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -63,6 +63,26 @@ variable "env" { default = "develop" } +variable "vms_resources" { + type = map(object({ + cores = number + memory = number + fraction = number + })) + default = { + "web" = { + cores = 2 + memory = 1 + fraction = 5 + } + "db" = { + cores = 2 + memory = 2 + fraction = 20 + } + } +} + variable "vm_web_yandex_compute_instance_name" { type = string default = "netology-develop-platform-web" @@ -71,7 +91,8 @@ variable "vm_web_yandex_compute_instance_platform_id" { type = string default = "standard-v1" } -variable "vm_web_yandex_compute_instance_resources_cores" { + +/*variable "vm_web_yandex_compute_instance_resources_cores" { type = number default = 2 } @@ -83,6 +104,7 @@ variable "vm_web_yandex_compute_instance_resources_core_fraction" { type = number default = 5 } +*/ variable "vm_db_yandex_compute_instance_name" { type = string @@ -92,7 +114,7 @@ variable "vm_db_yandex_compute_instance_platform_id" { type = string default = "standard-v1" } -variable "vm_db_yandex_compute_instance_resources_cores" { +/*variable "vm_db_yandex_compute_instance_resources_cores" { type = number default = 2 } @@ -104,7 +126,7 @@ variable "vm_db_yandex_compute_instance_resources_core_fraction" { type = number default = 20 } - +*/ ###ssh vars variable "vms_ssh_root_key" { From 782b820ce2ce0fa7ee14c71ec0eae5b946309605 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:24:29 +0300 Subject: [PATCH 080/102] rr --- 02/src/main.tf | 12 ++++++------ 02/src/vms_platform.tf | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 73464b1b..3473a4ae 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -24,9 +24,9 @@ resource "yandex_compute_instance" "platform-web" { platform_id = var.vm_web_yandex_compute_instance_platform_id zone = var.default_zone-a resources { - cores = var.vm_web_yandex_compute_instance_resources_cores - memory = var.vm_web_yandex_compute_instance_resources_memory - core_fraction = var.vm_web_yandex_compute_instance_resources_core_fraction + cores = var.vms_resources.web.cores + memory = var.vms_resources.web.memory + core_fraction = var.vms_resources.web.core_fraction } boot_disk { initialize_params { @@ -51,9 +51,9 @@ resource "yandex_compute_instance" "platform-db" { platform_id = var.vm_db_yandex_compute_instance_platform_id zone = var.default_zone-b resources { - cores = var.vm_db_yandex_compute_instance_resources_cores - memory = var.vm_db_yandex_compute_instance_resources_memory - core_fraction = var.vm_db_yandex_compute_instance_resources_core_fraction + cores = var.vms_resources.db.cores + memory = var.vms_resources.db.memory + core_fraction = var.vms_resources.db.core_fraction } boot_disk { initialize_params { diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 66c7a2b0..a22fe854 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -71,14 +71,14 @@ variable "vms_resources" { })) default = { "web" = { - cores = 2 - memory = 1 - fraction = 5 + cores = 2 + memory = 1 + core_fraction = 5 } "db" = { - cores = 2 - memory = 2 - fraction = 20 + cores = 2 + memory = 2 + core_fraction = 20 } } } From 4d2716b9816718b19b8e65e26f1570ab5e5a00d3 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:25:58 +0300 Subject: [PATCH 081/102] dd --- 02/src/vms_platform.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index a22fe854..24a080f2 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -65,9 +65,9 @@ variable "env" { variable "vms_resources" { type = map(object({ - cores = number - memory = number - fraction = number + cores = number + memory = number + core_fraction = number })) default = { "web" = { From db243ab4bffe5e6d58bb859e45bebe7d0e463d99 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:33:46 +0300 Subject: [PATCH 082/102] ff --- 02/src/vms_platform.tf | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 24a080f2..60f0acca 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -129,8 +129,18 @@ variable "vm_db_yandex_compute_instance_resources_core_fraction" { */ ###ssh vars -variable "vms_ssh_root_key" { - type = string - default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" - description = "ssh-keygen -t ed25519" + +variable "metadata" { + type = map(any) + default = { + serial-port-enable = 1 + ssh-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" + } + description = "metadata" } + +#variable "vms_ssh_root_key" { +# type = string +# default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" +# description = "ssh-keygen -t ed25519" +#} From bbad660fe0a7a6bfdaaeeab0e8eb6c9e84fceca5 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:41:18 +0300 Subject: [PATCH 083/102] f --- 02/src/vms_platform.tf | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 60f0acca..acc76b31 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -128,19 +128,23 @@ variable "vm_db_yandex_compute_instance_resources_core_fraction" { } */ -###ssh vars - variable "metadata" { - type = map(any) - default = { + type = tuple ([ + serial-port-enable = number + ssh-keys = string + ]) + default = [ serial-port-enable = 1 ssh-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" - } + ] description = "metadata" } -#variable "vms_ssh_root_key" { -# type = string -# default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" -# description = "ssh-keygen -t ed25519" -#} +/* +###ssh vars +variable "vms_ssh_root_key" { + type = string + default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" + description = "ssh-keygen -t ed25519" +} +*/ From 481235300a55b8dc929b16aa05056c73128f7315 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:44:08 +0300 Subject: [PATCH 084/102] t --- 02/src/main.tf | 5 +---- 02/src/vms_platform.tf | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 3473a4ae..f4cd0e60 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -67,8 +67,5 @@ resource "yandex_compute_instance" "platform-db" { subnet_id = yandex_vpc_subnet.develop-b.id nat = true } - metadata = { - serial-port-enable = 1 - ssh-keys = "ubuntu:${var.vms_ssh_root_key}" - } + metadata = var.metadata } diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index acc76b31..3cc5fff8 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -130,12 +130,12 @@ variable "vm_db_yandex_compute_instance_resources_core_fraction" { variable "metadata" { type = tuple ([ - serial-port-enable = number - ssh-keys = string + number + string ]) default = [ serial-port-enable = 1 - ssh-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" + ssh-keys = "ubuntu:ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" ] description = "metadata" } From d1909d9be084ba200b0cc02a27483ac4ba02fb35 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:44:32 +0300 Subject: [PATCH 085/102] dd --- 02/src/main.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/02/src/main.tf b/02/src/main.tf index f4cd0e60..3cb39421 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -67,5 +67,7 @@ resource "yandex_compute_instance" "platform-db" { subnet_id = yandex_vpc_subnet.develop-b.id nat = true } - metadata = var.metadata + metadata = { + var.metadata + } } From 746d9fb0f1304a50c5f7eb109f7876ec900b8c04 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:55:31 +0300 Subject: [PATCH 086/102] dsas --- 02/src/main.tf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 3cb39421..c14beb01 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -68,6 +68,7 @@ resource "yandex_compute_instance" "platform-db" { nat = true } metadata = { - var.metadata - } + serial-port-enable = var.metadata.0 + ssh-keys = var.metadata.1 + } } From 4974b3e15ef9ac04afaf93ceaee87b00aaa6b1a0 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:01:57 +0300 Subject: [PATCH 087/102] Update --- 02/src/main.tf | 4 ++-- 02/src/vms_platform.tf | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index c14beb01..4ec4122d 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -68,7 +68,7 @@ resource "yandex_compute_instance" "platform-db" { nat = true } metadata = { - serial-port-enable = var.metadata.0 - ssh-keys = var.metadata.1 + serial-port-enable = var.vm.metadata.serial-port-enable + ssh-keys = var.vm.metadata.ssh-keys } } diff --git a/02/src/vms_platform.tf b/02/src/vms_platform.tf index 3cc5fff8..9d7f88ec 100644 --- a/02/src/vms_platform.tf +++ b/02/src/vms_platform.tf @@ -129,14 +129,16 @@ variable "vm_db_yandex_compute_instance_resources_core_fraction" { */ variable "metadata" { - type = tuple ([ - number - string - ]) - default = [ - serial-port-enable = 1 - ssh-keys = "ubuntu:ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" - ] + type = map(object({ + serial-port-enable = number + ssh-keys = string + })) + default = { + "vm" = { + serial-port-enable = 1 + ssh-keys = "ubuntu:ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJbFQwlXpyF5D6x8yiptgTG/Are3CfQ94MRINvltKRs2 root@nt.ksob.lan" + } + } description = "metadata" } From 4370f51cdfef35fdb136fc4d22fd65a367e121dc Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:02:39 +0300 Subject: [PATCH 088/102] ff --- 02/src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index 4ec4122d..c025e7e8 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -68,7 +68,7 @@ resource "yandex_compute_instance" "platform-db" { nat = true } metadata = { - serial-port-enable = var.vm.metadata.serial-port-enable - ssh-keys = var.vm.metadata.ssh-keys + serial-port-enable = var.metadata.vm.serial-port-enable + ssh-keys = var.metadata.vm.ssh-keys } } From 4c531195ae2c66be16d16bb9d5d323e3ca6874da Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:03:43 +0300 Subject: [PATCH 089/102] d --- 02/src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/02/src/main.tf b/02/src/main.tf index c025e7e8..70221c15 100644 --- a/02/src/main.tf +++ b/02/src/main.tf @@ -41,8 +41,8 @@ resource "yandex_compute_instance" "platform-web" { nat = true } metadata = { - serial-port-enable = 1 - ssh-keys = "ubuntu:${var.vms_ssh_root_key}" + serial-port-enable = var.metadata.vm.serial-port-enable + ssh-keys = var.metadata.vm.ssh-keys } } From 3063627bf5b25303a9e212d556444fde86beab7e Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:10:41 +0300 Subject: [PATCH 090/102] p --- 02/src/outputs.tf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 869ddde2..552c621f 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,7 +1,9 @@ -output "platform_web_instance_name" { - value = yandex_compute_instance.platform-web.name -} +output "develop" { + value = [ + { "Platform WEB instance_name: yandex_compute_instance.platform-web.name" } + ] +/* output "platform_web_fqdn" { value = yandex_compute_instance.platform-web.fqdn } @@ -20,4 +22,6 @@ output "platform_db_fqdn" { output "platform_db_external_ip" { value = yandex_compute_instance.platform-db.network_interface.0.nat_ip_address +*/ + } \ No newline at end of file From dff9ccea054c6110495e857597b634cc55fedd3c Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:20:42 +0300 Subject: [PATCH 091/102] h --- 02/src/outputs.tf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 552c621f..489bf802 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,7 +1,8 @@ output "develop" { value = [ - { "Platform WEB instance_name: yandex_compute_instance.platform-web.name" } + { "Platform WEB instance_name: ${yandex_compute_instance.platform-web.name}" } ] +} /* output "platform_web_fqdn" { @@ -23,5 +24,3 @@ output "platform_db_fqdn" { output "platform_db_external_ip" { value = yandex_compute_instance.platform-db.network_interface.0.nat_ip_address */ - -} \ No newline at end of file From a6216efb62a3ffafbb3c760f42d52fe28a9b471c Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:21:39 +0300 Subject: [PATCH 092/102] f --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 489bf802..3fc11581 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,6 @@ output "develop" { value = [ - { "Platform WEB instance_name: ${yandex_compute_instance.platform-web.name}" } + { "Platform WEB instance_name:" } ] } From 962ad145c7ee11362ce7ad23c89b86d70b00ac70 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:23:03 +0300 Subject: [PATCH 093/102] c --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 3fc11581..462e465f 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,6 @@ output "develop" { value = [ - { "Platform WEB instance_name:" } + { external_ip = ["Platform WEB instance_name:"] } ] } From 652c6d83fff66f58dd3f533e65eef54be62334f6 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:24:26 +0300 Subject: [PATCH 094/102] fdgfdg --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 462e465f..dbeda6f5 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,6 @@ output "develop" { value = [ - { external_ip = ["Platform WEB instance_name:"] } + { external_ip = [yandex_compute_instance.platform-*.name] } ] } From d42024f0057de2942a61ba3cf5a236bf2d0ea1a0 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:24:58 +0300 Subject: [PATCH 095/102] f --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index dbeda6f5..fd5dc0f9 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,6 @@ output "develop" { value = [ - { external_ip = [yandex_compute_instance.platform-*.name] } + { external_ip = [yandex_compute_instance.platform-web.name] } ] } From 8d58485174dddb952555d66bc0f1c7c3214b6cc7 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:26:50 +0300 Subject: [PATCH 096/102] df --- 02/src/outputs.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index fd5dc0f9..0e4b8989 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,7 @@ output "develop" { value = [ - { external_ip = [yandex_compute_instance.platform-web.name] } + { external_name_web = yandex_compute_instance.platform-web.name }, + { external_name_db = yandex_compute_instance.platform-db.name } ] } From f7c3d92416f085d585663dd2cd4e3d3c9522f43d Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:29:14 +0300 Subject: [PATCH 097/102] sa --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 0e4b8989..0a27b3e4 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,6 @@ output "develop" { value = [ - { external_name_web = yandex_compute_instance.platform-web.name }, + { external_name_web = yandex_compute_instance.platform-web.name, yandex_compute_instance.platform-db.name }, { external_name_db = yandex_compute_instance.platform-db.name } ] } From c810147972a91dc9db5591da37aee51f9f3e54b6 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:30:01 +0300 Subject: [PATCH 098/102] sdsa --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 0a27b3e4..67e15614 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,6 +1,6 @@ output "develop" { value = [ - { external_name_web = yandex_compute_instance.platform-web.name, yandex_compute_instance.platform-db.name }, + { external_name_web = [yandex_compute_instance.platform-web.name, yandex_compute_instance.platform-db.name] }, { external_name_db = yandex_compute_instance.platform-db.name } ] } From 50d905d4ef6b6f69e4de43885ba4012c813e1a39 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:35:00 +0300 Subject: [PATCH 099/102] Update --- 02/src/outputs.tf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index 67e15614..d9b37200 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,7 +1,8 @@ output "develop" { value = [ - { external_name_web = [yandex_compute_instance.platform-web.name, yandex_compute_instance.platform-db.name] }, - { external_name_db = yandex_compute_instance.platform-db.name } + { instance_name = [yandex_compute_instance.platform-web.name, yandex_compute_instance.platform-db.name] }, + { external_ip = [yandex_compute_instance.platform-web.network_interface.0.nat_ip_addres, yandex_compute_instance.platform-db.network_interface.0.nat_ip_addres] }, + { fqdn = [yandex_compute_instance.platform-web.fqdn, yandex_compute_instance.platform-db.fqdn] } ] } From 5636264a2906cbe06e2ad50a0eae14810e791f2a Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:35:40 +0300 Subject: [PATCH 100/102] Upadate --- 02/src/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02/src/outputs.tf b/02/src/outputs.tf index d9b37200..d057b1d0 100644 --- a/02/src/outputs.tf +++ b/02/src/outputs.tf @@ -1,7 +1,7 @@ output "develop" { value = [ { instance_name = [yandex_compute_instance.platform-web.name, yandex_compute_instance.platform-db.name] }, - { external_ip = [yandex_compute_instance.platform-web.network_interface.0.nat_ip_addres, yandex_compute_instance.platform-db.network_interface.0.nat_ip_addres] }, + { external_ip = [yandex_compute_instance.platform-web.network_interface.0.nat_ip_address, yandex_compute_instance.platform-db.network_interface.0.nat_ip_address] }, { fqdn = [yandex_compute_instance.platform-web.fqdn, yandex_compute_instance.platform-db.fqdn] } ] } From 596a8a61441d3df9d467dbc388c5f7a12b882775 Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:45:41 +0300 Subject: [PATCH 101/102] Update hw-02.md --- 02/hw-02.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/02/hw-02.md b/02/hw-02.md index 24c61935..80d3d4b9 100644 --- a/02/hw-02.md +++ b/02/hw-02.md @@ -63,6 +63,8 @@ 2. Примените изменения. В качестве решения приложите вывод значений ip-адресов команды ```terraform output```. +![ter-homeworks-02-task4](https://github.com/user-attachments/assets/a8bb6758-6090-43b5-a144-d73f2546bff4) + ### Задание 5 From a4840a8c2bba0630054c2b178797a38fffbebc2e Mon Sep 17 00:00:00 2001 From: borbul2007 <78852894+borbul2007@users.noreply.github.com> Date: Sat, 14 Sep 2024 09:14:31 +0300 Subject: [PATCH 102/102] Update hw-05.md --- 05/hw-05.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/05/hw-05.md b/05/hw-05.md index 0fbe1e90..b0b67be7 100644 --- a/05/hw-05.md +++ b/05/hw-05.md @@ -31,7 +31,14 @@ - из [демо к лекции 4](https://github.com/netology-code/ter-homeworks/tree/main/04/demonstration1). 2. Проверьте код с помощью tflint и checkov. Вам не нужно инициализировать этот проект. 3. Перечислите, какие **типы** ошибок обнаружены в проекте (без дублей). - +``` +TFLINT +Warning: Missing version constraint for provider "yandex" in `required_providers` +Warning: [Fixable] variable "..." is declared but not used +Checkov +Check: CKV_TF_1: "Ensure Terraform module sources use a commit hash" +Check: CKV_TF_2: "Ensure Terraform module sources use a tag with a version number" +``` ------ ### Задание 2