From f72e7b87a112c46094f6217b342798820705fd74 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Wed, 3 Mar 2021 16:09:58 +0000 Subject: [PATCH] Adding load balancers --- .devcontainer/docker-compose.yml | 2 +- landingzones/caf_networking/landingzone.tf | 1 + landingzones/caf_networking/variables.tf | 3 +++ landingzones/caf_solutions/landingzone.tf | 10 +++++----- landingzones/caf_solutions/variables.tf | 3 +++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index ef5bf4b0..00195b17 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ version: '3.7' services: rover: - image: aztfmod/rover:2102.0100 + image: aztfmod/rover:0.13.6-2103.0304 user: vscode labels: diff --git a/landingzones/caf_networking/landingzone.tf b/landingzones/caf_networking/landingzone.tf index 81d4612a..98de51c9 100644 --- a/landingzones/caf_networking/landingzone.tf +++ b/landingzones/caf_networking/landingzone.tf @@ -30,6 +30,7 @@ module "networking" { private_dns = var.private_dns private_endpoints = var.private_endpoints public_ip_addresses = var.public_ip_addresses + load_balancers = var.load_balancers route_tables = var.route_tables vhub_peerings = var.vhub_peerings virtual_network_gateways = var.virtual_network_gateways diff --git a/landingzones/caf_networking/variables.tf b/landingzones/caf_networking/variables.tf index 705d02cf..3d450ce1 100644 --- a/landingzones/caf_networking/variables.tf +++ b/landingzones/caf_networking/variables.tf @@ -141,4 +141,7 @@ variable dns_zone_records { } variable virtual_network_gateways { default = {} +} +variable load_balancers { + default = {} } \ No newline at end of file diff --git a/landingzones/caf_solutions/landingzone.tf b/landingzones/caf_solutions/landingzone.tf index fa71518e..06d1a28e 100644 --- a/landingzones/caf_solutions/landingzone.tf +++ b/landingzones/caf_solutions/landingzone.tf @@ -58,17 +58,17 @@ module "caf" { } networking = { - application_gateway_applications = var.application_gateway_applications application_gateways = var.application_gateways azurerm_routes = var.azurerm_routes - dns_zones = var.dns_zones dns_zone_records = var.dns_zone_records + dns_zones = var.dns_zones domain_name_registrations = var.domain_name_registrations express_route_circuit_authorizations = var.express_route_circuit_authorizations express_route_circuits = var.express_route_circuits front_door_waf_policies = var.front_door_waf_policies front_doors = var.front_doors + load_balancers = var.load_balancers local_network_gateways = var.local_network_gateways network_security_group_definition = var.network_security_group_definition network_watchers = var.network_watchers @@ -119,10 +119,10 @@ module "caf" { } security = { - keyvault_keys = var.keyvault_keys - keyvault_certificates = var.keyvault_certificates - keyvault_certificate_requests = var.keyvault_certificate_requests keyvault_certificate_issuers = var.keyvault_certificate_issuers + keyvault_certificate_requests = var.keyvault_certificate_requests + keyvault_certificates = var.keyvault_certificates + keyvault_keys = var.keyvault_keys } shared_services = { diff --git a/landingzones/caf_solutions/variables.tf b/landingzones/caf_solutions/variables.tf index bf152b24..7d6273cb 100644 --- a/landingzones/caf_solutions/variables.tf +++ b/landingzones/caf_solutions/variables.tf @@ -266,4 +266,7 @@ variable dns_zone_records { } variable keyvault_keys { default = {} +} +variable load_balancers { + default = {} } \ No newline at end of file