From 03a8b5177dd645758a38af1ed92133d4b45ea861 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 8 Oct 2020 21:05:16 +0200 Subject: remove ch-oulu (testhost) --- chaos-at-home/ch-oulu.yml | 16 -------- inventory/group_vars/chaos-at-home/network.yml | 2 - inventory/group_vars/vmhost-ch-oulu/main.yml | 27 ------------- inventory/host_vars/ch-oulu-vm1.yml | 41 ------------------- inventory/host_vars/ch-oulu.yml | 56 -------------------------- inventory/hosts.ini | 11 ----- 6 files changed, 153 deletions(-) delete mode 100644 chaos-at-home/ch-oulu.yml delete mode 100644 inventory/group_vars/vmhost-ch-oulu/main.yml delete mode 100644 inventory/host_vars/ch-oulu-vm1.yml delete mode 100644 inventory/host_vars/ch-oulu.yml diff --git a/chaos-at-home/ch-oulu.yml b/chaos-at-home/ch-oulu.yml deleted file mode 100644 index 352e1f19..00000000 --- a/chaos-at-home/ch-oulu.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- name: Basic Setup - hosts: ch-oulu - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd - - role: core/zsh - - role: core/cpu-microcode - - role: zfs/base - - role: apt-repo/spreadspace - - role: zfs/sanoid - - 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 e70cc896..67950f94 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -12,8 +12,6 @@ network_zones: limit: 199 offsets: ch-equinox-ws: 1 - ch-oulu: 2 ## testing - ch-oulu-vm1: 3 ## testing ch-mc: 10 ch-prometheus: 200 ch-gw-lan: 254 diff --git a/inventory/group_vars/vmhost-ch-oulu/main.yml b/inventory/group_vars/vmhost-ch-oulu/main.yml deleted file mode 100644 index 81b9b341..00000000 --- a/inventory/group_vars/vmhost-ch-oulu/main.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -__vmhost_bridge_interface_zones__: - bond0: - - lan - - svc - - mgmt - -__vmhost_bridge_interface_zones_yaml__: | - {% for interface in (__vmhost_bridge_interface_zones__.keys() | sort) %} - {% for zone in __vmhost_bridge_interface_zones__[interface] %} - {{ zone }}: - interfaces: - - {{ interface }}.{{ network_zones[zone].vlan }} - {% endfor %} - {% endfor %} - - -vm_host: - name: ch-oulu - network: - bridges: "{{ __vmhost_bridge_interface_zones_yaml__ | from_yaml }}" - zfs: - default: - pool: nvme - name: vm - properties: - compression: lz4 diff --git a/inventory/host_vars/ch-oulu-vm1.yml b/inventory/host_vars/ch-oulu-vm1.yml deleted file mode 100644 index 0f4b8492..00000000 --- a/inventory/host_vars/ch-oulu-vm1.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -install: - vm: - memory: 16G - numcpus: 12 - autostart: True - disks: - primary: /dev/sda - scsi: - sda: - type: zfs - name: root - size: 10g - interfaces: - - bridge: br-lan - name: lan0 - - bridge: br-svc - name: svc0 - -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 }}" - template: multihomed-base - interfaces: - - *_network_primary_ - - name: svc0 - address: 192.168.3.1/24 - template: multihomed-overlay - overlays: - - name: mur.at - address: 1.2.3.4/28 - gateway: 1.2.3.1 - - name: magenta - address: 5.6.7.8/27 - gateway: 5.6.7.1 diff --git a/inventory/host_vars/ch-oulu.yml b/inventory/host_vars/ch-oulu.yml deleted file mode 100644 index f39f04f9..00000000 --- a/inventory/host_vars/ch-oulu.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- -install_interface: eno1 - -install: - efi: true - disks: - primary: software-raid - raid: - level: 1 - members: - - /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800161Z - - /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800191M - system_lvm: - size: 15G - -network: - nameservers: - - 9.9.9.9 - domain: "{{ host_domain }}" - primary: &_network_primary_ - name: br-lan - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ network_zones.lan.gateway }}" - interfaces: - - *_network_primary_ - bonds: - - name: bond0 - mode: 802.3ad - slaves: - - eno1 - - eno2 - options: - miimon: 100 - vlans: - bond0: "{{ __vmhost_bridge_interface_zones__['bond0'] | map('extract', network_zones) | map(attribute='vlan') | list }}" - -apt_repo_components: - - main - - contrib - - non-free ## for microcode updates - - -zfs_arc_size: - min: 2GB - max: 8GB - -zfs_pools: - nvme: - mountpoint: /srv/nvme - create_vdevs: mirror /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800161Z-part4 /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800191M-part4 - -zfs_sanoid_modules: - nvme/vm: - use_template: production - recursive: yes - process_children_only: yes diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 5e0f2d1a..fb5672ee 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -32,8 +32,6 @@ ch-keyserver host_name=keyserver ch-testvm host_name=testvm ch-mimas host_name=mimas ch-mimas2 host_name=mimas -ch-oulu host_name=oulu host_domain=helsinki.at -ch-oulu-vm1 host_name=oulu-vm1 host_domain=helsinki.at [chaos-at-home:children] mz-chaos-at-home @@ -281,13 +279,6 @@ ch-atlas [vmhost-ch-atlas:children] vmhost-ch-atlas-guests -[vmhost-ch-oulu-guests] -ch-oulu-vm1 -[vmhost-ch-oulu] -ch-oulu -[vmhost-ch-oulu:children] -vmhost-ch-oulu-guests - [vmhost-sk-2019vm-guests] sk-testvm sk-torrent @@ -313,7 +304,6 @@ vmhost-sk-tomnext-guests ch-gnocchi ch-prometheus ch-atlas -ch-oulu sk-2019vm sk-tomnext @@ -321,7 +311,6 @@ sk-tomnext vmhost-ch-gnocchi-guests vmhost-ch-prometheus-guests vmhost-ch-atlas-guests -vmhost-ch-oulu-guests vmhost-sk-2019vm-guests vmhost-sk-tomnext-guests -- cgit v1.2.3