From 5129d2726d4b0cc5704e49fe280ab02c018b40c9 Mon Sep 17 00:00:00 2001 From: Repinoid Date: Tue, 22 Sep 2026 18:37:21 +0300 Subject: [PATCH] =?UTF-8?q?fix(fullpipe):=20ALB=3Dtrue=20=D0=B8=20VS=3D3?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8=20Edge,=20=D0=BC=D0=BE=D0=B4=D0=B8=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=82=D0=BE=D1=80=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=BE=20SNAT,=20=D1=80=D0=B0=D1=81=D0=BA=D0=BE=D0=BC=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B2=D1=81=D1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEV_STAND/FullPipe/edge.tf | 3 --- DEV_STAND/FullPipe/edge_network.tf | 10 +--------- DEV_STAND/FullPipe/org_ips.tf | 3 --- DEV_STAND/FullPipe/outputs.tf | 2 -- DEV_STAND/FullPipe/variables.tf | 26 ++++---------------------- 5 files changed, 5 insertions(+), 39 deletions(-) diff --git a/DEV_STAND/FullPipe/edge.tf b/DEV_STAND/FullPipe/edge.tf index 8b80aee..8b8552d 100644 --- a/DEV_STAND/FullPipe/edge.tf +++ b/DEV_STAND/FullPipe/edge.tf @@ -1,5 +1,3 @@ -# --- ЗАКОММЕНТИРОВАНО: destroy всего, кроме VDC --- -/* resource "nubes_vc_nsxt" "edge" { resource_name = var.nsxt_resource_name @@ -20,4 +18,3 @@ resource "nubes_vc_nsxt" "edge" { second_dns = var.nsxt_second_dns } } -*/ diff --git a/DEV_STAND/FullPipe/edge_network.tf b/DEV_STAND/FullPipe/edge_network.tf index 39ad56f..83d5c79 100644 --- a/DEV_STAND/FullPipe/edge_network.tf +++ b/DEV_STAND/FullPipe/edge_network.tf @@ -1,7 +1,4 @@ -# --- ЗАКОММЕНТИРОВАНО: destroy всего, кроме VDC --- -/* -# vcNsxt -> modify (modifier: network) — включение SNAT / сетевые настройки Edge. -# Внешний IP берём из организации (тот же ipSpace, что выделен в vc_org). +# vcNsxt -> modify (modifier: network) — только SNAT (ALB/VS заданы при создании Edge). resource "nubes_vc_nsxt_network" "edge_net" { vc_nsxt_id = nubes_vc_nsxt.edge.id @@ -15,10 +12,5 @@ resource "nubes_vc_nsxt_network" "edge_net" { # SNAT: внешний IP из организации; "no-needed" — выключить SNAT ip_space_name = var.org_ip_space_name - qos_profile = var.nsxt_qos_profile - need_enable_avi = var.nsxt_network_need_enable_avi - virtual_services_count = var.nsxt_network_virtual_services_count - 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 index e490582..4fa90f4 100644 --- a/DEV_STAND/FullPipe/org_ips.tf +++ b/DEV_STAND/FullPipe/org_ips.tf @@ -1,5 +1,3 @@ -# --- ЗАКОММЕНТИРОВАНО: destroy всего, кроме VDC --- -/* # vcOrg -> modify (modifier: ip_space) — выделение внешних IP организации. # UUID организации берём из состояния созданного VDC (state_params.organizationUid), # т.к. var.organization может быть display-именем, а модификатору нужен UUID. @@ -13,4 +11,3 @@ resource "nubes_vc_org_ip_space" "org_ips" { # modify организации доступен только после создания VDC и Edge depends_on = [nubes_vc_nsxt.edge] } -*/ diff --git a/DEV_STAND/FullPipe/outputs.tf b/DEV_STAND/FullPipe/outputs.tf index 6c2dbae..9013f2a 100644 --- a/DEV_STAND/FullPipe/outputs.tf +++ b/DEV_STAND/FullPipe/outputs.tf @@ -13,7 +13,6 @@ output "vdc_state_params" { value = nubes_vc_vdc.vdc.state_params } -/* --- ЗАКОММЕНТИРОВАНО: ресурсы удалены, оставлен только VDC --- output "nsxt_id" { description = "UID созданного Edge (vc_nsxt)" value = nubes_vc_nsxt.edge.id @@ -33,4 +32,3 @@ 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 a2492ea..4b8a786 100644 --- a/DEV_STAND/FullPipe/variables.tf +++ b/DEV_STAND/FullPipe/variables.tf @@ -74,14 +74,14 @@ variable "nsxt_vdc_type" { variable "nsxt_need_enable_avi" { type = bool - default = false - description = "Включить AVI Load Balancer при создании Edge (неизменяемо после создания)" + default = true + description = "Включить AVI Load Balancer (ALB) при создании Edge" } variable "nsxt_virtual_services_count" { type = number - default = 1 - description = "Кол-во виртуальных сервисов на AVI при создании Edge (1..4; неизменяемо)" + default = 3 + description = "Кол-во виртуальных сервисов на AVI при создании Edge (1..4; Штурвал: ≥ 3)" } variable "nsxt_ip_addr_pool" { @@ -102,24 +102,6 @@ variable "nsxt_second_dns" { description = "Второй DNS" } -variable "nsxt_qos_profile" { - type = string - default = "QoS-100Mbit" - description = "Профиль пропускной способности Edge" -} - -variable "nsxt_network_need_enable_avi" { - type = bool - default = true - description = "Включить ALB через modify Edge (Штурвал: true)" -} - -variable "nsxt_network_virtual_services_count" { - type = number - default = 3 - description = "Кол-во VS на AVI через modify Edge (Штурвал: ≥ 3)" -} - # --- vc_org (Организация в Cloud Director) — модификатор ip_space --- variable "org_ip_space_name" {