move r3-cccamp19 stuff to _graveyard_, introduce new kvm groups

10 files changed, 60 insertions, 288 deletions

diff --git a/inventory/group_vars/r3-cccamp19/network.yml b/inventory/group_vars/r3-cccamp19/network.yml
deleted file mode 100644
index 82216ea6..00000000
--- a/inventory/group_vars/r3-cccamp19/network.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-network_zones:
-  camp19:
-    vlan: 19
-
-  lan:
-    vlan: 126
-    prefix: 192.168.126.0/24
-    gateway: 192.168.126.254
-    dns:
-      - 192.168.126.254
-    dhcp:
-      start: 1
-      limit: 199
-    offsets:
-      r3-cccamp19-dione: 200
-      r3-cccamp19-helene: 201
-      r3-cccamp19-flora: 220
-      r3-cccamp19-verr: 221
-      r3-cccamp19-feedcode: 222
-      r3-cccamp19-av: 223
-      r3-cccamp19-gw: 254
-
-  mgmt:
-    vlan: 41
-    prefix: 192.168.41.0/24
-    offsets:
-      r3-cccamp19-dione: 100
-      r3-cccamp19-helene: 101
-      r3-cccamp19-sw0: 200
-      r3-cccamp19-sw1: 201
-      r3-cccamp19-sw2: 202
-      r3-cccamp19-gw: 254
diff --git a/inventory/host_vars/r3-cccamp19-av.yml b/inventory/host_vars/r3-cccamp19-av.yml
deleted file mode 100644
index 40524574..00000000
--- a/inventory/host_vars/r3-cccamp19-av.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-_vm_host_: helene
-
-install:
-  vm:
-    host: "{{ _vm_host_ }}"
-    mem: 4096
-    numcpu: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: lvm
-        vg: "{{ hostvars[_vm_host_].host_name }}"
-        lv: "{{ inventory_hostname }}"
-        size: 10g
-  interfaces:
-  - bridge: lan-br
-    name: lan0
-  - bridge: camp19-br
-    name: camp0
-
-network:
-  nameservers: "{{ network_zones.lan.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary:
-    interface: lan0
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gateway }}"
-
-install_playbook: r3-cccamp19_vm
-
-dyndns:
-  server: ch-pan
diff --git a/inventory/host_vars/r3-cccamp19-dione.yml b/inventory/host_vars/r3-cccamp19-dione.yml
deleted file mode 100644
index 47195b1f..00000000
--- a/inventory/host_vars/r3-cccamp19-dione.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-install_interface: eno1
-install_dhcp: true
-
-install:
-  efi: true
-  disks:
-    primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501
-
-network:
-  domain: camp.realraum.at
-
-
-base_packages_extra_host:
-  - vlan
-
-dyndns:
-  server: ch-pan
diff --git a/inventory/host_vars/r3-cccamp19-feedcode.yml b/inventory/host_vars/r3-cccamp19-feedcode.yml
deleted file mode 100644
index 10f78ebc..00000000
--- a/inventory/host_vars/r3-cccamp19-feedcode.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-_vm_host_: helene
-
-install:
-  vm:
-    host: "{{ _vm_host_ }}"
-    mem: 6144
-    numcpu: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: lvm
-        vg: "{{ hostvars[_vm_host_].host_name }}"
-        lv: "{{ inventory_hostname }}"
-        size: 42g
-  interfaces:
-  - bridge: lan-br
-    name: lan0
-  - bridge: camp19-br
-    name: camp0
-
-network:
-  nameservers: "{{ network_zones.lan.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary:
-    interface: lan0
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gateway }}"
diff --git a/inventory/host_vars/r3-cccamp19-flora.yml b/inventory/host_vars/r3-cccamp19-flora.yml
deleted file mode 100644
index 40524574..00000000
--- a/inventory/host_vars/r3-cccamp19-flora.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-_vm_host_: helene
-
-install:
-  vm:
-    host: "{{ _vm_host_ }}"
-    mem: 4096
-    numcpu: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: lvm
-        vg: "{{ hostvars[_vm_host_].host_name }}"
-        lv: "{{ inventory_hostname }}"
-        size: 10g
-  interfaces:
-  - bridge: lan-br
-    name: lan0
-  - bridge: camp19-br
-    name: camp0
-
-network:
-  nameservers: "{{ network_zones.lan.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary:
-    interface: lan0
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gateway }}"
-
-install_playbook: r3-cccamp19_vm
-
-dyndns:
-  server: ch-pan
diff --git a/inventory/host_vars/r3-cccamp19-gw.yml b/inventory/host_vars/r3-cccamp19-gw.yml
deleted file mode 100644
index c6150b4d..00000000
--- a/inventory/host_vars/r3-cccamp19-gw.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dyndns:
-  server: ch-pan
diff --git a/inventory/host_vars/r3-cccamp19-helene.yml b/inventory/host_vars/r3-cccamp19-helene.yml
deleted file mode 100644
index 104a5eda..00000000
--- a/inventory/host_vars/r3-cccamp19-helene.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-install_interface: eno1
-install_dhcp: true
-
-install:
-  efi: true
-  disks:
-    primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346
-
-network:
-  domain: camp.realraum.at
-
-
-base_packages_extra_host:
-  - vlan
-
-dyndns:
-  server: ch-pan
diff --git a/inventory/host_vars/r3-cccamp19-sw0.yml b/inventory/host_vars/r3-cccamp19-sw0.yml
deleted file mode 100644
index 5b01d940..00000000
--- a/inventory/host_vars/r3-cccamp19-sw0.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-switch_mgmt_zone: "{{ network_zones.mgmt }}"
-switch_mgmt_interface: "Gi1/0/28"
-
-switch_vlans: "{{ switch_vlans_yaml | from_yaml }}"
-switch_vlans_yaml: |
-  {% for zone_name in network_zones.keys() %}
-  - name: "{{ zone_name }}"
-    id: "{{ network_zones[zone_name].vlan }}"
-  {% endfor %}
-
-switch_interfaces: "{{ switch_interfaces_yaml | from_yaml }}"
-switch_interfaces_yaml: |
-  - spec: range Te1/0/1-4
-    vlan: {{ network_zones['cccamp19'].vlan }}
-  - spec: range Gi1/0/5-16
-    vlan: {{ network_zones['cccamp19'].vlan }}
-
-  - spec: range Gi1/0/17-24
-    vlan: {{ network_zones['protected'].vlan }}
-
-  - spec: range Gi1/0/25-28
-    vlan: {{ network_zones['mgmt'].vlan }}
diff --git a/inventory/host_vars/r3-cccamp19-verr.yml b/inventory/host_vars/r3-cccamp19-verr.yml
deleted file mode 100644
index f4e70d57..00000000
--- a/inventory/host_vars/r3-cccamp19-verr.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-_vm_host_: helene
-
-install:
-  vm:
-    host: "{{ _vm_host_ }}"
-    mem: 4096
-    numcpu: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: lvm
-        vg: "{{ hostvars[_vm_host_].host_name }}"
-        lv: "{{ inventory_hostname }}"
-        size: 20g
-  interfaces:
-  - bridge: lan-br
-    name: lan0
-  - bridge: camp19-br
-    name: camp0
-
-network:
-  nameservers: "{{ network_zones.lan.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary:
-    interface: lan0
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gateway }}"
-
-install_playbook: r3-cccamp19_vm
-
-dyndns:
-  server: ch-pan
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 9add78d3..b7b8f5af 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -70,22 +70,6 @@ ansible_port=22000
 [realraum]
 r3-vex2 host_name=vex2
 
