diff --git a/terraform/locals.tf b/terraform/locals.tf index 2da5cc0..3afdef9 100644 --- a/terraform/locals.tf +++ b/terraform/locals.tf @@ -10,7 +10,7 @@ locals { vm_name = v.vm_name node_name = v.node_name ipv4_address = module.proxmox_ubuntu_cloudinit_clone[k].vm_ipv4_address - vm_tags = concat( + vm_tags = concat( try(v.vm_tags, []), ["terraform", "docker", v.service_name, "ip-${replace(module.proxmox_ubuntu_cloudinit_clone[k].vm_ipv4_address, ".", "-")}"] ) diff --git a/terraform/main.tf b/terraform/main.tf index 33db430..5b3f62f 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -3,7 +3,7 @@ module "proxmox_ubuntu_cloudinit_clone" { source = "./modules/proxmox_ubuntu_cloudinit_clone" vm_name = each.value.vm_name - service_name = each.value.service_name + service_name = each.value.service_name node_name = each.value.node_name node_datastore = var.vm_defaults.node_datastore bridge = var.vm_defaults.bridge @@ -16,9 +16,9 @@ module "proxmox_ubuntu_cloudinit_clone" { try(each.value.vm_tags, []), ["terraform", "docker", each.value.service_name] ) - vm_user_sshkey = var.vm_defaults.vm_user_sshkey - compose_file_b64 = filebase64("${path.root}/../compose/docker-compose.yml") - env_file_b64 = filebase64("${path.root}/../compose/.env") + vm_user_sshkey = var.vm_defaults.vm_user_sshkey + compose_file_content = filebase64("${path.root}/../compose/docker-compose.yml") + env_file_content = filebase64("${path.root}/../compose/.env") } # module "inventory" {