changing back ram and disk defaults

.gitea/workflows/deploy.yml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   terraform-ansible-deploy:
-    runs-on: frente
+    runs-on: ubuntu-latest
     env:
       PROXMOX_VE_API_TOKEN: https://api.staging.example.com
       PROXMOX_VE_ENDPOINT: true
@@ -52,37 +52,38 @@ jobs:
         run: terraform apply -auto-approve
         working-directory: "terraform"
 
-      - name: Install Ansible
+####  Needs review / determine if worth keeping
-        shell: bash
+# - name: Install Ansible
-        run: |
+#   shell: bash
-          sudo apt-get update
+#   run: |
-          sudo apt-get install -y ansible rsync
+#     sudo apt-get update
+#     sudo apt-get install -y ansible rsync
 
-      - name: Set up SSH
+# - name: Set up SSH
-        run: |
+#   run: |
-          mkdir -p ~/.ssh
+#     mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/vlans_rsa
+#     echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/vlans_rsa
-          chmod 600 ~/.ssh/vlans_rsa
+#     chmod 600 ~/.ssh/vlans_rsa
-          cat > ~/.ssh/config <<'EOF'
+#     cat > ~/.ssh/config <<'EOF'
-          Host *
+#     Host *
-            StrictHostKeyChecking no
+#       StrictHostKeyChecking no
-            UserKnownHostsFile=/dev/null
+#       UserKnownHostsFile=/dev/null
-          EOF
+#     EOF
 
-      - name: Run playbook
+# - name: Configure Git
-        run: |
+#   run: |
-          ansible-playbook ansible/playbooks/docker_copy.yml -i ansible/inventory/inventory.yml -u cloud --private-key ~/.ssh/vlans_rsa
+#     git config user.name "git-bot"
+#     git config user.email "got-bot@text.com"
 
-      - name: Configure Git
+# - name: Commit and push to Gitea
-        run: |
+#   run: |
-          git config user.name "git-bot"
+#     git remote set-url origin https://$GITEA_USERNAME:${{ secrets.GIT_BOT_TOKEN }}@tea.charcarservices.uk/CC/N8N.git
-          git config user.email "got-bot@text.com"
+#     git add terraform/vm_data.yml ansible/inventory/inventory.yml
+#     git diff --cached --quiet || git commit -m "chore: update terraform outputs"
+#     git push origin HEAD:main
+#   env:
+#     GITEA_USERNAME: git-bot # or your bot account
 
-      - name: Commit and push to Gitea
+# - name: Run playbook
-        run: |
+#   run: |
-          git remote set-url origin https://$GITEA_USERNAME:${{ secrets.GIT_BOT_TOKEN }}@tea.charcarservices.uk/CC/N8N.git
+#     ansible-playbook ansible/playbooks/docker_copy.yml -i ansible/inventory/inventory.yml -u cloud --private-key ~/.ssh/vlans_rsa
-          git add terraform/vm_data.yml ansible/inventory/inventory.yml
-          git diff --cached --quiet || git commit -m "chore: update terraform outputs"
-          git push origin HEAD:main
-        env:
-          GITEA_USERNAME: git-bot # or your bot account

.gitea/workflows/destroy_module.yml

@@ -9,6 +9,15 @@ on:
         default: "terraform"
         type: string
 
+      tfvars_file:
+        description: "Which tfvars file to use"
+        required: true
+        default: "single.tfvars.example"
+        type: choice
+        options:
+          - single.tfvars.example
+          - multi.tfvars.example
+
 jobs:
   destroy:
     runs-on: ubuntu-latest
@@ -22,6 +31,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Check files & Select tfvars
+        shell: bash
+        run: |
+          cp "${{ inputs.tfvars_file || 'single.tfvars.example' }}" terraform.tfvars
+          cat terraform.tfvars
+
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v4
 

.gitignore

@@ -0,0 +1 @@
+.terraform*

README.md

