From aefc5ffb371e8d1cf0cc73f6cc733e5f5f7af8aa Mon Sep 17 00:00:00 2001 From: Kevin Reeuwijk Date: Wed, 6 Aug 2025 14:45:56 +0200 Subject: [PATCH 1/2] Disable hardcoded MaaS curtin scripts --- .../roles/providers/tasks/maas-ubuntu.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml b/images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml index 7f67a0fa3c..2a2333f966 100644 --- a/images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml +++ b/images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml @@ -4,12 +4,13 @@ state: directory mode: "0775" -- name: Copy curtin scripts to /curtin - ansible.builtin.copy: - src: "files/maas/curtin/{{ item }}" - dest: "/curtin/{{ item }}" - mode: "0750" - loop: - - curtin-hooks - - install-custom-packages - - setup-bootloader +# Don't copy in hard-coded scripts as modern MaaS already has builtin tasks that are more flexible and powerful +# - name: Copy curtin scripts to /curtin +# ansible.builtin.copy: +# src: "files/maas/curtin/{{ item }}" +# dest: "/curtin/{{ item }}" +# mode: "0750" +# loop: +# - curtin-hooks +# - install-custom-packages +# - setup-bootloader From 1d8283ced133b3ed04e6a71a4640b0593ecc10d3 Mon Sep 17 00:00:00 2001 From: Kevin Reeuwijk Date: Sun, 10 Aug 2025 09:24:20 +0200 Subject: [PATCH 2/2] Add instructions for re-enabling custom curtin hooks Co-authored-by: Matt Boersma --- images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml b/images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml index 2a2333f966..33cbb8ea7f 100644 --- a/images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml +++ b/images/capi/ansible/roles/providers/tasks/maas-ubuntu.yml @@ -4,7 +4,7 @@ state: directory mode: "0775" -# Don't copy in hard-coded scripts as modern MaaS already has builtin tasks that are more flexible and powerful +# Uncomment this ansible task and customize the curtin scripts to replace the builtin MaaS curtin hooks # - name: Copy curtin scripts to /curtin # ansible.builtin.copy: # src: "files/maas/curtin/{{ item }}"