cleanup some testvms

4 files changed, 9 insertions, 81 deletions

diff --git a/dan/sk-testvm.yml b/chaos-at-home/ch-apps.yml
index 9734c70d..8577b8b7 100644
--- a/dan/sk-testvm.yml
+++ b/chaos-at-home/ch-apps.yml
@@ -1,12 +1,9 @@
 ---
 - name: Basic Setup
-  hosts: sk-testvm
+  hosts: ch-apps
   roles:
   - role: apt-repo/base
   - role: core/base
   - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
-  - role: network/openvpn/ca
-  - role: network/openvpn/base
-  - role: network/openvpn/server
diff --git a/chaos-at-home/ch-testvm-prometheus.yml b/chaos-at-home/ch-testvm-prometheus.yml
deleted file mode 100644
index 66589c57..00000000
--- a/chaos-at-home/ch-testvm-prometheus.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: Basic Setup
-  hosts: ch-testvm-prometheus
-  roles:
-  - role: apt-repo/base
-  - role: core/base
-  - role: core/sshd/base
-  - role: core/zsh
-  - role: core/ntp
-  - role: nginx/base
-  - role: apt-repo/spreadspace
-  - role: monitoring/prometheus/exporter
-  # - role: kubernetes/base
-  # - role: kubernetes/standalone/base
-  # - role: network/openvpn/base
-  # - role: network/openvpn/client
diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml
index 22320ce5..d87ff20a 100644
--- a/inventory/host_vars/ch-testvm-prometheus.yml
+++ b/inventory/host_vars/ch-testvm-prometheus.yml
@@ -12,7 +12,7 @@ install:
       sda:
         type: zfs
         name: root
-        size: 50g
+        size: 10g
   interfaces:
   - bridge: br-svc
     name: svc0
@@ -31,55 +31,3 @@ network:
       gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}"
   interfaces:
   - *_network_primary_
-
-
-spreadspace_apt_repo_components:
-  - prometheus
-
-
-ntp_variant: chrony
-
-ntp_client:
-  pools:
-  - name: at.pool.ntp.org
-    options: iburst
-
-
-prometheus_exporters_extra:
-  - ssl
-
-prometheus_exporter_node_textfile_collector_scripts:
-  - deleted-libraries
-  - chrony
-
-prometheus_job_multitarget_blackbox__probe:
-  ch-mon:
-  - instance: "ssh-{{ inventory_hostname }}"
-    target: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}"
-    module: ssh_banner
-
-prometheus_job_multitarget_ssl__probe:
-  ch-testvm-prometheus:
-  - instance: "sslcert-prometheus-{{ inventory_hostname }}"
-    target: "/etc/ssl/prometheus/**/*.pem"
-    module: file
-
-
-containerd_storage:
-  type: lvm
-  vg: "{{ host_name }}"
-  lv: containerd
-  size: 20G
-  fs: ext4
-
-kubelet_storage:
-  type: lvm
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 15G
-  fs: ext4
-
-kubernetes_version: 1.21.1
-kubernetes_container_runtime: containerd
-kubernetes_standalone_max_pods: 42
-kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index b7f02e0d..3b0bca43 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -433,7 +433,6 @@ vmhost-ele-telesto-guests
 ch-mon
 [promzone-chaos-at-home]
 ch-router
-ch-testvm-prometheus
 ch-phoebe
 ch-prometheus
 [promzone-chaos-at-home:children]
@@ -458,13 +457,13 @@ emc
 
 
 ## openvpn
-[ovpnzone-test-server]
-sk-testvm
-[ovpnzone-test-clients]
-ch-testvm-prometheus
-[ovpnzone-test:children]
-ovpnzone-test-server
-ovpnzone-test-clients
+# [ovpnzone-test-server]
+# sk-testvm
+# [ovpnzone-test-clients]
+# ch-testvm-prometheus
+# [ovpnzone-test:children]
+# ovpnzone-test-server
+# ovpnzone-test-clients
 
 
 ## hoster