From 07de0ec62956c3dd51029da131988a16c05e8b48 Mon Sep 17 00:00:00 2001
From: Nikholas Pcenicni <82239765+nikpcenicni@users.noreply.github.com>
Date: Wed, 13 May 2026 20:28:48 -0400
Subject: [PATCH] Add --timeout option to Longhorn Helm upgrade tasks for
 improved deployment control

---
 ansible/roles/noble_longhorn/defaults/main.yml | 4 ++++
 ansible/roles/noble_longhorn/tasks/main.yml    | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 ansible/roles/noble_longhorn/defaults/main.yml

diff --git a/ansible/roles/noble_longhorn/defaults/main.yml b/ansible/roles/noble_longhorn/defaults/main.yml
new file mode 100644
index 0000000..ff43501
--- /dev/null
+++ b/ansible/roles/noble_longhorn/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+# Helm --wait default (5m) is often too short for first Longhorn install on several nodes
+# (image pulls + manager/driver ordering). See ansible/roles/noble_metallb/defaults/main.yml.
+noble_helm_longhorn_wait_timeout: 20m
diff --git a/ansible/roles/noble_longhorn/tasks/main.yml b/ansible/roles/noble_longhorn/tasks/main.yml
index 60eeb96..1d76add 100644
--- a/ansible/roles/noble_longhorn/tasks/main.yml
+++ b/ansible/roles/noble_longhorn/tasks/main.yml
@@ -27,6 +27,8 @@
       - "{{ noble_repo_root }}/clusters/noble/bootstrap/longhorn/values.yaml"
       - --force-conflicts
       - --wait
+      - --timeout
+      - "{{ noble_helm_longhorn_wait_timeout }}"
   environment:
     KUBECONFIG: "{{ noble_kubeconfig }}"
   changed_when: true