6 files changed, 1 insertions, 76 deletions
diff --git a/chaos-at-home/ch-dione.yml b/chaos-at-home/ch-dione.yml
deleted file mode 100644
index 4ceaa653..00000000
--- a/chaos-at-home/ch-dione.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Basic Setup
-  hosts: ch-dione
-  roles:
-  - role: apt-repo/base
-  - role: core/base
-  - role: core/sshd
-  - role: core/zsh
-  - role: core/cpu-microcode
-  - role: vm/host/base
-  - role: vm/host/network
-  - role: installer/debian/base
-  - role: installer/openbsd/base
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index ed0e5250..ea7b4958 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -18,7 +18,6 @@ network_zones:
       ch-thetys: 22
       ch-dione: 23
       ch-helene: 24
-      ch-testvm2: 42
       ch-prometheus: 200
       ch-gw-lan: 254
       #############
diff --git a/inventory/group_vars/vmhost-ch-dione/vars.yml b/inventory/group_vars/vmhost-ch-dione/vars.yml
deleted file mode 100644
index 2da55ed1..00000000
--- a/inventory/group_vars/vmhost-ch-dione/vars.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-vm_host:
-  name: ch-dione
-  network:
-    bridges:
-      lan:
-        interfaces:
-        - eno1
diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml
index 6e858891..40c2864b 100644
--- a/inventory/host_vars/ch-dione.yml
+++ b/inventory/host_vars/ch-dione.yml
@@ -1,6 +1,4 @@
 ---
-install_interface: eno1
-
 install:
   efi: true
   disks:
@@ -13,7 +11,7 @@ network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
-    name: br-lan
+    name: eno1
     address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
@@ -22,15 +20,3 @@ network:
 
 admin_users_host:
   - equinox
-
-apt_repo_components:
-  - main
-  - contrib
-  - non-free ## for microcode updates
-
-
-installer_lvm:
-  vg: "{{ host_name }}"
-  lv: installer
-  size: 10G
-  fs: ext4
diff --git a/inventory/host_vars/ch-testvm2.yml b/inventory/host_vars/ch-testvm2.yml
deleted file mode 100644
index 5a401a15..00000000
--- a/inventory/host_vars/ch-testvm2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-install:
-  vm:
-    memory: 1G
-    numcpus: 1
-    autostart: False
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: lvm
-        vg: "{{ hostvars[vm_host.name].host_name }}"
-        lv: "{{ inventory_hostname }}"
-        size: 5g
-  interfaces:
-  - bridge: br-lan
-    name: lan0
-
-network:
-  nameservers: "{{ network_zones.lan.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: lan0
-    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ network_zones.lan.gateway }}"
-  interfaces:
-  - *_network_primary_
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 8a738f45..352dd875 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -30,7 +30,6 @@ ch-atlas host_name=atlas
 ch-pan host_name=pan
 ch-keyserver host_name=keyserver
 ch-testvm host_name=testvm
-ch-testvm2 host_name=testvm2
 ch-mimas host_name=mimas
 ch-mimas2 host_name=mimas
 
@@ -276,13 +275,6 @@ ch-prometheus
 [vmhost-ch-prometheus:children]
 vmhost-ch-prometheus-guests
 
-[vmhost-ch-dione-guests]
-ch-testvm2
-[vmhost-ch-dione]
-ch-dione
-[vmhost-ch-dione:children]
-vmhost-ch-dione-guests
-
 [vmhost-ch-atlas-guests]
 ch-testvm
 ele-mur
@@ -317,7 +309,6 @@ vmhost-sk-tomnext-guests
 [kvmhosts]
 ch-gnocchi
 ch-prometheus
-ch-dione
 ch-atlas
 sk-2019vm
 sk-tomnext
@@ -325,7 +316,6 @@ sk-tomnext
 [kvmguests:children]
 vmhost-ch-gnocchi-guests
 vmhost-ch-prometheus-guests
-vmhost-ch-dione-guests
 vmhost-ch-atlas-guests
 vmhost-sk-2019vm-guests
 vmhost-sk-tomnext-guests