diff --git a/proxmox/terraform/production/init.tf b/proxmox/terraform/production/init.tf --- a/proxmox/terraform/production/init.tf +++ b/proxmox/terraform/production/init.tf @@ -6,3 +6,19 @@ key = "production.rocquencourt.terraform.tfstate" } } + +locals { + config = { + dns = var.dns + domain = "internal.softwareheritage.org" + puppet_environment = "production" + facter_deployment = "production" + facter_subnet = "sesi_rocquencourt" + puppet_master = var.puppet_master + gateway_ip = "192.168.100.1" + user_admin = var.user_admin + user_admin_ssh_public_key = var.user_admin_ssh_public_key + user_admin_ssh_private_key_path = var.user_admin_ssh_private_key_path + bridge = "vmbr0" + } +} diff --git a/proxmox/terraform/production/production.tf b/proxmox/terraform/production/production.tf --- a/proxmox/terraform/production/production.tf +++ b/proxmox/terraform/production/production.tf @@ -1,17 +1,3 @@ -locals { - config = { - dns = var.dns - domain = "internal.softwareheritage.org" - puppet_environment = "production" - facter_deployment = "production" - facter_subnet = "sesi_rocquencourt" - puppet_master = var.puppet_master - gateway_ip = "192.168.100.1" - user_admin = var.user_admin - user_admin_ssh_public_key = var.user_admin_ssh_public_key - user_admin_ssh_private_key_path = var.user_admin_ssh_private_key_path - } -} module "kelvingrove" { source = "../modules/node" @@ -30,7 +16,7 @@ ip = "192.168.100.106" gateway = local.config["gateway_ip"] macaddr = "72:55:5E:58:01:0B" - bridge = "vmbr0" + bridge = local.config["bridge"] }] } @@ -49,7 +35,7 @@ ip = "192.168.100.71" gateway = local.config["gateway_ip"] macaddr = "06:FF:02:95:31:CF" - bridge = "vmbr0" + bridge = local.config["bridge"] }] } @@ -68,7 +54,7 @@ ip = "192.168.100.85" gateway = local.config["gateway_ip"] macaddr = "3E:46:D3:88:44:F4" - bridge = "vmbr0" + bridge = local.config["bridge"] }] } @@ -87,7 +73,7 @@ ip = "192.168.100.95" gateway = local.config["gateway_ip"] macaddr = "26:8E:7F:D1:F7:99" - bridge = "vmbr0" + bridge = local.config["bridge"] }] } @@ -108,7 +94,7 @@ ip = "192.168.100.43" gateway = local.config["gateway_ip"] macaddr = "36:E0:2D:70:7C:52" - bridge = "vmbr0" + bridge = local.config["bridge"] }] } @@ -129,7 +115,7 @@ ip = "192.168.100.44" gateway = local.config["gateway_ip"] macaddr = "C6:29:D9:ED:9C:6B" - bridge = "vmbr0" + bridge = local.config["bridge"] }] } @@ -154,7 +140,7 @@ ip = "192.168.100.111" gateway = local.config["gateway_ip"] macaddr = null - bridge = "vmbr0" + bridge = local.config["bridge"] }] } @@ -176,7 +162,7 @@ ip = "192.168.100.90" gateway = local.config["gateway_ip"] macaddr = "B2:E5:3F:E2:77:13" - bridge = "vmbr0" + bridge = local.config["bridge"] }] }