From e45eb9de69199a2e3216089dd94d6c0482ee44df Mon Sep 17 00:00:00 2001
From: Vezpi <etienne.girault@gmail.com>
Date: Sun, 6 Apr 2025 20:08:02 +0000
Subject: [PATCH] add env next to tags

---
 ansible/playbooks/deploy_tf.yml             | 4 +++-
 ansible/roles/terraform_vm/tasks/main.yml   | 2 ++
 terraform/projects/terransible/main.tf      | 4 ++--
 terraform/projects/terransible/variables.tf | 6 ++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ansible/playbooks/deploy_tf.yml b/ansible/playbooks/deploy_tf.yml
index 71d5fec..07ccb36 100644
--- a/ansible/playbooks/deploy_tf.yml
+++ b/ansible/playbooks/deploy_tf.yml
@@ -7,7 +7,9 @@
         name: terraform_vm
       vars:
         terraform_vm_project_path: /home/vez/homelab/terraform/projects/terransible
-        terraform_vars_vm_env: val
+        terraform_vars_vm_env: int
+        terraform_vars_vm_tags:
+          - dev
         # terraform_vars_multi_node_deployment: false
         # terraform_vars_target_node: zenith
         terraform_vars_vm_attr:
diff --git a/ansible/roles/terraform_vm/tasks/main.yml b/ansible/roles/terraform_vm/tasks/main.yml
index 4c29e42..0d71732 100644
--- a/ansible/roles/terraform_vm/tasks/main.yml
+++ b/ansible/roles/terraform_vm/tasks/main.yml
@@ -9,6 +9,8 @@
       target_node: "{{ terraform_vars_target_node | default(omit)}}"
       vm_attr: "{{ terraform_vars_vm_attr | default(omit)}}"
       vm_env: "{{ terraform_vars_vm_env | default(omit)}}"
+      vm_tags: "{{ terraform_vars_vm_tags | default(omit)}}"
+  retries: 1
 
 - name: Refresh inventory
   ansible.builtin.meta: refresh_inventory
\ No newline at end of file
diff --git a/terraform/projects/terransible/main.tf b/terraform/projects/terransible/main.tf
index 4740729..1c29404 100644
--- a/terraform/projects/terransible/main.tf
+++ b/terraform/projects/terransible/main.tf
@@ -6,7 +6,7 @@ module "pve_vm" {
   vm_cpu    = each.value.vm_cpu
   vm_ram    = each.value.vm_ram
   vm_vlan   = each.value.vm_vlan
-  vm_tags   = [var.vm_env]
+  vm_tags   = var.vm_tags
 }
 
 locals {
@@ -19,7 +19,7 @@ locals {
       for node in local.selected_nodes : [
         for role, config in var.vm_attr : {
           node_name = node
-          vm_name   = "${node}-${role}"
+          vm_name   = "${role}-${var.vm_env}-${node}"
           vm_cpu    = config.cpu
           vm_ram    = config.ram
           vm_vlan   = config.vlan
diff --git a/terraform/projects/terransible/variables.tf b/terraform/projects/terransible/variables.tf
index e0dd660..8abf414 100644
--- a/terraform/projects/terransible/variables.tf
+++ b/terraform/projects/terransible/variables.tf
@@ -37,4 +37,10 @@ variable "vm_env" {
   description = "VM environment"
   type        = string
   default     = "test"
+}
+
+variable "vm_tags" {
+  description = "Tags for the VM"
+  type        = list(any)
+  default     = ["test"]
 }
\ No newline at end of file