From dd28e9074a28b6b70b81ab44b5b0fae26792765c Mon Sep 17 00:00:00 2001 From: Rafael Laszlo <rlacko99@gmail.com> Date: Tue, 3 Aug 2021 10:46:27 +0200 Subject: [PATCH] Update runner disk space and reformat tf files --- terraform/main.tf | 4 ++-- terraform/router.tf | 4 ++-- terraform/runner.tf | 47 +++++++++++++++++++++++---------------------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/terraform/main.tf b/terraform/main.tf index 8dd01af..bca7578 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -1,7 +1,7 @@ terraform { required_providers { proxmox = { - source = "Telmate/proxmox" + source = "Telmate/proxmox" version = "2.7.1" } } @@ -10,7 +10,7 @@ terraform { } provider "proxmox" { - pm_api_url = "https://10.152.211.122:8006/api2/json" + pm_api_url = "https://10.152.211.122:8006/api2/json" pm_tls_insecure = true } diff --git a/terraform/router.tf b/terraform/router.tf index d3b3da6..b6e5bd6 100644 --- a/terraform/router.tf +++ b/terraform/router.tf @@ -15,7 +15,7 @@ resource "proxmox_lxc" "router" { startup = "order=1" unprivileged = true - ssh_public_keys = local.ssh_keys + ssh_public_keys = local.ssh_keys rootfs { storage = "ssd" @@ -34,7 +34,7 @@ resource "proxmox_lxc" "router" { name = "eth1" bridge = "vmbr0" ip = "192.168.99.254/22" - ip6 = "fd00::9:254/96" + ip6 = "fd00::9:254/96" hwaddr = "7A:9C:F7:A8:5D:1C" } } diff --git a/terraform/runner.tf b/terraform/runner.tf index ed42a73..5283d09 100644 --- a/terraform/runner.tf +++ b/terraform/runner.tf @@ -1,35 +1,36 @@ resource "proxmox_vm_qemu" "gitlab-runner" { - name = "gitlab-runner" - desc = "Docker Gitlab Runner" - vmid = 6050 + name = "gitlab-runner" + desc = "Docker Gitlab Runner" + vmid = 6050 - target_node = "maze" + target_node = "maze" - clone = "ubuntu-cloudinit-21.04" + clone = "ubuntu-cloudinit-21.04" - agent = 1 + agent = 1 - cores = 6 - sockets = 1 - vcpus = 0 - memory = 18000 + cores = 6 + sockets = 1 + vcpus = 0 + memory = 18000 - os_type = "cloud-init" + os_type = "cloud-init" - disk { - size = "20G" - type = "virtio" - storage = "ssd" - } + disk { + size = "35G" + type = "virtio" + storage = "ssd" + } - network { - model = "virtio" - bridge = "vmbr0" - } + network { + model = "virtio" + bridge = "vmbr0" + macaddr = "7A:19:32:CF:F5:EB" + } - nameserver = "8.8.8.8" - ipconfig0 = "ip=192.168.96.50/22,gw=192.168.99.254" - sshkeys = <<-EOT + nameserver = "8.8.8.8" + ipconfig0 = "ip=192.168.96.50/22,gw=192.168.99.254" + sshkeys = <<-EOT ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXuXr/Mz1ENkvZ+Ntc9dF1r8VK62XaZtsMaV7N+CMZ8 rlacko@personal EOT } -- GitLab