From 9dc88e6db679d63843b14da82544ae5213ddfed5 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Wed, 2 Apr 2025 20:35:04 +1100
Subject: [PATCH] feat: deep merge zpools/datasets (#243)

- change prodnxsr0009 to use nvme0n1 as zfs device

Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/243
---
 hieradata/common.yaml                            | 6 ++++++
 hieradata/nodes/prodnxsr0009.main.unkin.net.yaml | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ecd78e5..89cec33 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -143,6 +143,12 @@ lookup_options:
   limits::entries:
     merge:
       strategy: deep
+  zfs::zpools:
+    merge:
+      strategy: deep
+  zfs::datasets:
+    merge:
+      strategy: deep
 
 facts_path: '/opt/puppetlabs/facter/facts.d'
 
diff --git a/hieradata/nodes/prodnxsr0009.main.unkin.net.yaml b/hieradata/nodes/prodnxsr0009.main.unkin.net.yaml
index 6a43056..8ae6946 100644
--- a/hieradata/nodes/prodnxsr0009.main.unkin.net.yaml
+++ b/hieradata/nodes/prodnxsr0009.main.unkin.net.yaml
@@ -8,3 +8,8 @@ networking::interfaces:
 networking::routes:
   default:
     gateway: 198.18.15.254
+
+zfs::zpools:
+  fastpool:
+    ensure: present
+    disk: /dev/nvme0n1