diff --git a/.gitea/workflows/terraform-apply.yml b/.gitea/workflows/terraform-apply.yml index c09caa6..0bfc563 100644 --- a/.gitea/workflows/terraform-apply.yml +++ b/.gitea/workflows/terraform-apply.yml @@ -18,8 +18,8 @@ jobs: env: TF_VAR_SSH_KEY_PUBLIC: ${{ secrets.SSH_KEY_PUBLIC }} TF_VAR_TS_AUTHKEY: ${{ secrets.TS_AUTHKEY }} - TF_VAR_pm_api_token_id: ${{ secrets.PM_API_TOKEN_ID }} - TF_VAR_pm_api_token_secret: ${{ secrets.PM_API_TOKEN_SECRET }} + PM_API_TOKEN_ID: ${{ secrets.PM_API_TOKEN_ID }} + PM_API_TOKEN_SECRET: ${{ secrets.PM_API_TOKEN_SECRET }} steps: - name: Checkout repository diff --git a/.gitea/workflows/terraform-plan.yml b/.gitea/workflows/terraform-plan.yml index 579437e..27266d9 100644 --- a/.gitea/workflows/terraform-plan.yml +++ b/.gitea/workflows/terraform-plan.yml @@ -19,8 +19,8 @@ jobs: env: TF_VAR_SSH_KEY_PUBLIC: ${{ secrets.SSH_KEY_PUBLIC }} TF_VAR_TS_AUTHKEY: ${{ secrets.TS_AUTHKEY }} - TF_VAR_pm_api_token_id: ${{ secrets.PM_API_TOKEN_ID }} - TF_VAR_pm_api_token_secret: ${{ secrets.PM_API_TOKEN_SECRET }} + PM_API_TOKEN_ID: ${{ secrets.PM_API_TOKEN_ID }} + PM_API_TOKEN_SECRET: ${{ secrets.PM_API_TOKEN_SECRET }} steps: - name: Checkout repository diff --git a/terraform/main.tf b/terraform/main.tf index fc6134d..7bd3884 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -8,10 +8,8 @@ terraform { } provider "proxmox" { - pm_api_url = var.pm_api_url - pm_api_token_id = var.pm_api_token_id - pm_api_token_secret = var.pm_api_token_secret - pm_tls_insecure = true + pm_api_url = var.pm_api_url + pm_tls_insecure = true } resource "proxmox_vm_qemu" "alpacas" { diff --git a/terraform/terraform.tfvars b/terraform/terraform.tfvars index c5223ab..f176df7 100644 --- a/terraform/terraform.tfvars +++ b/terraform/terraform.tfvars @@ -1,10 +1,9 @@ -target_node = "flex" -clone_template = "ubuntu-cloudinit" -cores = 1 -memory = 1024 -disk_size = "15G" -sockets = 1 -bridge = "vmbr0" -storage = "Flash" -pm_api_url = "https://100.105.0.115:8006/api2/json" -pm_api_token_id = "terraform-prov@pve!mytoken" +target_node = "flex" +clone_template = "ubuntu-cloudinit" +cores = 1 +memory = 1024 +disk_size = "15G" +sockets = 1 +bridge = "vmbr0" +storage = "Flash" +pm_api_url = "https://100.105.0.115:8006/api2/json" diff --git a/terraform/variables.tf b/terraform/variables.tf index c4f1b2c..2d44f83 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -1,14 +1,3 @@ -variable "pm_api_token_id" { - type = string - description = "Proxmox API token ID (format: user@realm!tokenid)" -} - -variable "pm_api_token_secret" { - type = string - sensitive = true - description = "Proxmox API token secret" -} - variable "target_node" { type = string }