sk-tomnext and both VMs running on it are finally done

4 files changed, 101 insertions, 10 deletions

diff --git a/inventory/host_vars/sk-tomnext-hp.yml b/inventory/host_vars/sk-tomnext-hp.yml
new file mode 100644
index 00000000..68b924c7
--- /dev/null
+++ b/inventory/host_vars/sk-tomnext-hp.yml
@@ -0,0 +1,32 @@
+---
+vm_host: sk-tomnext
+
+install:
+  host: "{{ vm_host }}"
+  mem: 8192
+  numcpu: 4
+  disks:
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: zfs
+        name: root
+        size: 50g
+  interfaces:
+  - bridge: br-public
+    name: primary0
+    autostart: True
+
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
+  domain: "{{ host_domain }}"
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary:
+    interface: primary0
+    ip: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('netmask') }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('address') }}"
+    overlay: "{{ (hostvars[vm_host].vm_host.network.bridges.public.overlay.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
+
+external_ip: "{{ network.primary.overlay }}"
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index a302a298..19117003 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -11,15 +11,15 @@ install:
       sda:
         type: zfs
         name: root
-        size: 50g
+        size: 15g
       sdb:
         type: zfs
         name: data
-        size: 20g
+        size: 600g
   interfaces:
   - bridge: br-public
     name: primary0
-  autostart: False
+  autostart: True
 
 network:
   nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
@@ -34,3 +34,63 @@ network:
     overlay: "{{ (hostvars[vm_host].vm_host.network.bridges.public.overlay.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
 
 external_ip: "{{ network.primary.overlay }}"
+
+
+apt_repo_components:
+- main
+- contrib  ## for zfs
+
+
+zfs_arc_size:
+  min: "{{ 2 * 1024 * 1024 * 1024 }}"
+  max: "{{ 8 * 1024 * 1024 * 1024 }}"
+
+zfs_zpools:
+  storage:
+    mountpoint: /srv/storage
+    create_vdevs: /dev/sdb
+
+zfs_sanoid_modules:
+  storage/nextcloud:
+    use_template: production
+    recursive: yes
+    process_children_only: yes
+
+
+docker_zfs:
+  pool: storage
+  name: docker
+  size: 15G
+
+kubelet_zfs:
+  pool: storage
+  name: kubelet
+  size: 15G
+
+kubernetes_version: 1.18.3
+kubernetes_container_runtime: docker
+kubernetes_standalone_max_pods: 15
+kubernetes_standalone_pod_cidr: 192.168.255.0/24
+kubernetes_standalone_cni_variant: with-portmap
+
+
+acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}"
+
+
+nextcloud_zfs:
+  pool: storage
+  name: nextcloud
+  size: 500G
+
+nextcloud_instances:
+  team.tomwaitz.eu:
+    # new: true
+    version: 18.0.4
+    port: 8100
+    hostnames:
+      - team.tomwaitz.eu
+    quota: 100G
+    database:
+      type: mariadb
+      version: 10.5.3
+      password: "{{ vault_nextcloud_database_passwords['team.tomwaitz.eu'] }}"
diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml
index 57f3dcf1..22a96897 100644
--- a/inventory/host_vars/sk-tomnext.yml
+++ b/inventory/host_vars/sk-tomnext.yml
@@ -10,7 +10,6 @@ install:
 network: {}
 
 base_intel_nic_stability_fix: true
-
 ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan }}"
 
 apt_repo_components:
@@ -18,6 +17,7 @@ apt_repo_components:
 - contrib  ## for zfs
 - non-free ## for microcode updates
 
+
 cryptdisk_volumes:
   crypto-nvme0:
     passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme0'].passphrase }}"
@@ -36,16 +36,14 @@ zfs_zpools:
     mountpoint: /srv/storage
     create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
 
-
 zfs_sanoid_modules:
-  storage/docker:
-    use_template: ignore
-  storage/kubelet:
-    use_template: ignore
   storage/vm:
     use_template: production
     recursive: yes
     process_children_only: yes
+  storage/vm/sk-tomnext-nc:
+    use_template: ignore
+    recursive: yes
 
 
 vm_host:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 02d900e2..edc73ac1 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -130,7 +130,7 @@ sk-cloudia host_name=cloudia
 sk-2019vm host_name=2019vm
 sk-tomnext host_name=tomnext
 sk-tomnext-nc host_name=tomnext-nc
-sk-tomnext-hp
+sk-tomnext-hp host_name=homepage host_domain=""
 sk-testvm host_name=testvm
 sk-torrent host_name=torrent
 
@@ -311,6 +311,7 @@ k8s-lwl
 sk-cloudia
 ele-thetys
 lw-thetys
+sk-tomnext-nc
 
 [kubernetes:children]
 kubernetes-cluster