From 8b2c6d8faf65426d9c79d9d55b0279131cdfdbe4 Mon Sep 17 00:00:00 2001 From: caoxianfei1 Date: Wed, 22 Nov 2023 16:16:34 +0800 Subject: [PATCH] [fix] fix pool set Signed-off-by: caoxianfei1 --- cli/command/deploy.go | 2 -- cli/command/migrate.go | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cli/command/deploy.go b/cli/command/deploy.go index a17e540f5..c4f9f3e69 100644 --- a/cli/command/deploy.go +++ b/cli/command/deploy.go @@ -245,8 +245,6 @@ func genDeployPlaybook(curveadm *cli.CurveAdm, options[comm.POOLSET_DISK_TYPE] = diskType } else if step == CREATE_LOGICAL_POOL { options[comm.KEY_CREATE_POOL_TYPE] = comm.POOL_TYPE_LOGICAL - options[comm.POOLSET] = poolset - options[comm.POOLSET_DISK_TYPE] = diskType } pb.AddStep(&playbook.PlaybookStep{ diff --git a/cli/command/migrate.go b/cli/command/migrate.go index dc1f89e0d..6a3254642 100644 --- a/cli/command/migrate.go +++ b/cli/command/migrate.go @@ -103,7 +103,7 @@ var ( ) type migrateOptions struct { - filename string + filename string poolset string poolsetDiskType string } @@ -184,7 +184,7 @@ func getMigrates(curveadm *cli.CurveAdm, data string) []*configure.MigrateServer } func genMigratePlaybook(curveadm *cli.CurveAdm, - dcs []*topology.DeployConfig, options migrateOptions,data string) (*playbook.Playbook, error) { + dcs []*topology.DeployConfig, options migrateOptions, data string) (*playbook.Playbook, error) { diffs, _ := diffTopology(curveadm, data) dcs2add := diffs[topology.DIFF_ADD] dcs2del := diffs[topology.DIFF_DELETE] @@ -224,8 +224,6 @@ func genMigratePlaybook(curveadm *cli.CurveAdm, options[comm.KEY_CREATE_POOL_TYPE] = comm.POOL_TYPE_LOGICAL options[comm.KEY_MIGRATE_SERVERS] = migrates options[comm.KEY_NEW_TOPOLOGY_DATA] = data - options[comm.POOLSET] = poolset - options[comm.POOLSET_DISK_TYPE] = poolsetDiskType case playbook.UPDATE_TOPOLOGY: options[comm.KEY_NEW_TOPOLOGY_DATA] = data }