@@ -1,4 +1,4 @@
-# VM Service Template
+# VM Service Template - CHANGE BACKEND FILE PATH
 
 This repository is a starter template for deploying one or more service VMs in Proxmox using Terraform, then configuring and launching applications with Ansible and Docker Compose.
 

terraform/backend.tf

@@ -1,18 +1,18 @@
 terraform {
   backend "s3" {
-    bucket = "terraform"
+    bucket     = "terraform"
-    key = "n8n/terraform.tfstate"
+    key        = "n8n/terraform.tfstate"
-    access_key = "GK242d456c0692a9d4cc102206" 
+    access_key = "GK242d456c0692a9d4cc102206"
     secret_key = "1d7e22b7a8892cb11b569017659aa511b37b53287c4d1699c310d9f8ac76df09"
     region     = "garage"
     endpoints = {
-        s3 = "http://192.168.10.109:3900" 
+      s3 = "http://192.168.10.109:3900"
-  }
+    }
     skip_credentials_validation = true
     skip_requesting_account_id  = true
     skip_metadata_api_check     = true
     skip_region_validation      = true
     use_path_style              = true
     use_lockfile                = true
-}
+  }
 }

terraform/locals.tf

@@ -0,0 +1,19 @@
+locals {
+  instance_map = var.instance_mode == "single" ? {
+    main = var.instance
+  } : var.instances
+
+  vm_created = {
+    for k, v in local.instance_map :
+    k => {
+      service_name = v.service_name
+      vm_name      = v.vm_name
+      node_name    = v.node_name
+      ipv4_address = module.proxmox_ubuntu_cloudinit_clone[k].vm_ipv4_address
+      vm_tags = concat(
+        try(v.vm_tags, []),
+        ["terraform", "docker", v.service_name, "ip-${replace(module.proxmox_ubuntu_cloudinit_clone[k].vm_ipv4_address, ".", "-")}"]
+      )
+    }
+  }
+}

terraform/main.tf

