From d78573de450e3bf23bed33eac70a37f58cce9701 Mon Sep 17 00:00:00 2001 From: Repinoid Date: Wed, 23 Sep 2026 08:55:26 +0300 Subject: [PATCH] =?UTF-8?q?refactor(fullpipe):=20=D1=83=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BE=D1=82=20=D0=BC=D0=BE=D0=B4=D0=B8?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80=D0=BE=D0=B2=20(org?= =?UTF-8?q?=5Fips.tf,=20edge=5Fnetwork.tf)=20=E2=80=94=20=D1=87=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D1=8B=D0=B5=20=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81?= =?UTF-8?q?=D1=8B=20vdc+nsxt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEV_STAND/FullPipe/edge_network.tf | 24 ------------------------ DEV_STAND/FullPipe/org_ips.tf | 13 ------------- DEV_STAND/FullPipe/outputs.tf | 5 ----- DEV_STAND/FullPipe/variables.tf | 20 -------------------- 4 files changed, 62 deletions(-) delete mode 100644 DEV_STAND/FullPipe/edge_network.tf delete mode 100644 DEV_STAND/FullPipe/org_ips.tf diff --git a/DEV_STAND/FullPipe/edge_network.tf b/DEV_STAND/FullPipe/edge_network.tf deleted file mode 100644 index a801e34..0000000 --- a/DEV_STAND/FullPipe/edge_network.tf +++ /dev/null @@ -1,24 +0,0 @@ -# vcNsxt -> modify (modifier: network) — SNAT + ALB. -# ВАЖНО: resource "nubes_vc_nsxt" Update НЕ вызывает modify (у сервиса нет -# modify-набора для instance-ресурса — изменения Edge идут ТОЛЬКО через этот -# модификатор). Поэтому need_enable_avi/virtual_services_count задаются ЗДЕСЬ. -resource "nubes_vc_nsxt_network" "edge_net" { - vc_nsxt_id = nubes_vc_nsxt.edge.id - - # ALB (AVI Load Balancer) - need_enable_avi = var.nsxt_need_enable_avi - virtual_services_count = var.nsxt_virtual_services_count - qos_profile = var.nsxt_qos_profile - - # JSON-строка с camelCase-ключами (как в API/HAR), НЕ snake_case как в edge.tf - routed_net_configuration = jsonencode({ - ipAddrPool = var.nsxt_ip_addr_pool - mainDns = var.nsxt_main_dns - secondDns = var.nsxt_second_dns - }) - - # SNAT: внешний IP из организации; "no-needed" — выключить SNAT - ip_space_name = var.org_ip_space_name - - depends_on = [nubes_vc_org_ip_space.org_ips] -} diff --git a/DEV_STAND/FullPipe/org_ips.tf b/DEV_STAND/FullPipe/org_ips.tf deleted file mode 100644 index 4fa90f4..0000000 --- a/DEV_STAND/FullPipe/org_ips.tf +++ /dev/null @@ -1,13 +0,0 @@ -# vcOrg -> modify (modifier: ip_space) — выделение внешних IP организации. -# UUID организации берём из состояния созданного VDC (state_params.organizationUid), -# т.к. var.organization может быть display-именем, а модификатору нужен UUID. -resource "nubes_vc_org_ip_space" "org_ips" { - vc_org_id = nubes_vc_vdc.vdc.state_params["organizationUid"] - - v_ip_configure = jsonencode([ - { name = var.org_ip_space_name, count = var.org_ip_count } - ]) - - # modify организации доступен только после создания VDC и Edge - depends_on = [nubes_vc_nsxt.edge] -} diff --git a/DEV_STAND/FullPipe/outputs.tf b/DEV_STAND/FullPipe/outputs.tf index 9013f2a..13ee3e0 100644 --- a/DEV_STAND/FullPipe/outputs.tf +++ b/DEV_STAND/FullPipe/outputs.tf @@ -27,8 +27,3 @@ output "nsxt_state_params" { description = "Параметры состояния Edge (vc_nsxt) из API" value = nubes_vc_nsxt.edge.state_params } - -output "org_ip_space" { - description = "Выделенные внешние IP организации (v_ip_configure)" - value = nubes_vc_org_ip_space.org_ips.v_ip_configure -} diff --git a/DEV_STAND/FullPipe/variables.tf b/DEV_STAND/FullPipe/variables.tf index 5c6fe49..dbe8a3e 100644 --- a/DEV_STAND/FullPipe/variables.tf +++ b/DEV_STAND/FullPipe/variables.tf @@ -101,23 +101,3 @@ variable "nsxt_second_dns" { default = "185.247.187.77" description = "Второй DNS" } - -variable "nsxt_qos_profile" { - type = string - default = "QoS-100Mbit" - description = "Профиль пропускной способности Edge" -} - -# --- vc_org (Организация в Cloud Director) — модификатор ip_space --- - -variable "org_ip_space_name" { - type = string - default = "internet-ipv4-v1" - description = "Имя ipSpace организации для выделения внешних IP (значение из ЛК)" -} - -variable "org_ip_count" { - type = number - default = 3 - description = "Кол-во выделяемых внешних IP организации (для Штурвала суммарно 3)" -}