microcloud/cmd/microcloud: Update microceph disk args

Signed-off-by: Wesley Hershberger <[email protected]>
canonical · Apr 10, 2024 · d04299d · d04299d
1 parent 4fa7264
commit d04299d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/microcloud/cmd/microcloud/ask.go b/microcloud/cmd/microcloud/ask.go
@@ -458,7 +458,13 @@ func (c *CmdControl) askRemotePool(systems map[string]InitSystem, autoSetup bool
 			system.MicroCephDisks = []cephTypes.DisksPost{}
 		}
 
-		system.MicroCephDisks = append(system.MicroCephDisks, cephTypes.DisksPost{Path: path, Wipe: wipeMap[entry]})
+		system.MicroCephDisks = append(
+			system.MicroCephDisks,
+			cephTypes.DisksPost{
+				Path: []string{path},
+				Wipe: wipeMap[entry],
+			},
+		)
 
 		systems[target] = system
 	}

diff --git a/microcloud/cmd/microcloud/main_init.go b/microcloud/cmd/microcloud/main_init.go
@@ -445,7 +445,7 @@ func setupCluster(s *service.Handler, systems map[string]InitSystem) error {
 			}
 
 			logger.Debug("Adding disk to MicroCeph", logger.Ctx{"peer": s.Name, "disk": disk.Path})
-			err = cephClient.AddDisk(context.Background(), c, &disk)
+			_, err = cephClient.AddDisk(context.Background(), c, &disk)
 			if err != nil {
 				return err
 			}

diff --git a/microcloud/cmd/microcloud/main_init_preseed.go b/microcloud/cmd/microcloud/main_init_preseed.go
@@ -497,7 +497,13 @@ func (p *Preseed) Parse(s *service.Handler, bootstrap bool) (map[string]InitSyst
 		}
 
 		for _, disk := range directCeph {
-			system.MicroCephDisks = append(system.MicroCephDisks, cephTypes.DisksPost{Path: disk.Path, Wipe: disk.Wipe})
+			system.MicroCephDisks = append(
+				system.MicroCephDisks,
+				cephTypes.DisksPost{
+					Path: []string{disk.Path},
+					Wipe: disk.Wipe,
+				},
+			)
 		}
 
 		// Setup ceph pool for disks specified to MicroCeph.
@@ -566,7 +572,13 @@ func (p *Preseed) Parse(s *service.Handler, bootstrap bool) (map[string]InitSyst
 			}
 
 			for _, disk := range matched {
-				system.MicroCephDisks = append(system.MicroCephDisks, cephTypes.DisksPost{Path: parseDiskPath(disk), Wipe: filter.Wipe})
+				system.MicroCephDisks = append(
+					system.MicroCephDisks,
+					cephTypes.DisksPost{
+						Path: []string{parseDiskPath(disk)},
+						Wipe: filter.Wipe,
+					},
+				)
 				// There should only be one ceph pool per system.
 				if !addedCephPool {
 					if bootstrap {