From 7d7e43b9d321deab42e2fd55cffac78173b4b5f1 Mon Sep 17 00:00:00 2001 From: coolcuber Date: Tue, 6 May 2025 15:40:35 -0400 Subject: [PATCH 1/2] Added scaryterry to web --- hosts.cfg | 2 +- roles/deploy-vms/tasks/deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts.cfg b/hosts.cfg index 8ce939a..2c8feb0 100644 --- a/hosts.cfg +++ b/hosts.cfg @@ -63,6 +63,7 @@ acidburn2.vtluug.org interface=ens3 global_v4=128.173.89.245 [web] sczi.vtluug.org interface=ens3 global_v4=128.173.88.78 +scaryterry.vtluug.org interface=ens3 global_v4=128.173.89.163 # General VMs [mirror] @@ -76,4 +77,3 @@ wargame.vtluug.org [unenrolled] spectre.vtluug.org -scaryterry.vtluug.org diff --git a/roles/deploy-vms/tasks/deploy.yml b/roles/deploy-vms/tasks/deploy.yml index 4eac794..a85c081 100644 --- a/roles/deploy-vms/tasks/deploy.yml +++ b/roles/deploy-vms/tasks/deploy.yml @@ -36,6 +36,7 @@ --size {{ item.size }} \ --format qcow2 \ --output /nfs/cistern/libvirt/images/spectre/{{ item.hostname }}.qcow2 \ + --root-password password:pleasechangeme \ --firstboot-command 'dpkg-reconfigure openssh-server; sed -i "s/#Port 22/Port 22\nPort 2222/" /etc/ssh/sshd_config; sed -i "s/ens2/ens3/" /etc/netplan/01-netcfg.yaml; yum install -y python; localectl set-locale LANG=en_US.UTF-8; apt install --assume-yes python; reboot' \ && \ virt-install \ @@ -46,7 +47,6 @@ --network bridge=br0,mac={{ item.mac }} \ --disk path=/nfs/cistern/libvirt/images/spectre/{{ item.hostname }}.qcow2,format=qcow2 \ --os-variant {{ item.variant }} \ - --root-password password:pleasechangeme --autostart \ --graphics spice \ --noautoconsole From 50335034e34968601537b72206a3da98a015df8f Mon Sep 17 00:00:00 2001 From: Enzo Isotton Date: Mon, 15 Sep 2025 11:15:58 -0400 Subject: [PATCH 2/2] partial updated host groups + vm versions --- hosts.cfg | 71 ++++++++++++++++-------------- roles/deploy-vms/defaults/main.yml | 8 ++-- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/hosts.cfg b/hosts.cfg index 2c8feb0..382a4e9 100644 --- a/hosts.cfg +++ b/hosts.cfg @@ -1,51 +1,59 @@ [all:vars] ansible_port=2222 -# Groups -[baremetal:children] -libvirt -nfs +#Groups -[docker:children] -libvirt -web +#OS +[ubuntu] +meltdown.vtluug.org interface=eno1 global_v4=128.173.89.246 +spectre.vtluug.org +gibson.vtluug.org interface=enp-1s25 global_v4=128.173.90.53 +prospit.vtluug.org +cyberdelia.vtluug.org +dirtycow.vtluug.org interface=eno1 global_v4=128.173.89.244 -[vms:children] -freeipa -#shell -web -mirror -tahoe-lafs -wargame +[debian] +scaryterry.vtluug.org interface=ens3 global_v4=128.173.89.163 + +[alma] +chimera.vtluug.org +sphinx.vtluug.org + +#Type +[baremetal] +meltdown.vtluug.org interface=eno1 global_v4=128.173.89.246 +spectre.vtluug.org +cyberdelia.vtluug.org +dirtycow.vtluug.org interface=eno1 global_v4=128.173.89.244 +gibson.vtluug.org interface=enp-1s25 global_v4=128.173.90.53 +prospit.vtluug.org # New VMs don't have keys [vms:vars] ansible_ssh_common_args='-o StrictHostKeyChecking=no' -[ubuntu:children] -libvirt -nfs -#shell -web -mirror -tahoe-lafs -wargame +[vms] +acidburn.vtluug.org interface=ens3 global_v4=128.173.89.245 +scaryterry.vtluug.org interface=ens3 global_v4=128.173.89.163 +chimera.vtluug.org +sphinx.vtluug.org +sczi.vtluug.org interface=ens3 global_v4=128.173.88.78 -[centos:children] -freeipa +#function + +[docker:children] +web [docker] -meltdown.vtluug.org -spectre.vtluug.org -sczi.vtluug.org -gibson.vtluug.org +meltdown.vtluug.org interface=eno1 global_v4=128.173.89.246 +gibson.vtluug.org interface=enp-1s25 global_v4=128.173.90.53 prospit.vtluug.org # Bare-metal [libvirt] meltdown.vtluug.org interface=eno1 global_v4=128.173.89.246 spectre.vtluug.org -gibson.vtluug.org interface=enp0s25 global_v4=128.173.90.53 +gibson.vtluug.org interface=enp-1s25 global_v4=128.173.90.53 prospit.vtluug.org [nfs] @@ -59,7 +67,7 @@ chimera.vtluug.org sphinx.vtluug.org [shell] -acidburn2.vtluug.org interface=ens3 global_v4=128.173.89.245 +acidburn.vtluug.org interface=ens3 global_v4=128.173.89.245 [web] sczi.vtluug.org interface=ens3 global_v4=128.173.88.78 @@ -74,6 +82,3 @@ crashoverride.vtluug.org [wargame] wargame.vtluug.org - -[unenrolled] -spectre.vtluug.org diff --git a/roles/deploy-vms/defaults/main.yml b/roles/deploy-vms/defaults/main.yml index d7fe808..ca809d9 100644 --- a/roles/deploy-vms/defaults/main.yml +++ b/roles/deploy-vms/defaults/main.yml @@ -1,12 +1,12 @@ --- new_vms_meltdown: - - { target: meltdown, os: ubuntu-18.04, hostname: sczi, cpus: 16, ram: 16384, size: 50G, mac: "02:00:0a:62:00:0b", admins: sudo, variant: ubuntu17.10 } # Web - - { target: meltdown, os: alma-8.5, hostname: chimera, cpus: 2, ram: 2048, size: 10G, mac: "02:00:0a:62:00:0a", admins: wheel, variant: rhel7.5 } # FreeIPA + - { target: meltdown, os: ubuntu-24.04, hostname: sczi, cpus: 16, ram: 16384, size: 50G, mac: "02:00:0a:62:00:0b", admins: sudo, variant: ubuntu17.10 } # Web + - { target: meltdown, os: alma-8.10, hostname: chimera, cpus: 2, ram: 2048, size: 10G, mac: "02:00:0a:62:00:0a", admins: wheel, variant: rhel7.5 } # FreeIPA - { target: meltdown, os: alma-8.5, hostname: sphinx, cpus: 2, ram: 2048, size: 10G, mac: "02:00:0a:62:00:0d", admins: wheel, variant: rhel7.5 } # FreeIPA replica, the stable osinfo-db package doesn't have any more fitting variant - - { target: meltdown, os: ubuntu-18.04, hostname: acidburn, cpus: 2, ram: 2048, size: 10G, mac: "02:00:0a:62:00:0c", admins: sudo, variant: ubuntu17.10 } # Shell + - { target: meltdown, os: ubuntu-24.04, hostname: acidburn, cpus: 2, ram: 2048, size: 10G, mac: "02:00:0a:62:00:0c", admins: sudo, variant: ubuntu17.10 } # Shell - { target: meltdown, os: debian-12, hostname: nikonwormhole, cpus: 2, ram: 2048, size: 10G, mac: "02:00:0a:62:00:0e", admins: sudo, variant: ubuntu17.10 } # dns-adguard # Add more service VMs here later new_vms_spectre: # Add user VMs here later - - { target: spectre, os: ubuntu-18.04, hostname: scaryterry, cpus: 4, ram: 16384, size: 50G, mac: "02:00:0a:62:00:0f", admins: sudo, variant: ubuntu17.10 } # Web + - { target: spectre, os: debian-13, hostname: scaryterry, cpus: 4, ram: 16384, size: 32G, mac: "02:00:0a:62:00:0f", admins: sudo, variant: ubuntu17.10 } # Web