From 52847da1fc15f2f2899cd4a27125fc0cffc4bbe2 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 29 Jan 2022 11:24:49 +0200 Subject: move vmadm specs based on host they're for --- vmadm/apt-dev.yaml | 4 ---- vmadm/clab-dev.yaml | 4 ---- vmadm/debian-ansible-dev.yaml | 4 ---- vmadm/debian-mirror.yaml | 3 --- vmadm/ewww-dev.yaml | 4 ---- vmadm/ewww-test.yaml | 2 -- vmadm/exolobe1/icktool.yaml | 6 ++++++ vmadm/exolobe1/web.yaml | 2 ++ vmadm/exolobe2/debian-mirror.yaml | 3 +++ vmadm/exolobe2/mirror-git.yaml | 5 +++++ vmadm/exolobe5.sh | 29 ----------------------------- vmadm/exolobe5/apt-dev.yaml | 4 ++++ vmadm/exolobe5/clab-dev.yaml | 4 ++++ vmadm/exolobe5/debian-ansible-dev.yaml | 4 ++++ vmadm/exolobe5/ewww-dev.yaml | 4 ++++ vmadm/exolobe5/ewww-test.yaml | 2 ++ vmadm/exolobe5/ick2-dev.yaml | 5 +++++ vmadm/exolobe5/obnam-bench.yaml | 4 ++++ vmadm/exolobe5/obnam-dev.yaml | 4 ++++ vmadm/exolobe5/openpgp-ca-dev.yaml | 4 ++++ vmadm/exolobe5/python-mess.yaml | 4 ++++ vmadm/exolobe5/roadmap-dev.yaml | 4 ++++ vmadm/exolobe5/rust-dev.yaml | 4 ++++ vmadm/exolobe5/sequoia-dev.yaml | 4 ++++ vmadm/exolobe5/sequoia-web.yaml | 4 ++++ vmadm/exolobe5/sshca-dev.yaml | 4 ++++ vmadm/exolobe5/subplot-dev.yaml | 4 ++++ vmadm/exolobe5/vmadm-dev.yaml | 4 ++++ vmadm/exolobe5/vmdb2-dev.yaml | 4 ++++ vmadm/exolobe5/workera.yaml | 6 ++++++ vmadm/ick2-dev.yaml | 5 ----- vmadm/icktool.yaml | 6 ------ vmadm/mirror-git.yaml | 5 ----- vmadm/obnam-bench.yaml | 4 ---- vmadm/obnam-dev.yaml | 4 ---- vmadm/openpgp-ca-dev.yaml | 4 ---- vmadm/python-mess.yaml | 4 ---- vmadm/roadmap-dev.yaml | 4 ---- vmadm/rust-dev.yaml | 4 ---- vmadm/sequoia-dev.yaml | 4 ---- vmadm/sequoia-web.yaml | 4 ---- vmadm/sshca-dev.yaml | 4 ---- vmadm/subplot-dev.yaml | 4 ---- vmadm/vmadm-dev.yaml | 4 ---- vmadm/vmdb2-dev.yaml | 4 ---- vmadm/web.yaml | 2 -- vmadm/workera.yaml | 6 ------ 47 files changed, 93 insertions(+), 122 deletions(-) delete mode 100644 vmadm/apt-dev.yaml delete mode 100644 vmadm/clab-dev.yaml delete mode 100644 vmadm/debian-ansible-dev.yaml delete mode 100644 vmadm/debian-mirror.yaml delete mode 100644 vmadm/ewww-dev.yaml delete mode 100644 vmadm/ewww-test.yaml create mode 100644 vmadm/exolobe1/icktool.yaml create mode 100644 vmadm/exolobe1/web.yaml create mode 100644 vmadm/exolobe2/debian-mirror.yaml create mode 100644 vmadm/exolobe2/mirror-git.yaml delete mode 100755 vmadm/exolobe5.sh create mode 100644 vmadm/exolobe5/apt-dev.yaml create mode 100644 vmadm/exolobe5/clab-dev.yaml create mode 100644 vmadm/exolobe5/debian-ansible-dev.yaml create mode 100644 vmadm/exolobe5/ewww-dev.yaml create mode 100644 vmadm/exolobe5/ewww-test.yaml create mode 100644 vmadm/exolobe5/ick2-dev.yaml create mode 100644 vmadm/exolobe5/obnam-bench.yaml create mode 100644 vmadm/exolobe5/obnam-dev.yaml create mode 100644 vmadm/exolobe5/openpgp-ca-dev.yaml create mode 100644 vmadm/exolobe5/python-mess.yaml create mode 100644 vmadm/exolobe5/roadmap-dev.yaml create mode 100644 vmadm/exolobe5/rust-dev.yaml create mode 100644 vmadm/exolobe5/sequoia-dev.yaml create mode 100644 vmadm/exolobe5/sequoia-web.yaml create mode 100644 vmadm/exolobe5/sshca-dev.yaml create mode 100644 vmadm/exolobe5/subplot-dev.yaml create mode 100644 vmadm/exolobe5/vmadm-dev.yaml create mode 100644 vmadm/exolobe5/vmdb2-dev.yaml create mode 100644 vmadm/exolobe5/workera.yaml delete mode 100644 vmadm/ick2-dev.yaml delete mode 100644 vmadm/icktool.yaml delete mode 100644 vmadm/mirror-git.yaml delete mode 100644 vmadm/obnam-bench.yaml delete mode 100644 vmadm/obnam-dev.yaml delete mode 100644 vmadm/openpgp-ca-dev.yaml delete mode 100644 vmadm/python-mess.yaml delete mode 100644 vmadm/roadmap-dev.yaml delete mode 100644 vmadm/rust-dev.yaml delete mode 100644 vmadm/sequoia-dev.yaml delete mode 100644 vmadm/sequoia-web.yaml delete mode 100644 vmadm/sshca-dev.yaml delete mode 100644 vmadm/subplot-dev.yaml delete mode 100644 vmadm/vmadm-dev.yaml delete mode 100644 vmadm/vmdb2-dev.yaml delete mode 100644 vmadm/web.yaml delete mode 100644 vmadm/workera.yaml diff --git a/vmadm/apt-dev.yaml b/vmadm/apt-dev.yaml deleted file mode 100644 index 3cbab11..0000000 --- a/vmadm/apt-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apt-dev: - cpus: 16 - memory_mib: 65536 - image_size_gib: 100 diff --git a/vmadm/clab-dev.yaml b/vmadm/clab-dev.yaml deleted file mode 100644 index 31c882d..0000000 --- a/vmadm/clab-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -clab-dev: - cpus: 8 - memory_mib: 16384 - image_size_gib: 100 diff --git a/vmadm/debian-ansible-dev.yaml b/vmadm/debian-ansible-dev.yaml deleted file mode 100644 index aa80f4a..0000000 --- a/vmadm/debian-ansible-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -debian-ansible-dev: - cpus: 8 - memory_mib: 16384 - image_size_gib: 100 diff --git a/vmadm/debian-mirror.yaml b/vmadm/debian-mirror.yaml deleted file mode 100644 index 9a7846a..0000000 --- a/vmadm/debian-mirror.yaml +++ /dev/null @@ -1,3 +0,0 @@ -debian-mirror: - image_size_gib: 200 - autostart: true diff --git a/vmadm/ewww-dev.yaml b/vmadm/ewww-dev.yaml deleted file mode 100644 index 784050f..0000000 --- a/vmadm/ewww-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -ewww-dev: - cpus: 8 - memory_mib: 16384 - image_size_gib: 100 diff --git a/vmadm/ewww-test.yaml b/vmadm/ewww-test.yaml deleted file mode 100644 index be3d348..0000000 --- a/vmadm/ewww-test.yaml +++ /dev/null @@ -1,2 +0,0 @@ -ewww-test: - autostart: false diff --git a/vmadm/exolobe1/icktool.yaml b/vmadm/exolobe1/icktool.yaml new file mode 100644 index 0000000..4bc9376 --- /dev/null +++ b/vmadm/exolobe1/icktool.yaml @@ -0,0 +1,6 @@ +icktool: + base: ~/tmp/debian-10-openstack-amd64.qcow2 + cpus: 1 + memory_mib: 1024 + image_size_gib: 4 + autostart: true diff --git a/vmadm/exolobe1/web.yaml b/vmadm/exolobe1/web.yaml new file mode 100644 index 0000000..d16dc8a --- /dev/null +++ b/vmadm/exolobe1/web.yaml @@ -0,0 +1,2 @@ +web: + autostart: true diff --git a/vmadm/exolobe2/debian-mirror.yaml b/vmadm/exolobe2/debian-mirror.yaml new file mode 100644 index 0000000..9a7846a --- /dev/null +++ b/vmadm/exolobe2/debian-mirror.yaml @@ -0,0 +1,3 @@ +debian-mirror: + image_size_gib: 200 + autostart: true diff --git a/vmadm/exolobe2/mirror-git.yaml b/vmadm/exolobe2/mirror-git.yaml new file mode 100644 index 0000000..69b2918 --- /dev/null +++ b/vmadm/exolobe2/mirror-git.yaml @@ -0,0 +1,5 @@ +mirror-git: + base: ~/base-images/bullseye-vm.qcow2 + cpus: 2 + memory_mib: 1024 + image_size_gib: 10 diff --git a/vmadm/exolobe5.sh b/vmadm/exolobe5.sh deleted file mode 100755 index b88b88e..0000000 --- a/vmadm/exolobe5.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -specs=" -apt-dev.yaml -clab-dev.yaml -debian-ansible-dev.yaml -ewww-dev.yaml -ewww-test.yaml -ick2-dev.yaml -obnam-bench.yaml -obnam-dev.yaml -openpgp-ca-dev.yaml -python-mess.yaml -roadmap-dev.yaml -rust-dev.yaml -sequoia-dev.yaml -sequoia-web.yaml -sshca-dev.yaml -subplot-dev.yaml -vmadm-dev.yaml -vmdb2-dev.yaml -" - -for spec in $specs; do - vmadm delete "$spec" - vmadm new "$spec" -done diff --git a/vmadm/exolobe5/apt-dev.yaml b/vmadm/exolobe5/apt-dev.yaml new file mode 100644 index 0000000..3cbab11 --- /dev/null +++ b/vmadm/exolobe5/apt-dev.yaml @@ -0,0 +1,4 @@ +apt-dev: + cpus: 16 + memory_mib: 65536 + image_size_gib: 100 diff --git a/vmadm/exolobe5/clab-dev.yaml b/vmadm/exolobe5/clab-dev.yaml new file mode 100644 index 0000000..31c882d --- /dev/null +++ b/vmadm/exolobe5/clab-dev.yaml @@ -0,0 +1,4 @@ +clab-dev: + cpus: 8 + memory_mib: 16384 + image_size_gib: 100 diff --git a/vmadm/exolobe5/debian-ansible-dev.yaml b/vmadm/exolobe5/debian-ansible-dev.yaml new file mode 100644 index 0000000..aa80f4a --- /dev/null +++ b/vmadm/exolobe5/debian-ansible-dev.yaml @@ -0,0 +1,4 @@ +debian-ansible-dev: + cpus: 8 + memory_mib: 16384 + image_size_gib: 100 diff --git a/vmadm/exolobe5/ewww-dev.yaml b/vmadm/exolobe5/ewww-dev.yaml new file mode 100644 index 0000000..784050f --- /dev/null +++ b/vmadm/exolobe5/ewww-dev.yaml @@ -0,0 +1,4 @@ +ewww-dev: + cpus: 8 + memory_mib: 16384 + image_size_gib: 100 diff --git a/vmadm/exolobe5/ewww-test.yaml b/vmadm/exolobe5/ewww-test.yaml new file mode 100644 index 0000000..be3d348 --- /dev/null +++ b/vmadm/exolobe5/ewww-test.yaml @@ -0,0 +1,2 @@ +ewww-test: + autostart: false diff --git a/vmadm/exolobe5/ick2-dev.yaml b/vmadm/exolobe5/ick2-dev.yaml new file mode 100644 index 0000000..5aed5ac --- /dev/null +++ b/vmadm/exolobe5/ick2-dev.yaml @@ -0,0 +1,5 @@ +ick2-dev: + base: ~/base-images/buster.qcow2 + cpus: 2 + memory_mib: 8192 + image_size_gib: 100 diff --git a/vmadm/exolobe5/obnam-bench.yaml b/vmadm/exolobe5/obnam-bench.yaml new file mode 100644 index 0000000..64e3208 --- /dev/null +++ b/vmadm/exolobe5/obnam-bench.yaml @@ -0,0 +1,4 @@ +obnam-bench: + cpus: 4 + memory_mib: 4096 + image_size_gib: 100 diff --git a/vmadm/exolobe5/obnam-dev.yaml b/vmadm/exolobe5/obnam-dev.yaml new file mode 100644 index 0000000..26d597b --- /dev/null +++ b/vmadm/exolobe5/obnam-dev.yaml @@ -0,0 +1,4 @@ +obnam-dev: + cpus: 30 + memory_mib: 65535 + image_size_gib: 100 diff --git a/vmadm/exolobe5/openpgp-ca-dev.yaml b/vmadm/exolobe5/openpgp-ca-dev.yaml new file mode 100644 index 0000000..237b99c --- /dev/null +++ b/vmadm/exolobe5/openpgp-ca-dev.yaml @@ -0,0 +1,4 @@ +openpgp-ca-dev: + cpus: 30 + memory_mib: 65535 + image_size_gib: 100 diff --git a/vmadm/exolobe5/python-mess.yaml b/vmadm/exolobe5/python-mess.yaml new file mode 100644 index 0000000..524b5e5 --- /dev/null +++ b/vmadm/exolobe5/python-mess.yaml @@ -0,0 +1,4 @@ +python-mess: + cpus: 8 + memory_mib: 16384 + image_size_gib: 100 diff --git a/vmadm/exolobe5/roadmap-dev.yaml b/vmadm/exolobe5/roadmap-dev.yaml new file mode 100644 index 0000000..61d3651 --- /dev/null +++ b/vmadm/exolobe5/roadmap-dev.yaml @@ -0,0 +1,4 @@ +roadmap-dev: + cpus: 8 + memory_mib: 16384 + image_size_gib: 100 diff --git a/vmadm/exolobe5/rust-dev.yaml b/vmadm/exolobe5/rust-dev.yaml new file mode 100644 index 0000000..f700290 --- /dev/null +++ b/vmadm/exolobe5/rust-dev.yaml @@ -0,0 +1,4 @@ +rust-dev: + cpus: 16 + memory_mib: 65535 + image_size_gib: 100 diff --git a/vmadm/exolobe5/sequoia-dev.yaml b/vmadm/exolobe5/sequoia-dev.yaml new file mode 100644 index 0000000..5a1a856 --- /dev/null +++ b/vmadm/exolobe5/sequoia-dev.yaml @@ -0,0 +1,4 @@ +sequoia-dev: + cpus: 30 + memory_mib: 65535 + image_size_gib: 100 diff --git a/vmadm/exolobe5/sequoia-web.yaml b/vmadm/exolobe5/sequoia-web.yaml new file mode 100644 index 0000000..963fdcd --- /dev/null +++ b/vmadm/exolobe5/sequoia-web.yaml @@ -0,0 +1,4 @@ +sequoia-web: + cpus: 4 + memory_mib: 8192 + image_size_gib: 100 diff --git a/vmadm/exolobe5/sshca-dev.yaml b/vmadm/exolobe5/sshca-dev.yaml new file mode 100644 index 0000000..a04aac7 --- /dev/null +++ b/vmadm/exolobe5/sshca-dev.yaml @@ -0,0 +1,4 @@ +sshca-dev: + cpus: 8 + memory_mib: 16384 + image_size_gib: 100 diff --git a/vmadm/exolobe5/subplot-dev.yaml b/vmadm/exolobe5/subplot-dev.yaml new file mode 100644 index 0000000..605d7f3 --- /dev/null +++ b/vmadm/exolobe5/subplot-dev.yaml @@ -0,0 +1,4 @@ +subplot-dev: + cpus: 30 + memory_mib: 65535 + image_size_gib: 100 diff --git a/vmadm/exolobe5/vmadm-dev.yaml b/vmadm/exolobe5/vmadm-dev.yaml new file mode 100644 index 0000000..b75b70c --- /dev/null +++ b/vmadm/exolobe5/vmadm-dev.yaml @@ -0,0 +1,4 @@ +vmadm-dev: + cpus: 30 + memory_mib: 65536 + image_size_gib: 100 diff --git a/vmadm/exolobe5/vmdb2-dev.yaml b/vmadm/exolobe5/vmdb2-dev.yaml new file mode 100644 index 0000000..4e0690d --- /dev/null +++ b/vmadm/exolobe5/vmdb2-dev.yaml @@ -0,0 +1,4 @@ +vmdb2-dev: + cpus: 8 + memory_mib: 16384 + image_size_gib: 100 diff --git a/vmadm/exolobe5/workera.yaml b/vmadm/exolobe5/workera.yaml new file mode 100644 index 0000000..c49eee3 --- /dev/null +++ b/vmadm/exolobe5/workera.yaml @@ -0,0 +1,6 @@ +workera: + base: ~/base-images/buster.qcow2 + cpus: 8 + memory_mib: 16384 + image_size_gib: 100 + autostart: true diff --git a/vmadm/ick2-dev.yaml b/vmadm/ick2-dev.yaml deleted file mode 100644 index 5aed5ac..0000000 --- a/vmadm/ick2-dev.yaml +++ /dev/null @@ -1,5 +0,0 @@ -ick2-dev: - base: ~/base-images/buster.qcow2 - cpus: 2 - memory_mib: 8192 - image_size_gib: 100 diff --git a/vmadm/icktool.yaml b/vmadm/icktool.yaml deleted file mode 100644 index 4bc9376..0000000 --- a/vmadm/icktool.yaml +++ /dev/null @@ -1,6 +0,0 @@ -icktool: - base: ~/tmp/debian-10-openstack-amd64.qcow2 - cpus: 1 - memory_mib: 1024 - image_size_gib: 4 - autostart: true diff --git a/vmadm/mirror-git.yaml b/vmadm/mirror-git.yaml deleted file mode 100644 index 69b2918..0000000 --- a/vmadm/mirror-git.yaml +++ /dev/null @@ -1,5 +0,0 @@ -mirror-git: - base: ~/base-images/bullseye-vm.qcow2 - cpus: 2 - memory_mib: 1024 - image_size_gib: 10 diff --git a/vmadm/obnam-bench.yaml b/vmadm/obnam-bench.yaml deleted file mode 100644 index 64e3208..0000000 --- a/vmadm/obnam-bench.yaml +++ /dev/null @@ -1,4 +0,0 @@ -obnam-bench: - cpus: 4 - memory_mib: 4096 - image_size_gib: 100 diff --git a/vmadm/obnam-dev.yaml b/vmadm/obnam-dev.yaml deleted file mode 100644 index 26d597b..0000000 --- a/vmadm/obnam-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -obnam-dev: - cpus: 30 - memory_mib: 65535 - image_size_gib: 100 diff --git a/vmadm/openpgp-ca-dev.yaml b/vmadm/openpgp-ca-dev.yaml deleted file mode 100644 index 237b99c..0000000 --- a/vmadm/openpgp-ca-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -openpgp-ca-dev: - cpus: 30 - memory_mib: 65535 - image_size_gib: 100 diff --git a/vmadm/python-mess.yaml b/vmadm/python-mess.yaml deleted file mode 100644 index 524b5e5..0000000 --- a/vmadm/python-mess.yaml +++ /dev/null @@ -1,4 +0,0 @@ -python-mess: - cpus: 8 - memory_mib: 16384 - image_size_gib: 100 diff --git a/vmadm/roadmap-dev.yaml b/vmadm/roadmap-dev.yaml deleted file mode 100644 index 61d3651..0000000 --- a/vmadm/roadmap-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roadmap-dev: - cpus: 8 - memory_mib: 16384 - image_size_gib: 100 diff --git a/vmadm/rust-dev.yaml b/vmadm/rust-dev.yaml deleted file mode 100644 index f700290..0000000 --- a/vmadm/rust-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rust-dev: - cpus: 16 - memory_mib: 65535 - image_size_gib: 100 diff --git a/vmadm/sequoia-dev.yaml b/vmadm/sequoia-dev.yaml deleted file mode 100644 index 5a1a856..0000000 --- a/vmadm/sequoia-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sequoia-dev: - cpus: 30 - memory_mib: 65535 - image_size_gib: 100 diff --git a/vmadm/sequoia-web.yaml b/vmadm/sequoia-web.yaml deleted file mode 100644 index 963fdcd..0000000 --- a/vmadm/sequoia-web.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sequoia-web: - cpus: 4 - memory_mib: 8192 - image_size_gib: 100 diff --git a/vmadm/sshca-dev.yaml b/vmadm/sshca-dev.yaml deleted file mode 100644 index a04aac7..0000000 --- a/vmadm/sshca-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sshca-dev: - cpus: 8 - memory_mib: 16384 - image_size_gib: 100 diff --git a/vmadm/subplot-dev.yaml b/vmadm/subplot-dev.yaml deleted file mode 100644 index 605d7f3..0000000 --- a/vmadm/subplot-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -subplot-dev: - cpus: 30 - memory_mib: 65535 - image_size_gib: 100 diff --git a/vmadm/vmadm-dev.yaml b/vmadm/vmadm-dev.yaml deleted file mode 100644 index b75b70c..0000000 --- a/vmadm/vmadm-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -vmadm-dev: - cpus: 30 - memory_mib: 65536 - image_size_gib: 100 diff --git a/vmadm/vmdb2-dev.yaml b/vmadm/vmdb2-dev.yaml deleted file mode 100644 index 4e0690d..0000000 --- a/vmadm/vmdb2-dev.yaml +++ /dev/null @@ -1,4 +0,0 @@ -vmdb2-dev: - cpus: 8 - memory_mib: 16384 - image_size_gib: 100 diff --git a/vmadm/web.yaml b/vmadm/web.yaml deleted file mode 100644 index d16dc8a..0000000 --- a/vmadm/web.yaml +++ /dev/null @@ -1,2 +0,0 @@ -web: - autostart: true diff --git a/vmadm/workera.yaml b/vmadm/workera.yaml deleted file mode 100644 index c49eee3..0000000 --- a/vmadm/workera.yaml +++ /dev/null @@ -1,6 +0,0 @@ -workera: - base: ~/base-images/buster.qcow2 - cpus: 8 - memory_mib: 16384 - image_size_gib: 100 - autostart: true -- cgit v1.2.1