diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index eb0151c..b7587d4 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -17,6 +17,15 @@ on: jobs: terraform-ansible-deploy: runs-on: frente + env: + PROXMOX_VE_API_TOKEN: https://api.staging.example.com + PROXMOX_VE_ENDPOINT: true + GITEA_BASE_URL: https://api.staging.example.com + GITEA_TOKEN: true + AWS_ACCESS_KEY_ID: https://api.staging.example.com + AWS_SECRET_ACCESS_KEY: true + AWS_REGION: garage + steps: - uses: actions/checkout@v4 diff --git a/terraform/modules/proxmox_ubuntu_cloudinit_clone/locals.tf b/terraform/modules/proxmox_ubuntu_cloudinit_clone/locals.tf new file mode 100644 index 0000000..e6677a2 --- /dev/null +++ b/terraform/modules/proxmox_ubuntu_cloudinit_clone/locals.tf @@ -0,0 +1,4 @@ +selected_instance = one([ + for cfg in var.instance_configs : + cfg if cfg.crispy_name == var.node_name +]) diff --git a/terraform/modules/proxmox_ubuntu_cloudinit_clone/main.tf b/terraform/modules/proxmox_ubuntu_cloudinit_clone/main.tf index 75ce03f..02f065d 100644 --- a/terraform/modules/proxmox_ubuntu_cloudinit_clone/main.tf +++ b/terraform/modules/proxmox_ubuntu_cloudinit_clone/main.tf @@ -1,10 +1,3 @@ -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" @@ -31,7 +24,7 @@ resource "proxmox_virtual_environment_file" "cloud_config" { - docker shell: /bin/bash ssh-authorized-keys: - - "${var.vm_user_sshkey}" # Inject user's SSH key + - "${var.vm_user_sshkey}" # +++ Needs to be put into a variable injected by git actions secrets sudo: ALL=(ALL) NOPASSWD:ALL packages: @@ -42,6 +35,7 @@ resource "proxmox_virtual_environment_file" "cloud_config" { - gnupg - lsb-release - unattended-upgrades + - rsync runcmd: - systemctl enable qemu-guest-agent diff --git a/terraform/modules/proxmox_ubuntu_cloudinit_clone/variables.tf b/terraform/modules/proxmox_ubuntu_cloudinit_clone/variables.tf index f6af510..9dc2c4a 100644 --- a/terraform/modules/proxmox_ubuntu_cloudinit_clone/variables.tf +++ b/terraform/modules/proxmox_ubuntu_cloudinit_clone/variables.tf @@ -14,8 +14,8 @@ variable "instance_configs" { vmid = string })) default = [ - { crispy_name = "snap", vmid = "9002" }, - { crispy_name = "crackle", vmid = "9000" }, + { crispy_name = "snap", vmid = "902" }, + { crispy_name = "crackle", vmid = "901" }, { crispy_name = "pop", vmid = "900" } ] }