From 2b6d7434a27a78002b31bf2312b2f5073fc62e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20L=C3=A1szl=C3=B3?= <rlacko99@gmail.com>
Date: Wed, 28 Jul 2021 20:46:23 +0200
Subject: [PATCH] Fix cloudinit docs, update runner and router inventory
---
ansible/router/inventory.yaml | 3 +--
ansible/runner/install.yaml | 14 --------------
ansible/runner/inventory.yaml | 3 +--
terraform/README.md | 4 ++--
terraform/runner-tmp.tf | 34 ----------------------------------
5 files changed, 4 insertions(+), 54 deletions(-)
delete mode 100644 terraform/runner-tmp.tf
diff --git a/ansible/router/inventory.yaml b/ansible/router/inventory.yaml
index 80257bb..4767157 100644
--- a/ansible/router/inventory.yaml
+++ b/ansible/router/inventory.yaml
@@ -1,5 +1,4 @@
all:
hosts:
# Use OpenSSH config to make it confortable
- 152.66.211.122:
- ansible_port: 10022
+ router.maze:
diff --git a/ansible/runner/install.yaml b/ansible/runner/install.yaml
index 7fc3948..0a04323 100644
--- a/ansible/runner/install.yaml
+++ b/ansible/runner/install.yaml
@@ -11,17 +11,3 @@
vars_files:
- vars/vars.yaml
- vars:
- users:
- - name: rlacko
- sudo: yes
- passwordless_sudo: yes
- keys_url: https://git.sch.bme.hu/rlacko.keys
- ssh:
- port: 10022
- permitRootLogin: 'no'
- pubkeyAuthentication: 'yes'
- passwordAuthentication: 'no'
- allow:
- users: 'rlacko'
-
diff --git a/ansible/runner/inventory.yaml b/ansible/runner/inventory.yaml
index a7a9cc6..8f99735 100644
--- a/ansible/runner/inventory.yaml
+++ b/ansible/runner/inventory.yaml
@@ -1,4 +1,3 @@
all:
hosts:
- 152.66.211.9:
- ansible_port: 10022
+ runner.internal.maze:
diff --git a/terraform/README.md b/terraform/README.md
index 69a6519..3c44df0 100644
--- a/terraform/README.md
+++ b/terraform/README.md
@@ -19,14 +19,14 @@ export CLOUD_IMG_FILE="focal-server-cloudimg-amd64.img"
qm create $VM_ID -name $VM_NAME -memory 1024 -net0 virtio,bridge=vmbr0 -cores 1 -sockets 1
qm importdisk $VM_ID $CLOUD_IMG_FILE $STORAGE_POOL
-qm set $VM_ID -scsihw virtio-scsi-pci -virtio0 ssd:vm-$VM_ID-disk-0
+qm set $VM_ID -scsihw virtio-scsi-pci -virtio0 $STORAGE_POOL:vm-$VM_ID-disk-0
qm set $VM_ID -serial0 socket
qm set $VM_ID -boot c -bootdisk virtio0
qm set $VM_ID -agent 1
qm set $VM_ID -agent 1
qm set $VM_ID -hotplug network,usb
qm set $VM_ID -vga qxl
-qm set $VM_ID -ide2 ssd:cloudinit
+qm set $VM_ID -ide2 $STORAGE_POOL:cloudinit
qm resize $VM_ID virtio0 +4G
qm template $VM_ID
```
diff --git a/terraform/runner-tmp.tf b/terraform/runner-tmp.tf
deleted file mode 100644
index aa811d5..0000000
--- a/terraform/runner-tmp.tf
+++ /dev/null
@@ -1,34 +0,0 @@
-resource "proxmox_vm_qemu" "runner-tmp" {
- name = "tmp-gv-gitlab-runner"
- desc = "Temp Globalvet Gitlab Runner"
- vmid = 6100
-
- target_node = "maze"
-
- clone = "ubuntu-21.04-cloudimg"
-
- agent = 1
-
- cores = 8
- sockets = 1
- vcpus = 0
- memory = 26000
-
- disk {
- size = "40G"
- type = "virtio"
- storage = "ssd"
- }
-
- network {
- model = "virtio"
- bridge = "vmbr211"
- macaddr = "42:63:41:D8:F7:DE"
- }
-
- ipconfig0 = "ip=152.66.211.9/24,gw=152.66.211.254"
-
- sshkeys = <<EOF
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXuXr/Mz1ENkvZ+Ntc9dF1r8VK62XaZtsMaV7N+CMZ8 rlacko@personal
- EOF
-}
\ No newline at end of file
--
GitLab