Adding subnet_name

Author: LaurentLesle

application_gateway/main.tf

@@ -23,7 +23,7 @@ resource "azurerm_application_gateway" "gw" {
 
     gateway_ip_configuration {
         name      = "ip-configuration"
-        subnet_id = "${var.vnet_id}/subnets/${var.subnet_name}"
+        subnet_id = "${var.vnet_id}/subnets/${var.waf_configuration_map["subnet_name"]}"
     }
 
     waf_configuration {

application_gateway/variables.tf

@@ -13,9 +13,6 @@ variable "vnet_id" {
 
 }
 
-variable "subnet_name" {
-  
-}
 
 variable "prefix" {
 

bastion/variables.tf

@@ -10,13 +10,8 @@ variable "vm_size" {
 
 }
 
-variable "subnets_map" {
-    description = "Map of the subnet to deploy the bastion server" 
-    type = "map"
-}
-
-variable "subnet_name" {
-    description = "Name of the subnet to deploy the bastion server"
+variable "subnet_id" {
+    description = "ID of the subnet to deploy the bastion server" 
 }
 
 

bastion/vm_bastion.tf

@@ -36,7 +36,7 @@ resource "azurerm_network_interface" "bastion" {
 
   ip_configuration {
     name      = "${var.computer_name}-ipconfig"
-    subnet_id = "${var.subnets_map["${var.subnet_name}"]}"
+    subnet_id = "${var.subnet_id}"
 
     private_ip_address_allocation = "dynamic"
     public_ip_address_id          = "${azurerm_public_ip.bastion_pip.id}"