Added conditional project designation feature for relevant modules.
This commit is contained in:
@@ -7,9 +7,14 @@ terraform {
|
||||
}
|
||||
}
|
||||
|
||||
locals {
|
||||
hub_region = substr(var.hub.zone, 0, length(var.hub.zone) - 2)
|
||||
spoke_region = substr(var.spoke.zone, 0, length(var.spoke.zone) - 2)
|
||||
}
|
||||
|
||||
provider "google" {
|
||||
# Configuration options
|
||||
region = var.hub.region
|
||||
region = local.hub_region
|
||||
zone = var.hub.zone
|
||||
project = var.hub.project
|
||||
}
|
||||
@@ -18,10 +23,11 @@ module "hub_network" {
|
||||
source = "./modules/network"
|
||||
|
||||
name = "${var.hub.name}-vpc"
|
||||
|
||||
subnets = [{
|
||||
name = "${var.hub.name}-network"
|
||||
cidr = var.hub.cidr
|
||||
region = var.hub.region
|
||||
region = local.hub_region
|
||||
}]
|
||||
|
||||
nat = true
|
||||
@@ -30,12 +36,14 @@ module "hub_network" {
|
||||
module "spoke_network" {
|
||||
source = "./modules/network"
|
||||
|
||||
name = "${var.spoke.name}-vpc"
|
||||
name = "${var.spoke.name}-vpc"
|
||||
project_id = var.spoke.project
|
||||
|
||||
subnets = [
|
||||
{
|
||||
name = "${var.spoke.name}-network"
|
||||
cidr = var.spoke.cidr
|
||||
region = var.spoke.region
|
||||
region = local.spoke_region
|
||||
}
|
||||
]
|
||||
|
||||
@@ -70,7 +78,7 @@ module "gw" {
|
||||
|
||||
name = "${var.hub.name}-vpn"
|
||||
network_name = module.hub_network.name
|
||||
region = var.hub.region
|
||||
region = local.hub_region
|
||||
vpn_external_ip = var.vpn_external_ip
|
||||
}
|
||||
|
||||
@@ -102,6 +110,7 @@ module "vm_spoke" {
|
||||
source = "./modules/linux-vm"
|
||||
|
||||
name = "vm-${var.spoke.name}"
|
||||
project_id = var.spoke.project
|
||||
network_name = "${var.spoke.name}-vpc"
|
||||
subnet_name = "${var.spoke.name}-network"
|
||||
ssh = var.ssh
|
||||
@@ -112,8 +121,7 @@ module "vm_spoke" {
|
||||
module "koszewscy_internal_zone" {
|
||||
source = "./modules/dns-managed-zone"
|
||||
|
||||
project_id = var.hub.project
|
||||
dns_name = "koszewscy.waw.pl."
|
||||
dns_name = "koszewscy.waw.pl."
|
||||
|
||||
network_id = module.hub_network.id
|
||||
|
||||
|
||||
Reference in New Issue
Block a user