summaryrefslogtreecommitdiff
path: root/inventory
diff options
context:
space:
mode:
Diffstat (limited to 'inventory')
-rw-r--r--inventory/host_vars/ch-mimas.yml3
-rw-r--r--inventory/host_vars/ele-gwhetzner.yml3
-rw-r--r--inventory/host_vars/emc-master.yml11
-rw-r--r--inventory/host_vars/lw-master.yml11
-rw-r--r--inventory/host_vars/sk-2019vm.yml14
-rw-r--r--inventory/host_vars/sk-testvm.yml3
-rw-r--r--inventory/host_vars/sk-torrent.yml6
7 files changed, 26 insertions, 25 deletions
diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index 9a89fe7c..194ecbb7 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -10,8 +10,7 @@ install:
virtio:
vda:
type: zfs
- pool: storage
- name: "{{ inventory_hostname }}"
+ name: root
size: 62g
interfaces:
- bridge: br-public
diff --git a/inventory/host_vars/ele-gwhetzner.yml b/inventory/host_vars/ele-gwhetzner.yml
index 7ebda8ff..98f5fb6e 100644
--- a/inventory/host_vars/ele-gwhetzner.yml
+++ b/inventory/host_vars/ele-gwhetzner.yml
@@ -10,8 +10,7 @@ install:
scsi:
sda:
type: zfs
- pool: storage
- name: "{{ inventory_hostname }}"
+ name: root
size: 5g
interfaces:
- bridge: br-public
diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
index e89463a9..71fe8c75 100644
--- a/inventory/host_vars/emc-master.yml
+++ b/inventory/host_vars/emc-master.yml
@@ -10,14 +10,11 @@ install:
scsi:
sda:
type: zfs
- pool: storage
- name: "{{ inventory_hostname }}"
+ name: root
size: 20g
- sdb:
- type: zfs
- pool: storage
- name: "streamstats"
- size: 50g
+ # sdb:
+ # type: image
+ # path: /dev/zvol/storage/streamstats
interfaces:
- bridge: br-public
name: primary0
diff --git a/inventory/host_vars/lw-master.yml b/inventory/host_vars/lw-master.yml
index e89463a9..71fe8c75 100644
--- a/inventory/host_vars/lw-master.yml
+++ b/inventory/host_vars/lw-master.yml
@@ -10,14 +10,11 @@ install:
scsi:
sda:
type: zfs
- pool: storage
- name: "{{ inventory_hostname }}"
+ name: root
size: 20g
- sdb:
- type: zfs
- pool: storage
- name: "streamstats"
- size: 50g
+ # sdb:
+ # type: image
+ # path: /dev/zvol/storage/streamstats
interfaces:
- bridge: br-public
name: primary0
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index f9bfb0bb..705ff929 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -27,7 +27,6 @@ cryptdisk_volumes:
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 }}"
@@ -37,6 +36,15 @@ zfs_zpools:
mountpoint: /srv/storage
create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
+zfs_sanoid_modules:
+ storage/vm:
+ use_template: production
+ recursive: yes
+ process_children_only: yes
+ storage/vm/sk-testvm:
+ use_template: ignore
+ recursive: yes
+
vm_host:
network:
@@ -64,3 +72,7 @@ vm_host:
ele-gwhetzner: 2
ch-mimas: 6
sk-testvm: 7
+ zfs:
+ default:
+ pool: storage
+ name: vm
diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml
index 6ee92378..5d9561f0 100644
--- a/inventory/host_vars/sk-testvm.yml
+++ b/inventory/host_vars/sk-testvm.yml
@@ -10,8 +10,7 @@ install:
scsi:
sda:
type: zfs
- pool: storage
- name: "{{ inventory_hostname }}"
+ name: root
size: 10g
interfaces:
- bridge: br-public
diff --git a/inventory/host_vars/sk-torrent.yml b/inventory/host_vars/sk-torrent.yml
index cdf5f94a..8135dde0 100644
--- a/inventory/host_vars/sk-torrent.yml
+++ b/inventory/host_vars/sk-torrent.yml
@@ -10,13 +10,11 @@ install:
scsi:
sda:
type: zfs
- pool: storage
- name: "{{ inventory_hostname }}"
+ name: root
size: 10g
sdb:
type: zfs
- pool: storage
- name: "{{ inventory_hostname }}-data"
+ name: data
size: 180g
interfaces:
- bridge: br-public