@@ -1,28 +1,9 @@
-locals {
+module "proxmox_ubuntu_cloudinit_clone" {
-  instance_map = var.instance_mode == "single" ? {
-    main = var.instance
-  } : var.instances
-
-  vm_created = {
-    for k, v in local.instance_map :
-    k => {
-      service_name = v.service_name
-      vm_name      = v.vm_name
-      node_name    = v.node_name
-      ipv4_address = module.vm-n8n[k].vm_ipv4_address
-      vm_tags      = concat(
-        try(v.vm_tags, []),
-        ["terraform", "docker", v.service_name, "ip-${replace(module.vm-n8n[k].vm_ipv4_address, ".", "-")}"]
-      )
-    }
-  }
-}
-
-module "vm-n8n" {
   for_each = local.instance_map
   source   = "./modules/proxmox_ubuntu_cloudinit_clone"
 
   vm_name        = each.value.vm_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
@@ -31,21 +12,11 @@ module "vm-n8n" {
   vm_size        = coalesce(try(each.value.vm_size, null), var.vm_defaults.vm_size)
   vm_bios        = var.vm_defaults.vm_bios
   vm_machine     = var.vm_defaults.vm_machine
-  vm_tags        = concat(
+  vm_tags = concat(
     try(each.value.vm_tags, []),
     ["terraform", "docker", each.value.service_name]
   )
-  vm_user_sshkey = var.vm_defaults.vm_user_sshkey
+  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" {
+}
-  source   = "./modules/proxmox_ansible_inventory"
-  filename = "${abspath("${path.root}/..")}/ansible/inventory/inventory.yml"
-  instances = local.vm_created
-}
-
-module "vm_data" {
-  source    = "./modules/proxmox_vm_data"
-  filename  = "${abspath("${path.root}/..")}/terraform/vm_data.yml"
-  instances = local.vm_created
-}

terraform/modules/proxmox_ansible_inventory/main.tf

@@ -1,26 +0,0 @@
-locals {
-  inventory = {
-    all = {
-      vars = {
-        ansible_user = "cloud"
-      }
-      children = {
-        for svc in distinct([for k, v in var.instances : v.service_name]) :
-        svc => {
-          hosts = {
-            for k, v in var.instances :
-            v.vm_name => {
-              ansible_host = v.ipv4_address
-            }
-            if v.service_name == svc
-          }
-        }
-      }
-    }
-  }
-}
-
-resource "local_file" "inventory" {
-  filename = var.filename
-  content  = yamlencode(local.inventory)
-}

terraform/modules/proxmox_ansible_inventory/outputs.tf

@@ -1,7 +0,0 @@
-output "filename" {
-  value = local_file.inventory.filename
-}
-
-output "content" {
-  value = local_file.inventory.content
-}

terraform/modules/proxmox_ansible_inventory/variables.tf

@@ -1,13 +0,0 @@
-variable "filename" {
-  description = "Path to write the inventory.yml file"
-  type        = string
-}
-
-variable "instances" {
-  description = "Normalized instance map keyed by instance key"
-  type = map(object({
-    service_name = string
-    vm_name      = string
-    ipv4_address = string
-  }))
-}

terraform/modules/proxmox_ubuntu_cloudinit_clone/locals.tf

@@ -1,4 +1,6 @@
-selected_instance = one([
+locals {
+  selected_instance = one([
     for cfg in var.instance_configs :
     cfg if cfg.crispy_name == var.node_name
-])
+  ])
+}

terraform/modules/proxmox_ubuntu_cloudinit_clone/main.tf

@@ -1,10 +1,10 @@
 resource "proxmox_virtual_environment_file" "cloud_config" {
   content_type = "snippets"
-  datastore_id = "local"
+  datastore_id = "hlst"
-  node_name    = "pop"
+  node_name    = var.node_name
 
   source_raw {
-    file_name = "vm.cloud-config.yaml" # The name of the snippet file
+    file_name = "${var.vm_name}_vm.cloud-config.yaml"
     data      = <<-EOF
     #cloud-config
     hostname: ${var.vm_name}
@@ -14,104 +14,119 @@ resource "proxmox_virtual_environment_file" "cloud_config" {
 
     system_info:
       default_user:
-        groups: [ docker ]
+        groups: [ cloud ]
 
     users:
       - default
       - name: cloud
-        groups: 
+        groups:
           - sudo
           - docker
         shell: /bin/bash
         ssh-authorized-keys:
-          - "${var.vm_user_sshkey}" # +++ Needs to be put into a variable injected by git actions secrets
+          - "${var.vm_user_sshkey}"
         sudo: ALL=(ALL) NOPASSWD:ALL
 
     packages:
-      - qemu-guest-agent   
+      - qemu-guest-agent
       - apt-transport-https
       - ca-certificates
       - curl
       - gnupg
       - lsb-release
-      - unattended-upgrades 
+      - unattended-upgrades
       - rsync
+      - nano
+
+    bootcmd:
+      - mkdir -p /home/cloud/${var.service_name}
+      - chown cloud:cloud /home/cloud/${var.service_name}
+
+    write_files:
+      - path: /home/cloud/${var.service_name}/docker-compose.yml
+        owner: cloud:cloud
+        permissions: '0644'
+        encoding: b64
+        content: ${var.compose_file_content}
+
+      - path: /home/cloud/${var.service_name}/.env
+        owner: cloud:cloud
+        permissions: '0600'
+        encoding: b64
+        content: ${var.env_file_content}
 
     runcmd:
-      - systemctl enable qemu-guest-agent 
+      - systemctl enable qemu-guest-agent
       - mkdir -p /etc/apt/keyrings
+      - apt-add-repository ppa:fish-shell/release-3
       - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
       - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
       - apt-get update
-      - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+      - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin fish
       - systemctl enable docker
       - systemctl start docker
-      - reboot                     
+      - chown -R cloud:cloud /home/cloud/${var.service_name}
+      - cd /home/cloud/${var.service_name}
+      - sudo -u cloud docker compose up -d
+      - reboot
     EOF
   }
 }
 
 resource "proxmox_virtual_environment_vm" "ubuntu_22_minimal_clone" {
-  name      = var.vm_name           # VM name
+  name      = var.vm_name   # VM name
-  node_name = var.node_name         # Proxmox node to deploy the VM
+  node_name = var.node_name # Proxmox node to deploy the VM
-  tags      = var.vm_tags           # Optional VM tags for categorization
+  tags      = var.vm_tags   # Optional VM tags for categorization
 
   agent {
-    enabled = true                  # Enable the QEMU guest agent
+    enabled = true # Enable the QEMU guest agent
   }
 
-  stop_on_destroy = true            # Ensure VM is stopped gracefully when destroyed
+  stop_on_destroy = true # Ensure VM is stopped gracefully when destroyed
 
 
   clone {
-    vm_id     = local.selected_instance.vmid    # ID of the source template
+    vm_id     = local.selected_instance.vmid        # ID of the source template
     node_name = local.selected_instance.crispy_name # Node of the source template
   }
 
-  bios    = var.vm_bios             # BIOS type (e.g., seabios or ovmf)
+  bios    = var.vm_bios    # BIOS type (e.g., seabios or ovmf)
-  machine = var.vm_machine          # Machine type (e.g., q35)
+  machine = var.vm_machine # Machine type (e.g., q35)
 
   cpu {
-    cores = var.vm_cpu              # Number of CPU cores
+    cores = var.vm_cpu # Number of CPU cores
-    type  = "host"                  # Use host CPU type for best compatibility/performance
+    type  = "host"     # Use host CPU type for best compatibility/performance
   }
 
   memory {
-    dedicated = var.vm_ram          # RAM in MB
+    dedicated = var.vm_ram # RAM in MB
   }
 
   disk {
     datastore_id = var.node_datastore # Datastore to hold the disk
-    interface    = "scsi0"             # Primary disk interface
+    interface    = "scsi0"            # Primary disk interface
-    size         = var.vm_size      
+    size         = var.vm_size
   }
 
 
   initialization {
     user_data_file_id = proxmox_virtual_environment_file.cloud_config.id # Link the cloud-init file
     datastore_id      = var.node_datastore
-    interface         = "scsi1"             # Separate interface for cloud-init
+    interface         = "scsi1" # Separate interface for cloud-init
     ip_config {
       ipv4 {
-        address = "dhcp"            # Get IP via DHCP
+        address = "dhcp" # Get IP via DHCP
       }
     }
   }
 
   network_device {
-    bridge  = var.bridge               # Use the default bridge 
+    bridge = var.bridge # Use the default bridge 
   }
 
-  lifecycle {
+  # lifecycle {
-    ignore_changes = [              # Ignore initialization section after first depoloyment for idempotency
+  #   ignore_changes = [ # Ignore initialization section after first depoloyment for idempotency
-      initialization
+  #     initialization
-    ]
+  #   ]
-  }
+  # }
-}
+}
-
-
-
-
-
-
-

terraform/modules/proxmox_ubuntu_cloudinit_clone/providers.tf

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

terraform/modules/proxmox_ubuntu_cloudinit_clone/variables.tf

@@ -1,8 +1,8 @@
 variable "pm_api_url" { default = "https://192.168.10.201:8006/api2/json" }
 variable "pm_api_token" { default = "terraform@pve!provider=760580c4-5c1f-462b-986a-dd244c6c95f2" }
 
-variable "storage"      { default = "hlst" }
+variable "storage" { default = "hlst" }
-variable "bridge"       { default = "vmbr0" }
+variable "bridge" { default = "vmbr0" }
 
 variable "os_type" {
   default = "alpine"
@@ -11,7 +11,7 @@ variable "os_type" {
 variable "instance_configs" {
   type = list(object({
     crispy_name = string
-    vmid           = string
+    vmid        = string
   }))
   default = [
     { crispy_name = "snap", vmid = "902" },
@@ -25,11 +25,11 @@ variable "clone_count" {
   default = 1
 }
 
-variable "vm_count"    { default = 1 }
+variable "vm_count" { default = 1 }
 variable "name_prefix" { default = "dev" }
-variable "vm_ram"      { default = 2048 }
+variable "vm_ram" { default = 2048 }
-variable "vm_cpu"       { default = 1 }
+variable "vm_cpu" { default = 1 }
-variable "vm_size"      { default = 10 }
+variable "vm_size" { default = 10 }
 variable "vm_bios" {
   description = "Type of BIOS used for the VM"
   type        = string
@@ -48,57 +48,57 @@ variable "vm_tags" {
   default     = ["test", "terraform"]
 }
 
-variable "ipconfig0"       { default = "ip=dhcp" }
+variable "ipconfig0" { default = "ip=dhcp" }
 
 variable "access_key" {
-  type        = string
+  type    = string
   default = "GK242d456c0692a9d4cc102206"
 }
 
 variable "secret_key" {
-  type        = string
+  type    = string
   default = "1d7e22b7a8892cb11b569017659aa511b37b53287c4d1699c310d9f8ac76df09"
 }
 
 variable "region" {
-  type        = string
+  type    = string
   default = "garage"
 }
 
 variable "endpoints_s3" {
   type        = string
   description = "S3 endpoint"
-  default = "http://192.168.10.109:3909"
+  default     = "http://192.168.10.109:3909"
 }
 
 variable "skip_credentials_validation" {
-  type        = bool
+  type    = bool
-  default     = true
+  default = true
 }
 
 variable "skip_requesting_account_id" {
-  type        = bool
+  type    = bool
-  default     = true
+  default = true
 }
 
 variable "skip_metadata_api_check" {
-  type        = bool
+  type    = bool
-  default     = true
+  default = true
 }
 
 variable "skip_region_validation" {
-  type        = bool
+  type    = bool
-  default     = true
+  default = true
 }
 
 variable "use_path_style" {
-  type        = bool
+  type    = bool
-  default     = true
+  default = true
 }
 
 variable "use_lockfile" {
-  type        = bool
+  type    = bool
-  default     = true
+  default = true
 }
 
 variable "vm_name" {
@@ -107,10 +107,16 @@ variable "vm_name" {
   default     = "Lab"
 }
 
+variable "service_name" {
+  description = "Folder name of the services"
+  type        = string
+  default     = "Lab"
+}
+
 variable "vm_user_sshkey" {
   description = "Admin user SSH key of the VM"
   type        = string
-  default     = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRlWaLBt/qmWY01Cd6jN/YxLnlT+6lg+evEdN/dIajirdTj1rCbAdlG3WYvo+4BpN17HK3/eGQpGUMbgI/8MVd8YPODcD34gaNX0w2v66BwHx+S6BZUpz5T2IoQT0JtSv/TtFICoff5gXdNRpfd4eWsmTioEqLA6oToJLE4dn3jvAzFi9y7fyLqvuoQMmPidYYJjGT30eiULtXNspoEP+GmuWmVEu+znzMWaKDWKdOsii4Cv1aWCRKSDDRzDBrZI2mP+Vm4HDQBdgDYRw4ehumMDtfaSjyJCnrk691bIM+wxzICuIEecg5kq5HcUPvo2mFyWPAEXb5xlXnuopYEBd7 Generated By NeoServer"
+  default     = ""
 }
 
 
@@ -137,4 +143,15 @@ variable "vm_user" {
   description = "Admin user of the VM"
   type        = string
   default     = "cloud"
+}
+
+variable "compose_file_content" {
+  description = "Rendered contents of docker-compose.yml to write to the VM"
+  type        = string
+}
+
+variable "env_file_content" {
+  description = "Rendered contents of .env to write to the VM"
+  type        = string
+  sensitive   = true
 }

terraform/modules/proxmox_ubuntu_cloudinit_template/main.tf

@@ -1,126 +0,0 @@
-locals {
-  selected_instance = one([
-    for cfg in var.instance_configs :
-    cfg if cfg.crispy_name == var.node_name
-  ])
-}
-
-resource "proxmox_virtual_environment_file" "cloud_config" {
-  content_type = "snippets"
-  datastore_id = "local"
-  node_name    = "pop"
-
-  source_raw {
-    file_name = "vm.cloud-config.yaml" # The name of the snippet file
-    data      = <<-EOF
-    #cloud-config
-    hostname: ${var.vm_name}
-
-    package_update: true
-    package_upgrade: true
-
-    system_info:
-      default_user:
-        groups: [ docker ]
-
-    users:
-      - default
-      - name: cloud
-        groups: 
-          - sudo
-          - docker
-        shell: /bin/bash
-        ssh-authorized-keys:
-          - "${var.vm_user_sshkey}" # Inject user's SSH key
-        sudo: ALL=(ALL) NOPASSWD:ALL
-
-    packages:
-      - qemu-guest-agent   
-      - apt-transport-https
-      - ca-certificates
-      - curl
-      - gnupg
-      - lsb-release
-      - unattended-upgrades 
-
-    runcmd:
-      - systemctl enable qemu-guest-agent 
-      - mkdir -p /etc/apt/keyrings
-      - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-      - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-      - apt-get update
-      - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
-      - systemctl enable docker
-      - systemctl start docker
-      - reboot                     
-    EOF
-  }
-}
-
-resource "proxmox_virtual_environment_vm" "ubuntu_22_minimal_template" {
-  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
-
-  agent {
-    enabled = true                  # Enable the QEMU guest agent
-  }
-
-  stop_on_destroy = true            # Ensure VM is stopped gracefully when destroyed
-
-  disk {
-    datastore_id = var.node_datastore # Datastore to hold the disk
-    interface    = "scsi0"             # Primary disk interface
-    size         = var.vm_size      
-    file_id  = "local:iso/ubuntu-22.04-minimal-cloudimg-amd64.img"
-  }
-
-  efi_disk {
-    datastore_id = var.node_datastore
-    type         = "4m"
-  }
-
-  bios    = var.vm_bios             # BIOS type (e.g., seabios or ovmf)
-  machine = var.vm_machine          # Machine type (e.g., q35)
-
-  cpu {
-    cores = var.vm_cpu              # Number of CPU cores
-    type  = "host"                  # Use host CPU type for best compatibility/performance
-  }
-
-  memory {
-    dedicated = var.vm_ram          # RAM in MB
-  }
-
-  initialization {
-    user_data_file_id = proxmox_virtual_environment_file.cloud_config.id # Link the cloud-init file
-    datastore_id      = var.node_datastore
-    interface         = "scsi1"             # Separate interface for cloud-init
-    ip_config {
-      ipv4 {
-        address = "dhcp"            # Get IP via DHCP
-      }
-    }
-  }
-
-  network_device {
-    bridge  = var.bridge               # Use the default bridge 
-  }
-
-  operating_system {
-    type = "l26"                    # Linux 2.6+ kernel
-  }
-
-  lifecycle {
-    ignore_changes = [              # Ignore initialization section after first depoloyment for idempotency
-      initialization
-    ]
-  }
-}
-
-
-
-
-
-
-

terraform/modules/proxmox_ubuntu_cloudinit_template/output.tf

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

terraform/modules/proxmox_ubuntu_cloudinit_template/providers.tf

@@ -1,13 +0,0 @@
-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_template/variables.tf

@@ -1,137 +0,0 @@
-variable "pm_api_url" { default = "https://192.168.10.201:8006/api2/json" }
-variable "pm_api_token" { default = "terraform@pve!provider=760580c4-5c1f-462b-986a-dd244c6c95f2" }
-
-variable "storage"      { default = "hlst" }
-variable "bridge"       { default = "vmbr0" }
-
-
-variable "instance_configs" {
-  type = list(object({
-    crispy_name = string
-    vmid           = string
-  }))
-  default = [
-    { crispy_name = "snap", vmid = "9002" },
-    { crispy_name = "crackle", vmid = "9000" },
-    { crispy_name = "pop", vmid = "9001" }
-  ]
-}
-
-variable "clone_count" {
-  type    = number
-  default = 1
-}
-
-variable "vm_count"    { default = 1 }
-variable "name_prefix" { default = "dev" }
-variable "vm_ram"      { default = 2048 }
-variable "vm_cpu"       { default = 1 }
-variable "vm_size"      { default = 10 }
-variable "vm_bios" {
-  description = "Type of BIOS used for the VM"
-  type        = string
-  default     = "ovmf"
-}
-
-variable "vm_machine" {
-  description = "Type of machine used for the VM"
-  type        = string
-  default     = "q35"
-}
-
-variable "vm_tags" {
-  description = "Tags for the VM"
-  type        = list(any)
-  default     = ["test", "terraform"]
-}
-
-variable "ipconfig0"       { default = "ip=dhcp" }
-
-variable "access_key" {
-  type        = string
-  default = "GK242d456c0692a9d4cc102206"
-}
-
-variable "secret_key" {
-  type        = string
-  default = "1d7e22b7a8892cb11b569017659aa511b37b53287c4d1699c310d9f8ac76df09"
-}
-
-variable "region" {
-  type        = string
-  default = "garage"
-}
-
-variable "endpoints_s3" {
-  type        = string
-  description = "S3 endpoint"
-  default = "http://192.168.10.109:3909"
-}
-
-variable "skip_credentials_validation" {
-  type        = bool
-  default     = true
-}
-
-variable "skip_requesting_account_id" {
-  type        = bool
-  default     = true
-}
-
-variable "skip_metadata_api_check" {
-  type        = bool
-  default     = true
-}
-
-variable "skip_region_validation" {
-  type        = bool
-  default     = true
-}
-
-variable "use_path_style" {
-  type        = bool
-  default     = true
-}
-
-variable "use_lockfile" {
-  type        = bool
-  default     = true
-}
-
-variable "vm_name" {
-  description = "Hostname of the VM"
-  type        = string
-  default     = "Lab"
-}
-
-variable "vm_user_sshkey" {
-  description = "Admin user SSH key of the VM"
-  type        = string
-  default     = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRlWaLBt/qmWY01Cd6jN/YxLnlT+6lg+evEdN/dIajirdTj1rCbAdlG3WYvo+4BpN17HK3/eGQpGUMbgI/8MVd8YPODcD34gaNX0w2v66BwHx+S6BZUpz5T2IoQT0JtSv/TtFICoff5gXdNRpfd4eWsmTioEqLA6oToJLE4dn3jvAzFi9y7fyLqvuoQMmPidYYJjGT30eiULtXNspoEP+GmuWmVEu+znzMWaKDWKdOsii4Cv1aWCRKSDDRzDBrZI2mP+Vm4HDQBdgDYRw4ehumMDtfaSjyJCnrk691bIM+wxzICuIEecg5kq5HcUPvo2mFyWPAEXb5xlXnuopYEBd7 Generated By NeoServer"
-}
-
-
-variable "node_name" {
-  description = "Proxmox host for the VM"
-  type        = string
-  default     = "pop"
-}
-
-variable "node_datastore" {
-  description = "Datastore used for VM storage"
-  type        = string
-  default     = "hlst"
-}
-
-variable "vm_template" {
-  description = "Template of the VM"
-  type        = string
-  default     = "ubuntu-cloud"
-}
-
-
-variable "vm_user" {
-  description = "Admin user of the VM"
-  type        = string
-  default     = "cloud"
-}

terraform/output.tf

@@ -1,7 +1,7 @@
 output "vm_ipv4_addresses" {
   description = "Map of instance key to VM IPv4 address"
   value = {
-    for k, m in module.vm-n8n : k => m.vm_ipv4_address
+    for k, m in module.proxmox_ubuntu_cloudinit_clone : k => m.vm_ipv4_address
   }
 }
 
@@ -30,12 +30,12 @@ output "vm_tag_data" {
   }
 }
 
-output "inventory_file" {
+# output "inventory_file" {
-  description = "Path to the generated Ansible inventory"
+#   description = "Path to the generated Ansible inventory"
-  value       = module.inventory.filename
+#   value       = module.inventory.filename
-}
+# }
 
-output "vm_data_file" {
+# output "vm_data_file" {
-  description = "Path to the generated VM data file"
+#   description = "Path to the generated VM data file"
-  value       = module.vm_data.filename
+#   value       = module.vm_data.filename
-}
+# }

terraform/providers.tf

@@ -3,11 +3,11 @@ terraform {
     proxmox = {
       source  = "bpg/proxmox"
       version = "0.106.0"
-     #url = https://registry.terraform.io/providers/bpg/proxmox/latest/docs/guides/clone-vm 
+      #url = https://registry.terraform.io/providers/bpg/proxmox/latest/docs/guides/clone-vm 
     }
     aws = {
       source  = "hashicorp/aws"
-      version = "6.38.0"
+      version = "6.64.0"
     }
   }
 }
@@ -15,7 +15,7 @@ terraform {
 provider "proxmox" {
   endpoint  = var.pm_api_url
   api_token = var.pm_api_token
-  insecure = true
+  insecure  = true
 
   # === FIX THIS ===
   ssh {
@@ -27,7 +27,7 @@ provider "proxmox" {
 
 provider "aws" {
   region     = "garage"
-  access_key = "GK242d456c0692a9d4cc102206" 
+  access_key = "GK242d456c0692a9d4cc102206"
   secret_key = "1d7e22b7a8892cb11b569017659aa511b37b53287c4d1699c310d9f8ac76df09"
-#  shared_credentials_files = ["$HOME/.aws/credentials"]
+  #  shared_credentials_files = ["$HOME/.aws/credentials"]
 }

terraform/variables.tf

@@ -18,8 +18,8 @@ variable "instance" {
     vm_size      = optional(string)
     vm_tags      = optional(list(string))
   })
-  default   = null
+  default     = null
-  nullable  = true
+  nullable    = true
   description = "Used only when instance_mode = single."
 }
 
@@ -57,8 +57,8 @@ variable "vm_defaults" {
     vm_user_sshkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRlWaLBt/qmWY01Cd6jN/YxLnlT+6lg+evEdN/dIajirdTj1rCbAdlG3WYvo+4BpN17HK3/eGQpGUMbgI/8MVd8YPODcD34gaNX0w2v66BwHx+S6BZUpz5T2IoQT0JtSv/TtFICoff5gXdNRpfd4eWsmTioEqLA6oToJLE4dn3jvAzFi9y7fyLqvuoQMmPidYYJjGT30eiULtXNspoEP+GmuWmVEu+znzMWaKDWKdOsii4Cv1aWCRKSDDRzDBrZI2mP+Vm4HDQBdgDYRw4ehumMDtfaSjyJCnrk691bIM+wxzICuIEecg5kq5HcUPvo2mFyWPAEXb5xlXnuopYEBd7 Generated By NeoServer"
     bridge         = "vmbr0"
     vm_cpu         = 2
-    vm_ram         = 4096
+    vm_ram         = 2048
-    vm_size        = 20
+    vm_size        = 12
   }
 }