-[realraum:children]
-r3-cccamp19
-
-[r3-cccamp19:vars]
-host_domain=camp.realraum.at
-
-[r3-cccamp19]
-r3-cccamp19-helene host_name=helene
-r3-cccamp19-dione host_name=dione
-r3-cccamp19-gw
-r3-cccamp19-sw0 ansible_host=192.168.41.200 ansible_port=22
-r3-cccamp19-flora host_name=flora
-r3-cccamp19-verr host_name=verr
-r3-cccamp19-feedcode host_name=feedcode
-r3-cccamp19-av host_name=av
-
 
 ###############################
 # environment: spreadspace
@@ -225,9 +209,7 @@ emc-0[1:3]
 ###############################
 # host categories
 
-[dellos6]
-r3-cccamp19-sw0
-
+## OS
 [dellos6:children]
 chaos-at-home-switches
 
@@ -237,41 +219,75 @@ ch-router-obsd
 ch-hroottest-obsd
 
 
-[kvmhosts]
-ch-atlas
+## virtualization
+[vmhost-ch-gnocchi-guests]
+ch-router
+ch-router-obsd
+ch-jump
+ch-gw-lan
+[vmhost-ch-gnocchi]
 ch-gnocchi
-r3-cccamp19-dione
-r3-cccamp19-helene
-sk-2019vm
-sk-tomnext
-ch-hroottest
+[vmhost-ch-gnocchi:children]
+vmhost-ch-gnocchi-guests
 
