From fe2afcba4984473c8be13d0b000ea4fd1ce7c020 Mon Sep 17 00:00:00 2001
From: tolerryan <105945216+tolerryan@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:44:45 -0600
Subject: [PATCH] Grail migration to new cluster

---
 grail.tf                                    | 86 +++++++++------------
 roles/ind/archivewarrior/archivewarrior.yml | 16 ++--
 roles/ind/grail/grail-install.yml           |  5 --
 3 files changed, 46 insertions(+), 61 deletions(-)

diff --git a/grail.tf b/grail.tf
index 96df53a..59a4771 100644
--- a/grail.tf
+++ b/grail.tf
@@ -1,59 +1,49 @@
 resource "proxmox_vm_qemu" "grail" {
-    target_node = "pve"
-    name = "grail-tf"
-    clone = "Debian12-8Template"                
-    agent = 0
-    cores = 10
-    memory = 4096
-    #storage = "Junk2"
-    bootdisk = "scsi0"
-    scsihw = "virtio-scsi-single"
+    target_node = "ryuk"
+    hostname = "grail-tf"
     vmid = 218
-    #start = true
+    ostemplate = "cephfs:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst"
+    password = "terraform"
+    unprivileged = false
+    cores = 6
+    memory = 4096
+    swap = 1024
+    start = true
     tags = "terraform"
-    define_connection_info = true
-    os_type = "ubuntu"
-    os_network_config = "ubuntu"
     nameserver = "192.168.0.24"
-    ipconfig0 = "ip=192.168.0.57/24,gw=192.168.0.1"
-    #ssh_public_keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINFw70PrMsilcsqCrwW1I6PAt3anQbhmVg+t/HUfomug ryan@mxDesktop"
+    ssh_public_keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINFw70PrMsilcsqCrwW1I6PAt3anQbhmVg+t/HUfomug ryan@mxDesktop"
 
-    disks{
-      scsi{
-        scsi0{
-          disk{
-            storage = "nvme"
-            asyncio = "threads"
-            discard = true
-            iothread = true
-            size = "42G"
-            emulatessd = true
-          }
-        }
-      }
-      ide {
-       ide2 {
-         cloudinit {
-           storage = "Ceph" 
-                  }
-            }
-          }
-    }  
+    features {
+        nesting = true
+    }
 
-    #mountpoint{
-    #    key = "0"
-    #    slot = 0
-    #    storage = "Ceph"
-    #    mp      = "/data"
-    #    size    = "400G"
-    #}
+    rootfs {
+        storage = "local-lvm"
+        size = "42G"
+    }
+
+    mountpoint{
+        key = "1"
+        slot = 1
+        storage = "Ceph"
+        mp      = "/data"
+        size    = "10T"
+    }
+
+    mountpoint{
+        key = "2"
+        slot = 2
+        storage = "Ceph"
+        mp      = "/downloads"
+        size    = "5T"
+    }
 
     network {
-      # Name is set automatically based on position in file 
-      # name = "eth0"
-      model = "virtio"
-      bridge = "vmbr0"
-      firewall = false
+        name = "eth0"
+        bridge = "vmbr0"
+        ip = "192.168.0.57/24"
+        gw = "192.168.0.1"
+
     }
 
     provisioner "local-exec" {
diff --git a/roles/ind/archivewarrior/archivewarrior.yml b/roles/ind/archivewarrior/archivewarrior.yml
index b36e885..1817afd 100644
--- a/roles/ind/archivewarrior/archivewarrior.yml
+++ b/roles/ind/archivewarrior/archivewarrior.yml
@@ -18,17 +18,17 @@
           restart: unless-stopped
 
         archiveTeamWarrior1:
-          image: atdr.meo.ws/archiveteam/cohost-grab
-          container_name: archiveTeamWarrior-specific
-          hostname: archiveTeamWarriorspec
+          image: atdr.meo.ws/archiveteam/warrior-dockerfile
+          container_name: archiveTeamWarrior1
+          hostname: archiveTeamWarrior1
           dns:
             - 9.9.9.9
             - 8.8.8.8
           environment:
-            - SELECTED_PROJECT=cohost
-            - SHARED_RSYNC_THREADS=20
+            - SELECTED_PROJECT=auto
+            - SHARED_RSYNC_THREADS=10
             - DOWNLOADER=jester45
-            - CONCURRENT_ITEMS=20
+            - CONCURRENT_ITEMS=6
           ports:
             - "8001:8001"
           labels:
@@ -44,7 +44,7 @@
             - 8.8.8.8
           environment:
             - SELECTED_PROJECT=auto
-            - SHARED_RSYNC_THREADS=
+            - SHARED_RSYNC_THREADS=10
             - DOWNLOADER=jester45
             - CONCURRENT_ITEMS=6
           ports:
@@ -62,7 +62,7 @@
             - 8.8.8.8
           environment:
             - SELECTED_PROJECT=auto
-            - SHARED_RSYNC_THREADS=20
+            - SHARED_RSYNC_THREADS=10
             - DOWNLOADER=jester45
             - CONCURRENT_ITEMS=6
           ports:
diff --git a/roles/ind/grail/grail-install.yml b/roles/ind/grail/grail-install.yml
index 9d61768..ab0243a 100644
--- a/roles/ind/grail/grail-install.yml
+++ b/roles/ind/grail/grail-install.yml
@@ -88,11 +88,6 @@
         owner: grail
         group: docker
         mode: u=rw,g=r,o=r
-    
-    #- name: Start services
-    #  community.docker.docker_compose_v2:
-    #    project_src: /home/docker/
-    #  register: output
 
     - name: Check if docker config directory exists
       stat: