From 95bd1253e89630c461eac420be0445b3d0fe25fb Mon Sep 17 00:00:00 2001
From: Thomas Guettler <thomas.guettler@syself.com>
Date: Wed, 13 Mar 2024 20:51:47 +0100
Subject: [PATCH] ... found easier way to get cloud-init running.

---
 pkg/services/baremetal/host/host.go                        | 2 +-
 .../bases/hetznerbaremetal-mt-control-plane-ubuntu.yaml    | 7 +------
 .../bases/hetznerbaremetal-mt-md-1-ubuntu.yaml             | 7 +------
 templates/cluster-templates/cluster-class.yaml             | 7 +------
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/pkg/services/baremetal/host/host.go b/pkg/services/baremetal/host/host.go
index 4f5536fcc..85fcffb83 100644
--- a/pkg/services/baremetal/host/host.go
+++ b/pkg/services/baremetal/host/host.go
@@ -993,7 +993,7 @@ func (s *Service) actionImageInstalling() actionResult {
 
 		// Some other error like connection timeout. Retry again later.
 		// This often during provisioning.
-		msg := fmt.Sprintf("DetectLinuxOnAnotherDisk failed (will retry): %s. StdErr: %s (%s)",
+		msg := fmt.Sprintf("will retry: %s. StdErr: %s (%s)",
 			out.StdOut, out.StdErr, out.Err.Error())
 		conditions.MarkFalse(
 			s.scope.HetznerBareMetalHost,
diff --git a/templates/cluster-templates/bases/hetznerbaremetal-mt-control-plane-ubuntu.yaml b/templates/cluster-templates/bases/hetznerbaremetal-mt-control-plane-ubuntu.yaml
index 5b9f0e075..b86661dd6 100644
--- a/templates/cluster-templates/bases/hetznerbaremetal-mt-control-plane-ubuntu.yaml
+++ b/templates/cluster-templates/bases/hetznerbaremetal-mt-control-plane-ubuntu.yaml
@@ -23,12 +23,7 @@ spec:
           mkdir -p /etc/cloud/cloud.cfg.d && touch /etc/cloud/cloud.cfg.d/99-custom-networking.cfg
           echo "network: { config: disabled }" > /etc/cloud/cloud.cfg.d/99-custom-networking.cfg
           apt-get update && apt-get install -y cloud-init apparmor apparmor-utils
-          cat << 'EOF' > /etc/cloud/cloud.cfg.d/99-nocloud.cfg
-          datasource_list: [ NoCloud ]
-          datasource:
-            NoCloud:
-              seedfrom: /var/lib/cloud/seed/nocloud-net/
-          EOF
+          cloud-init clean --logs
       sshSpec:
         portAfterInstallImage: 22
         portAfterCloudInit: 22
diff --git a/templates/cluster-templates/bases/hetznerbaremetal-mt-md-1-ubuntu.yaml b/templates/cluster-templates/bases/hetznerbaremetal-mt-md-1-ubuntu.yaml
index b6b2da156..e8b3b5f6c 100644
--- a/templates/cluster-templates/bases/hetznerbaremetal-mt-md-1-ubuntu.yaml
+++ b/templates/cluster-templates/bases/hetznerbaremetal-mt-md-1-ubuntu.yaml
@@ -23,12 +23,7 @@ spec:
           mkdir -p /etc/cloud/cloud.cfg.d && touch /etc/cloud/cloud.cfg.d/99-custom-networking.cfg
           echo "network: { config: disabled }" > /etc/cloud/cloud.cfg.d/99-custom-networking.cfg
           apt-get update && apt-get install -y cloud-init apparmor apparmor-utils
-          cat << 'EOF' > /etc/cloud/cloud.cfg.d/99-nocloud.cfg
-          datasource_list: [ NoCloud ]
-          datasource:
-            NoCloud:
-              seedfrom: /var/lib/cloud/seed/nocloud-net/
-          EOF
+          cloud-init clean --logs
       sshSpec:
         portAfterInstallImage: 22
         portAfterCloudInit: 22
diff --git a/templates/cluster-templates/cluster-class.yaml b/templates/cluster-templates/cluster-class.yaml
index fa918f62c..2dcebecbc 100644
--- a/templates/cluster-templates/cluster-class.yaml
+++ b/templates/cluster-templates/cluster-class.yaml
@@ -695,12 +695,7 @@ spec:
           mkdir -p /etc/cloud/cloud.cfg.d && touch /etc/cloud/cloud.cfg.d/99-custom-networking.cfg
           echo "network: { config: disabled }" > /etc/cloud/cloud.cfg.d/99-custom-networking.cfg
           apt-get update && apt-get install -y cloud-init apparmor apparmor-utils
-          cat << 'EOF' > /etc/cloud/cloud.cfg.d/99-nocloud.cfg
-          datasource_list: [ NoCloud ]
-          datasource:
-            NoCloud:
-              seedfrom: /var/lib/cloud/seed/nocloud-net/
-          EOF
+          cloud-init clean --logs
       sshSpec:
         portAfterCloudInit: 22
         portAfterInstallImage: 22