updating TF variables

This commit is contained in:
ryhud 2021-09-29 14:10:20 -04:00
parent ac8b38f3dd
commit 8559028099
4 changed files with 50 additions and 19 deletions

View File

@ -12,7 +12,7 @@ resource "azurerm_machine_learning_compute_instance" "compute_instance" {
location = azurerm_resource_group.default.location location = azurerm_resource_group.default.location
machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id
virtual_machine_size = "STANDARD_DS2_V2" virtual_machine_size = "STANDARD_DS2_V2"
subnet_resource_id = var.training_subnet_resource_id subnet_resource_id = "${data.azurerm_subnet.training.id}"
depends_on = [ depends_on = [
azurerm_private_endpoint.mlw_ple azurerm_private_endpoint.mlw_ple
@ -26,7 +26,7 @@ resource "azurerm_machine_learning_compute_cluster" "compute" {
machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id
vm_priority = "Dedicated" vm_priority = "Dedicated"
vm_size = "STANDARD_DS2_V2" vm_size = "STANDARD_DS2_V2"
subnet_resource_id = var.training_subnet_resource_id subnet_resource_id = "${data.azurerm_subnet.training.id}"
identity { identity {
type = "SystemAssigned" type = "SystemAssigned"

View File

@ -1,3 +1,23 @@
# Data Sources
data "azurerm_subnet" "training" {
name = var.training_subnet_name
virtual_network_name = var.vnet_name
resource_group_name = var.vnet_resource_group_name
}
data "azurerm_subnet" "aks" {
name = var.aks_subnet_name
virtual_network_name = var.vnet_name
resource_group_name = var.vnet_resource_group_name
}
data "azurerm_subnet" "ml" {
name = var.ml_subnet_name
virtual_network_name = var.vnet_name
resource_group_name = var.vnet_resource_group_name
}
# Network Security Groups # Network Security Groups
resource "azurerm_network_security_group" "nsg-training" { resource "azurerm_network_security_group" "nsg-training" {
name = "nsg-training" name = "nsg-training"
@ -30,7 +50,7 @@ resource "azurerm_network_security_group" "nsg-training" {
} }
resource "azurerm_subnet_network_security_group_association" "nsg-training-link" { resource "azurerm_subnet_network_security_group_association" "nsg-training-link" {
subnet_id = var.training_subnet_resource_id subnet_id = "${data.azurerm_subnet.training.id}"
network_security_group_id = azurerm_network_security_group.nsg-training.id network_security_group_id = azurerm_network_security_group.nsg-training.id
} }
@ -43,7 +63,7 @@ resource "azurerm_network_security_group" "nsg-aks" {
} }
resource "azurerm_subnet_network_security_group_association" "nsg-aks-link" { resource "azurerm_subnet_network_security_group_association" "nsg-aks-link" {
subnet_id = var.aks_subnet_resource_id subnet_id = "${data.azurerm_subnet.aks.id}"
network_security_group_id = azurerm_network_security_group.nsg-aks.id network_security_group_id = azurerm_network_security_group.nsg-aks.id
} }
@ -81,7 +101,7 @@ resource "azurerm_route" "training-BatchRoute" {
} }
resource "azurerm_subnet_route_table_association" "rt-training-link" { resource "azurerm_subnet_route_table_association" "rt-training-link" {
subnet_id = var.training_subnet_resource_id subnet_id = "${data.azurerm_subnet.training.id}"
route_table_id = azurerm_route_table.rt-training.id route_table_id = azurerm_route_table.rt-training.id
} }
@ -101,6 +121,6 @@ resource "azurerm_route" "aks-Internet-Route" {
} }
resource "azurerm_subnet_route_table_association" "rt-aks-link" { resource "azurerm_subnet_route_table_association" "rt-aks-link" {
subnet_id = var.aks_subnet_resource_id subnet_id = "${data.azurerm_subnet.aks.id}"
route_table_id = azurerm_route_table.rt-aks.id route_table_id = azurerm_route_table.rt-aks.id
} }

View File

@ -21,20 +21,31 @@ variable "image_build_compute_name" {
default = "image-builder" default = "image-builder"
} }
# Existing subnets variables # Existing vnet and subnets variables
variable "training_subnet_resource_id" {
variable "vnet_resource_group_name" {
type = string type = string
description = "Resource ID of the existing training subnet" description = "Name of the resource group for the existing VNet"
} }
variable "aks_subnet_resource_id" { variable "vnet_name" {
type = string type = string
description = "Resource ID of the existing aks subnet" description = "Name of the existing VNet"
} }
variable "ml_subnet_resource_id" { variable "training_subnet_name" {
type = string type = string
description = "Resource ID of the existing ML workspace subnet" description = "Name of the existing training subnet"
}
variable "aks_subnet_name" {
type = string
description = "Name of the existing aks subnet"
}
variable "ml_subnet_name" {
type = string
description = "Name of the existing ML workspace subnet"
} }

View File

@ -70,7 +70,7 @@ resource "azurerm_private_endpoint" "kv_ple" {
name = "ple-${var.name}-${var.environment}-kv" name = "ple-${var.name}-${var.environment}-kv"
location = azurerm_resource_group.default.location location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name resource_group_name = azurerm_resource_group.default.name
subnet_id = var.ml_subnet_resource_id subnet_id = "${data.azurerm_subnet.ml.id}"
private_dns_zone_group { private_dns_zone_group {
name = "private-dns-zone-group" name = "private-dns-zone-group"
@ -89,7 +89,7 @@ resource "azurerm_private_endpoint" "st_ple_blob" {
name = "ple-${var.name}-${var.environment}-st-blob" name = "ple-${var.name}-${var.environment}-st-blob"
location = azurerm_resource_group.default.location location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name resource_group_name = azurerm_resource_group.default.name
subnet_id = var.ml_subnet_resource_id subnet_id = "${data.azurerm_subnet.ml.id}"
private_dns_zone_group { private_dns_zone_group {
name = "private-dns-zone-group" name = "private-dns-zone-group"
@ -108,7 +108,7 @@ resource "azurerm_private_endpoint" "storage_ple_file" {
name = "ple-${var.name}-${var.environment}-st-file" name = "ple-${var.name}-${var.environment}-st-file"
location = azurerm_resource_group.default.location location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name resource_group_name = azurerm_resource_group.default.name
subnet_id = var.ml_subnet_resource_id subnet_id = "${data.azurerm_subnet.ml.id}"
private_dns_zone_group { private_dns_zone_group {
name = "private-dns-zone-group" name = "private-dns-zone-group"
@ -127,7 +127,7 @@ resource "azurerm_private_endpoint" "cr_ple" {
name = "ple-${var.name}-${var.environment}-cr" name = "ple-${var.name}-${var.environment}-cr"
location = azurerm_resource_group.default.location location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name resource_group_name = azurerm_resource_group.default.name
subnet_id = var.ml_subnet_resource_id subnet_id = "${data.azurerm_subnet.ml.id}"
private_dns_zone_group { private_dns_zone_group {
name = "private-dns-zone-group" name = "private-dns-zone-group"
@ -146,7 +146,7 @@ resource "azurerm_private_endpoint" "mlw_ple" {
name = "ple-${var.name}-${var.environment}-mlw" name = "ple-${var.name}-${var.environment}-mlw"
location = azurerm_resource_group.default.location location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name resource_group_name = azurerm_resource_group.default.name
subnet_id = var.ml_subnet_resource_id subnet_id = "${data.azurerm_subnet.ml.id}"
private_dns_zone_group { private_dns_zone_group {
name = "private-dns-zone-group" name = "private-dns-zone-group"
@ -172,7 +172,7 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
vm_priority = "LowPriority" vm_priority = "LowPriority"
vm_size = "Standard_DS2_v2" vm_size = "Standard_DS2_v2"
machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id
subnet_resource_id = var.training_subnet_resource_id subnet_resource_id = "${data.azurerm_subnet.training.id}"
scale_settings { scale_settings {
min_node_count = 0 min_node_count = 0