diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-12-29 00:25:02 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-12-29 00:25:02 +0100 |
| commit | 792773d5f956738030e6f9bf26dca2de3832f2b0 (patch) | |
| tree | 90573b9208ae4c6c4c7cf42be0d27d7c0274b6f9 /inventory | |
| parent | calypso and telesto disk has been replaced (diff) | |
| parent | finalize ch-atlas install (diff) | |
Merge branch 'topic/atlas-reinstall'
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/group_vars/vmhost-ch-atlas/vars.yml | 10 | ||||
| -rw-r--r-- | inventory/host_vars/ch-atlas.yml | 47 | ||||
| -rw-r--r-- | inventory/hosts.ini | 1 |
3 files changed, 52 insertions, 6 deletions
diff --git a/inventory/group_vars/vmhost-ch-atlas/vars.yml b/inventory/group_vars/vmhost-ch-atlas/vars.yml index dd69b6e6..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,6 +22,12 @@ vm_host: k8stest: {} funkfeuer: interfaces: - - eth0.502 + - enp1s0.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..17196bca 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: + enp1s0: - 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-part2 + +zfs_sanoid_modules: + ssd/vm: + use_template: production + recursive: yes + process_children_only: yes 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 |