... found easier way to get cloud-init running.

syself · Mar 13, 2024 · 95bd125 · 95bd125
1 parent 664e364
commit 95bd125
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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