From e03797f4fd4661eb7d54016978341ec49dad689a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 28 Dec 2021 21:48:39 +0100 Subject: prepare atlas config for re-install --- inventory/group_vars/vmhost-ch-atlas/vars.yml | 10 ++++-- inventory/host_vars/ch-atlas.yml | 45 +++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 4 deletions(-) (limited to 'inventory') diff --git a/inventory/group_vars/vmhost-ch-atlas/vars.yml b/inventory/group_vars/vmhost-ch-atlas/vars.yml index dd69b6e6..c9fd9199 100644 --- a/inventory/group_vars/vmhost-ch-atlas/vars.yml +++ b/inventory/group_vars/vmhost-ch-atlas/vars.yml @@ -8,7 +8,7 @@ vm_host: bridges: public: interfaces: - - eth0 + - eth0 prefix: 89.106.215.16/28 gateway: 89.106.215.30 prefix6: 2a02:3e0:407::/64 @@ -22,6 +22,12 @@ vm_host: k8stest: {} funkfeuer: interfaces: - - eth0.502 + - eth0.502 + zfs: + default: + pool: ssd + name: vm + properties: + compression: lz4 apt_repo_provider: ffgraz diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml index 120e007d..c0e934d3 100644 --- a/inventory/host_vars/ch-atlas.yml +++ b/inventory/host_vars/ch-atlas.yml @@ -1,14 +1,55 @@ --- +install_interface: enp1s0 + +install: + efi: no + disks: + primary: /dev/disk/by-id/ata-Samsung_SSD_840_PRO_Series_S1ATNSAD703481A + system_lvm: + size: 20G + network: nameservers: "{{ vm_host.network.dns }}" domain: "{{ host_domain }}" - interfaces: - - name: br-public + primary: &_network_primary_ + name: br-public address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" gateway: "{{ vm_host.network.bridges.public.gateway }}" # address6: "{{ vm_host.network.bridges.public.prefix6 | ipaddr(vm_host.network.bridges.public.offsets6[inventory_hostname]) | ipaddr('address/prefix') }}" address6: "{{ vm_host.network.bridges.public.prefix6 | ipaddr(41) | ipaddr('address/prefix') }}" gateway6: "{{ vm_host.network.bridges.public.gateway6 }}" + interfaces: + - *_network_primary_ vlans: eth0: - 502 + + +apt_repo_components: + - main + - contrib ## for zfs + - non-free ## for microcode updates + + +installer_storage: + type: lvm + vg: "{{ host_name }}" + lv: installer + size: 5G + fs: ext4 + + +zfs_arc_size: + min: 512MB + max: 2GB + +zfs_pools: + ssd: + mountpoint: /srv/ssd + create_vdevs: /dev/disk/by-id/ata-Samsung_SSD_840_PRO_Series_S1ATNSAD703481A-part3 + +zfs_sanoid_modules: + ssd/vm: + use_template: production + recursive: yes + process_children_only: yes -- cgit v1.2.3 From 85a1335e9c25a07bb4a2373d694ccf63639454ed Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 28 Dec 2021 22:24:04 +0100 Subject: ch-atlas will be using python3 --- inventory/hosts.ini | 1 - 1 file changed, 1 deletion(-) (limited to 'inventory') diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 6b54c33a..5df25e75 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -304,7 +304,6 @@ python_basename=python [python2] ch-prometheus-legacy -ch-atlas ch-pan ch-mimas ch-mimas2 -- cgit v1.2.3 From 0bc85d8d6f34cd1b718017d5cf945076b4c7ed6e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 28 Dec 2021 23:41:05 +0100 Subject: finalize ch-atlas install --- chaos-at-home/ch-atlas.yml | 12 ++++++------ inventory/group_vars/vmhost-ch-atlas/vars.yml | 4 ++-- inventory/host_vars/ch-atlas.yml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'inventory') diff --git a/chaos-at-home/ch-atlas.yml b/chaos-at-home/ch-atlas.yml index f39272e3..35200585 100644 --- a/chaos-at-home/ch-atlas.yml +++ b/chaos-at-home/ch-atlas.yml @@ -8,9 +8,9 @@ - role: core/zsh - role: core/ntp - role: core/cpu-microcode - # - role: storage/zfs/pools - # - role: storage/zfs/sanoid - # - role: vm/host/base - # - role: vm/host/network - # - role: installer/debian/base - # - role: installer/openbsd/base + - role: storage/zfs/pools + - role: storage/zfs/sanoid + - role: vm/host/base + - role: vm/host/network + - role: installer/debian/base + - role: installer/openbsd/base diff --git a/inventory/group_vars/vmhost-ch-atlas/vars.yml b/inventory/group_vars/vmhost-ch-atlas/vars.yml index c9fd9199..a785e224 100644 --- a/inventory/group_vars/vmhost-ch-atlas/vars.yml +++ b/inventory/group_vars/vmhost-ch-atlas/vars.yml @@ -8,7 +8,7 @@ vm_host: bridges: public: interfaces: - - eth0 + - enp1s0 prefix: 89.106.215.16/28 gateway: 89.106.215.30 prefix6: 2a02:3e0:407::/64 @@ -22,7 +22,7 @@ vm_host: k8stest: {} funkfeuer: interfaces: - - eth0.502 + - enp1s0.502 zfs: default: pool: ssd diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml index c0e934d3..17196bca 100644 --- a/inventory/host_vars/ch-atlas.yml +++ b/inventory/host_vars/ch-atlas.yml @@ -21,7 +21,7 @@ network: interfaces: - *_network_primary_ vlans: - eth0: + enp1s0: - 502 @@ -46,7 +46,7 @@ zfs_arc_size: zfs_pools: ssd: mountpoint: /srv/ssd - create_vdevs: /dev/disk/by-id/ata-Samsung_SSD_840_PRO_Series_S1ATNSAD703481A-part3 + create_vdevs: /dev/disk/by-id/ata-Samsung_SSD_840_PRO_Series_S1ATNSAD703481A-part2 zfs_sanoid_modules: ssd/vm: -- cgit v1.2.3