chore: update terraform outputs

.gitea/workflows/deploy.yml

@@ -1,6 +1,8 @@
 name: Deploy VM and App
 
 on:
+  push:
+
   workflow_dispatch:
     inputs:
       tfvars_file:
@@ -21,11 +23,11 @@ jobs:
       - name: Check files & Select tfvars
         shell: bash
         run: |
-          pwd
+          #rm ansible/inventory/inventory.yml
           mkdir -p ansible/inventory
           cd terraform
-          cp ${{ inputs.tfvars_file }} terraform.tfvars
+          #rm vm_data.yml
-          ls
+          cp "${{ inputs.tfvars_file || 'single.tfvars.example' }}" terraform.tfvars
 
       - uses: hashicorp/setup-terraform@v4
 
@@ -40,6 +42,27 @@ jobs:
         run: terraform apply -auto-approve
         working-directory: "terraform"
 
+      - name: Install Ansible
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ansible rsync
+
+      - name: Set up SSH
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/vlans_rsa
+          chmod 600 ~/.ssh/vlans_rsa
+          cat > ~/.ssh/config <<'EOF'
+          Host *
+            StrictHostKeyChecking no
+            UserKnownHostsFile=/dev/null
+          EOF
+
+      - name: Run playbook
+        run: |
+          ansible-playbook ansible/playbooks/docker_copy.yml -i ansible/inventory/inventory.yml -u cloud --private-key ~/.ssh/vlans_rsa
+
       - name: Configure Git
         run: |
           git config user.name "git-bot"
@@ -53,26 +76,3 @@ jobs:
           git push origin HEAD:main
         env:
           GITEA_USERNAME: git-bot # or your bot account
-
-      - name: Install Ansible
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ansible
-
-      - name: Set up SSH
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          echo -e "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile=/dev/null\n" > ~/.ssh/config
-
-      - name: Setup Ansible Directories
-        run: |
-          pwd
-          cat ansible/inventory/inventory.yml
-          ls -r
-
-      - name: Run playbook
-        run: |
-          ansible-playbook ansible/playbooks/docker_copy.yml -i ansible/inventory/inventory.yml -u cloud --private-key ~/.ssh/id_rsa

ansible/inventory/inventory.yml

@@ -3,6 +3,6 @@
     "n8n":
       "hosts":
         "n8n-01":
-          "ansible_host": "192.168.10.117"
+          "ansible_host": "192.168.10.107"
   "vars":
     "ansible_user": "cloud"

terraform/main.tf

@@ -40,12 +40,12 @@ module "vm-n8n" {
 
 module "inventory" {
   source   = "./modules/proxmox_ansible_inventory"
-  filename = "${path.root}/ansible/inventory/inventory.yml"
+  filename = "${abspath("${path.root}/..")}/ansible/inventory/inventory.yml"
   instances = local.vm_created
 }
 
 module "vm_data" {
   source    = "./modules/proxmox_vm_data"
-  filename  = "${path.root}/terraform/vm_data.yml"
+  filename  = "${abspath("${path.root}/..")}/terraform/vm_data.yml"
   instances = local.vm_created
 }

terraform/modules/proxmox_ubuntu_cloudinit_clone/main.tf

@@ -57,7 +57,7 @@ resource "proxmox_virtual_environment_file" "cloud_config" {
   }
 }
 
-resource "proxmox_virtual_environment_vm" "ubuntu_22_minimal_template" {
+resource "proxmox_virtual_environment_vm" "ubuntu_22_minimal_clone" {
   name      = var.vm_name           # VM name
   node_name = var.node_name         # Proxmox node to deploy the VM
   tags      = var.vm_tags           # Optional VM tags for categorization

terraform/modules/proxmox_ubuntu_cloudinit_clone/output.tf

@@ -1,3 +1,3 @@
 output "vm_ipv4_address" {
-  value = proxmox_virtual_environment_vm.ubuntu_vm.ipv4_addresses[1][0]
+  value = proxmox_virtual_environment_vm.ubuntu_22_minimal_clone.ipv4_addresses[1][0]
 }

terraform/modules/proxmox_ubuntu_cloudinit_clone/providers.tf

@@ -0,0 +1,13 @@
+terraform {
+  required_providers {
+    proxmox = {
+      source  = "bpg/proxmox"
+      version = "0.106.0"
+     #url = https://registry.terraform.io/providers/bpg/proxmox/latest/docs/guides/clone-vm 
+    }
+    aws = {
+      source  = "hashicorp/aws"
+      version = "6.38.0"
+    }
+  }
+}

terraform/modules/proxmox_ubuntu_cloudinit_clone/variables.tf

@@ -16,7 +16,7 @@ variable "instance_configs" {
   default = [
     { crispy_name = "snap", vmid = "9002" },
     { crispy_name = "crackle", vmid = "9000" },
-    { crispy_name = "pop", vmid = "9001" }
+    { crispy_name = "pop", vmid = "900" }
   ]
 }
 

terraform/vm_data.yml

@@ -6,5 +6,5 @@
     - "terraform"
     - "docker"
     - "n8n"
-    - "ip-192-168-10-117"
+    - "ip-192-168-10-107"
     "vm_name": "n8n-01"