From e3c575d2944d6d1022c949df1bdbdb788d4bbfb6 Mon Sep 17 00:00:00 2001
From: Matt Boersma <Matt.Boersma@microsoft.com>
Date: Tue, 23 Apr 2024 14:57:08 -0600
Subject: [PATCH] Don't require python3-distutils

---
 .../capi/ansible/roles/node/defaults/main.yml |  1 -
 images/capi/packer/goss/goss-vars.yaml        | 23 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/images/capi/ansible/roles/node/defaults/main.yml b/images/capi/ansible/roles/node/defaults/main.yml
index 65b4c7b9b2..f7959fe243 100644
--- a/images/capi/ansible/roles/node/defaults/main.yml
+++ b/images/capi/ansible/roles/node/defaults/main.yml
@@ -58,7 +58,6 @@ common_debs:
   - libnetfilter-acct1
   - libnetfilter-cttimeout1
   - libnetfilter-log1
-  - python3-distutils
   - python3-netifaces
   - python3-pip
   - socat
diff --git a/images/capi/packer/goss/goss-vars.yaml b/images/capi/packer/goss/goss-vars.yaml
index 3a97736b08..ae3a8bb50a 100644
--- a/images/capi/packer/goss/goss-vars.yaml
+++ b/images/capi/packer/goss/goss-vars.yaml
@@ -45,7 +45,6 @@ common_debs: &common_debs
   libnetfilter-acct1:
   libnetfilter-cttimeout1:
   libnetfilter-log1:
-  python3-distutils:
   python3-netifaces:
   python3-pip:
   socat:
@@ -553,8 +552,8 @@ windows:
       - Manual
       - Stopped
     kubelet:
-      expected: 
-      - Automatic 
+      expected:
+      - Automatic
       - "/RequiredServices.+:.+(containerd|docker)/"
     sshd:
       expected:
@@ -564,8 +563,8 @@ windows:
   azure:
     windows-service:
 
-    files: 
-      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init.conf': 
+    files:
+      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init.conf':
         exists: true
         filetype: file
         contains:
@@ -580,11 +579,11 @@ windows:
   ova:
     windows-service:
       vmtools:
-        expected: 
-        - Automatic 
+        expected:
+        - Automatic
         - Running
     files:
-      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init.conf': 
+      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init.conf':
         exists: true
         filetype: file
         contains:
@@ -599,7 +598,7 @@ windows:
         - "cloudbaseinit.plugins.common.localscripts.LocalScriptsPlugin"
         - "cloudbaseinit.plugins.windows.createuser.CreateUserPlugin"
         - "cloudbaseinit.plugins.windows.extendvolumes.ExtendVolumesPlugin"
-      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init-unattend.conf': 
+      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init-unattend.conf':
         exists: true
         filetype: file
         contains:
@@ -608,7 +607,7 @@ windows:
     windows-service:
 
     files:
-      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init.conf': 
+      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init.conf':
         exists: true
         filetype: file
         contains:
@@ -623,7 +622,7 @@ windows:
     windows-service:
 
     files:
-      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init.conf': 
+      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init.conf':
         exists: true
         filetype: file
         contains:
@@ -637,7 +636,7 @@ windows:
         - "cloudbaseinit.plugins.common.localscripts.LocalScriptsPlugin"
         - "cloudbaseinit.plugins.windows.createuser.CreateUserPlugin"
         - "cloudbaseinit.plugins.windows.extendvolumes.ExtendVolumesPlugin"
-      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init-unattend.conf': 
+      'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init-unattend.conf':
         exists: true
         filetype: file
         contains: