Skip to content

Commit

Permalink
[fix] fix pool set
Browse files Browse the repository at this point in the history
Signed-off-by: caoxianfei1 <[email protected]>
  • Loading branch information
caoxianfei1 committed Nov 22, 2023
1 parent 81675ff commit 8b2c6d8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions cli/command/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
6 changes: 2 additions & 4 deletions cli/command/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ var (
)

type migrateOptions struct {
filename string
filename string
poolset string
poolsetDiskType string
}
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit 8b2c6d8

Please sign in to comment.