-[kvmguests]
-emc-master
-lw-master
-ch-keyserver
+[vmhost-ch-atlas-guests]
 ch-testvm
-ch-gw-lan
-ch-jump
-ch-router
-ch-router-obsd
+ele-mur
 r3-vex2
-r3-cccamp19-flora
-r3-cccamp19-verr
-r3-cccamp19-feedcode
-r3-cccamp19-av
+ch-keyserver
+[vmhost-ch-atlas]
+ch-atlas
+[vmhost-ch-atlas:children]
+vmhost-ch-atlas-guests
+
+[vmhost-ch-hroottest-guests]
+ch-hroottest-vm1
+ch-hroottest-obsd
+ch-k8s-m2
+ch-k8s-w[0:1]
+[vmhost-ch-hroottest]
+ch-hroottest
+[vmhost-ch-hroottest:children]
+vmhost-ch-hroottest-guests
+
+[vmhost-sk-2019vm-guests]
 sk-testvm
 sk-torrent
 ch-mimas
 ele-gwhetzner
-ele-mur
+ch-k8s-m[0:1]
+emc-master
+lw-master
+[vmhost-sk-2019vm]
+sk-2019vm
+[vmhost-sk-2019vm:children]
+vmhost-sk-2019vm-guests
+
+[vmhost-sk-tomnext-guests]
 sk-tomnext-nc
 sk-tomnext-hp
-ch-hroottest-vm1
-ch-hroottest-obsd
-ch-k8s-m[0:2]
-ch-k8s-w[0:1]
+[vmhost-sk-tomnext]
+sk-tomnext
+[vmhost-sk-tomnext:children]
+vmhost-sk-tomnext-guests
 
+
+[kvmhosts]
+ch-gnocchi
+ch-atlas
+ch-hroottest
+sk-2019vm
+sk-tomnext
+
+[kvmguests:children]
+vmhost-ch-gnocchi-guests
+vmhost-ch-atlas-guests
+vmhost-ch-hroottest-guests
+vmhost-sk-2019vm-guests
+vmhost-sk-tomnext-guests
+
+
+## hoster
 [hroot]
 sk-2019
 sk-cloudia
@@ -310,7 +326,7 @@ hcloud
 scaleway-kernel
 
 
-
+## misc
 [accesspoints:children]
 ele-ap
 chaos-at-home-ap
@@ -322,8 +338,6 @@ ele-dolmetsch-ctl
 ele-dolmetsch-raspi
 
 
-
-### Elevate Festival
 [elevate-festival:children]
 elevate
 k8s-emc