Merge pull request '[deploy-opentofu]' (#309) from fenix-admin into dev

Reviewed-on: fenix-gitea-admin/iac-opentofu-private#309

merge_yaml.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from ruamel.yaml import YAML 
+from ruamel.yaml import YAML
 import sys
 import json
 from collections.abc import Mapping

proxmox.tf

@@ -122,6 +122,9 @@ resource "proxmox_virtual_environment_vm" "proxmox-kubernetes-VM-template" {
   network_device {
     bridge = "vmbr0"  # rede de gestão para comunicação com Cluster A
   }
+  network_device {
+    bridge = "vmbr2"
+  }
 
 initialization {
     dns {
@@ -133,6 +136,11 @@ initialization {
       }
     }
 
+    ip_config {
+      ipv4 {
+        address = "dhcp"
+      }
+    }
   user_data_file_id = proxmox_virtual_environment_file.cloud_init_yaml.id
  }
 }
@@ -170,6 +178,12 @@ resource "proxmox_virtual_environment_vm" "k8s_vms" {
           gateway = each.value.gateway
         }
       }
+      ip_config {
+        ipv4 {
+          address = each.value.ip2
+          gateway = each.value.gateway
+        }
+      }
 
       user_data_file_id = proxmox_virtual_environment_file.vm_user_data[each.key].id
     }

secrets-output/iac.ansible.hosts.ini

@@ -1,13 +0,0 @@
-  
-[master]
-master1 ansible_host=192.168.1.99 ansible_user=user ansible_ssh_pass=pass ansible_ssh_common_args='-o StrictHostKeyChecking=no'
-
-[workers]
-  
-
-worker-192-168-1-101 ansible_host=192.168.1.101 ansible_user=user ansible_ssh_pass=pass ansible_ssh_common_args='-o StrictHostKeyChecking=no'
-  
-  
-
-
-

secrets/iac.proxmox.ssh.link

@@ -1 +0,0 @@
-proxmox-ssh.example.com

secrets/iac.vaultwarden-link

@@ -1 +0,0 @@
-https://vaultwarden.example.com

secrets/proxmox.secrets.tfvars

@@ -1,6 +1,6 @@
-#proxmox_server   = "proxmox.example.com"
-#PM_API_TOKEN_ID  = "tokenid"
-#PM_API_TOKEN_SECRET = "tokensecret"
+proxmox_server   = "proxmox.example.com"
+PM_API_TOKEN_ID  = "tokenid"
+PM_API_TOKEN_SECRET = "tokensecret"
 # tokenid is read automatically from PM_API_TOKEN_ID
 # token is read automatically from PM_API_TOKEN_SECRET
 
@@ -20,7 +20,6 @@ proxmox_k8s_vms = [
     vm_id     = 3001
     node_name = "node"
     ip        = "192.168.1.99/24"
-    ip3       = "192.168.1.199/24"
     cores     = 2
     memory    = 2000
     disk_size = 32
@@ -34,14 +33,13 @@ proxmox_k8s_vms = [
       }
     ]
     extra_packages = []
-    extra_runcmd   = ["sudo ip addr add 192.168.1.199/24 dev eth0"]
+    extra_runcmd   = []
   },
   {
     name      = "k8s-worker-01"
     vm_id     = 3002
     node_name = "node"
     ip        = "192.168.1.101/24"
-    ip3       = "192.168.1.201/24"
     cores     = 1
     memory    = 2000
     disk_size = 32
@@ -55,6 +53,6 @@ proxmox_k8s_vms = [
       }
     ]
     extra_packages = []
-    extra_runcmd   = ["sudo ip addr add 192.168.1.201/24 dev eth0"]
+    extra_runcmd   = []
   },
 ]