fix #17

Author: sp-yduck

cloud/services/compute/instance/cloudinit.go

@@ -11,14 +11,14 @@ import (
 	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scope"
 )
 
-// reconcileCloudInit
-func reconcileCloudInit(s *Service, vmid int, bootstrap string) error {
-	vmName := s.scope.Name()
-	storageName := s.scope.GetStorage().Name
-	cloudInit := s.scope.GetCloudInit()
+const (
+	userSnippetPathFormat = "snippets/%s-user.yml"
+)
 
+// reconcileCloudInit
+func (s *Service) reconcileCloudInit(bootstrap string) error {
 	// user
-	if err := reconcileCloudInitUser(vmid, vmName, storageName, bootstrap, *cloudInit.User, s.remote); err != nil {
+	if err := s.reconcileCloudInitUser(bootstrap); err != nil {
 		return err
 	}
 	return nil
@@ -27,7 +27,8 @@ func reconcileCloudInit(s *Service, vmid int, bootstrap string) error {
 // delete CloudConfig
 func (s *Service) deleteCloudConfig() error {
 	storageName := s.scope.GetStorage().Name
-	volumeID := fmt.Sprintf("%s:snippets/%s-user.yml", storageName, s.scope.Name())
+	path := userSnippetPath(s.scope.Name())
+	volumeID := fmt.Sprintf("%s:%s", storageName, path)
 
 	node, err := s.client.Node(s.scope.NodeName())
 	if err != nil {
@@ -48,14 +49,17 @@ func (s *Service) deleteCloudConfig() error {
 	return content.DeleteVolume()
 }
 
-func reconcileCloudInitUser(vmid int, vmName, storageName, bootstrap string, config infrav1.User, ssh scope.SSHClient) error {
-	base := baseUserData(vmName)
+func (s *Service) reconcileCloudInitUser(bootstrap string) error {
+	vmName := s.scope.Name()
+	storagePath := s.scope.GetStorage().Path
+	config := s.scope.GetCloudInit().User
 
 	bootstrapConfig, err := cloudinit.ParseUser(bootstrap)
 	if err != nil {
 		return err
 	}
-	additional, err := cloudinit.MergeUsers(config, base)
+	base := baseUserData(vmName)
+	additional, err := cloudinit.MergeUsers(*config, base)
 	if err != nil {
 		return err
 	}
@@ -71,15 +75,18 @@ func reconcileCloudInitUser(vmid int, vmName, storageName, bootstrap string, con
 	klog.Info(configYaml)
 
 	// to do: should be set via API
-	// to do: storage path
-	out, err := ssh.RunWithStdin(fmt.Sprintf("tee /var/lib/vz/%s/snippets/%s-user.yml", storageName, vmName), configYaml)
+	out, err := s.remote.RunWithStdin(fmt.Sprintf("tee %s/%s", storagePath, userSnippetPath(vmName)), configYaml)
 	if err != nil {
 		return errors.Errorf("ssh command error : %s : %v", out, err)
 	}
 
 	return nil
 }
 
+func userSnippetPath(vmName string) string {
+	return fmt.Sprintf(userSnippetPathFormat, vmName)
+}
+
 // DEPRECATED : cicustom should be set via API
 func ApplyCICustom(vmid int, vmName, storageName, ciType string, ssh scope.SSHClient) error {
 	if !cloudinit.IsValidType(ciType) {

cloud/services/compute/instance/qemu.go

@@ -129,7 +129,7 @@ func generateVMOptions(vmName, storageName string, network infrav1.Network, hard
 		NameServer:   network.NameServer,
 		Boot:         "order=scsi0",
 		Ide:          vm.Ide{Ide2: fmt.Sprintf("file=%s:cloudinit,media=cdrom", storageName)},
-		CiCustom:     fmt.Sprintf("user=%s:snippets/%s-user.yml", storageName, vmName),
+		CiCustom:     fmt.Sprintf("user=%s:%s", storageName, userSnippetPath(vmName)),
 		IPConfig:     vm.IPConfig{IPConfig0: network.IPConfig.String()},
 		OSType:       vm.L26,
 		Net:          vm.Net{Net0: "model=virtio,bridge=vmbr0,firewall=1"},

cloud/services/compute/instance/reconcile.go

@@ -207,7 +207,7 @@ func (s *Service) CreateInstance(ctx context.Context, bootstrap string) (*vm.Vir
 	log.Info(fmt.Sprintf("reconciled qemu: node=%s,vmid=%d", vm.Node.Name(), vmid))
 
 	// cloud init
-	if err := reconcileCloudInit(s, vmid, bootstrap); err != nil {
+	if err := s.reconcileCloudInit(bootstrap); err != nil {
 		return nil, err
 	}