summaryrefslogtreecommitdiff
path: root/inventory/host_vars
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-05-23 01:45:06 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-05-25 00:04:27 +0200
commitdac9084c7038992d275cde0723cf05a9741a44e3 (patch)
tree8c68c4a9ac515235f532b11d372d3756f96a7b4c /inventory/host_vars
parentsk-tomnext: fix post-boot script (diff)
make use of zfs-mount-generator configureable
Diffstat (limited to 'inventory/host_vars')
-rw-r--r--inventory/host_vars/sk-2019.yml14
-rw-r--r--inventory/host_vars/sk-2019vm.yml52
-rw-r--r--inventory/host_vars/sk-cloudia/vars.yml10
3 files changed, 41 insertions, 35 deletions
diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml
index 9de2b04a..f54d852f 100644
--- a/inventory/host_vars/sk-2019.yml
+++ b/inventory/host_vars/sk-2019.yml
@@ -10,12 +10,13 @@ install:
network: {}
base_intel_nic_stability_fix: true
+ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan + ssh_keys.brt }}"
+ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+
admin_user_host:
- "{{ brt_user }}"
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan + ssh_keys.brt }}"
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
cryptdisk_volumes:
@@ -27,11 +28,12 @@ cryptdisk_volumes:
device: /dev/disk/by-id/nvme-eui.0025388791050fdc-part3
+zfs_use_systemd_mount_generator: no
+zfs_arc_size:
+ min: "{{ 2 * 1024 * 1024 * 1024 }}"
+ max: "{{ 12 * 1024 * 1024 * 1024 }}"
+
zfs_zpools:
storage:
mountpoint: /srv/storage
create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
-
-# zfs_arc_size:
-# min: "{{ 2 * 1024 * 1024 * 1024 }}"
-# max: "{{ 16 * 1024 * 1024 * 1024 }}"
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index 723d0b5c..f9bfb0bb 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -10,6 +10,33 @@ install:
network: {}
base_intel_nic_stability_fix: true
+ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan }}"
+
+apt_repo_components:
+- main
+- contrib ## for zfs
+- non-free ## for microcode updates
+
+
+cryptdisk_volumes:
+ crypto-nvme0:
+ passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme0'].passphrase }}"
+ device: /dev/disk/by-id/nvme-eui.0025388291b201dc-part3
+ crypto-nvme1:
+ passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme1'].passphrase }}"
+ device: /dev/disk/by-id/nvme-eui.0025388291b201cb-part3
+
+
+zfs_use_systemd_mount_generator: no
+zfs_arc_size:
+ min: "{{ 2 * 1024 * 1024 * 1024 }}"
+ max: "{{ 8 * 1024 * 1024 * 1024 }}"
+
+zfs_zpools:
+ storage:
+ mountpoint: /srv/storage
+ create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
+
vm_host:
network:
@@ -37,28 +64,3 @@ vm_host:
ele-gwhetzner: 2
ch-mimas: 6
sk-testvm: 7
-
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan }}"
-
-apt_repo_components:
-- main
-- contrib ## for zfs
-- non-free ## for microcode updates
-
-cryptdisk_volumes:
- crypto-nvme0:
- passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme0'].passphrase }}"
- device: /dev/disk/by-id/nvme-eui.0025388291b201dc-part3
- crypto-nvme1:
- passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme1'].passphrase }}"
- device: /dev/disk/by-id/nvme-eui.0025388291b201cb-part3
-
-
-zfs_zpools:
- storage:
- mountpoint: /srv/storage
- create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
-
-zfs_arc_size:
- min: "{{ 2 * 1024 * 1024 * 1024 }}"
- max: "{{ 8 * 1024 * 1024 * 1024 }}"
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml
index 15dcb860..085a9c95 100644
--- a/inventory/host_vars/sk-cloudia/vars.yml
+++ b/inventory/host_vars/sk-cloudia/vars.yml
@@ -11,15 +11,17 @@ network: {}
base_intel_nic_stability_fix: true
-zfs_zpools:
- storage:
- mountpoint: /srv/storage
- create_vdevs: mirror nvme0n1p3 nvme1n1p3
+zfs_use_systemd_mount_generator: no
zfs_arc_size:
min: "{{ 2 * 1024 * 1024 * 1024 }}"
max: "{{ 16 * 1024 * 1024 * 1024 }}"
+zfs_zpools:
+ storage:
+ mountpoint: /srv/storage
+ create_vdevs: mirror nvme0n1p3 nvme1n1p3
+
docker_zfs:
pool: storage