■ ■ ■ ■ ■ ■
pkg/service/cluster_storage_provisioner.go
| skipped 125 lines |
126 | 126 | | playbook := c.loadPlayBookName(dp, creation.Vars) |
127 | 127 | | task := model.TaskLogDetail{ |
128 | 128 | | ID: dp.ID, |
| 129 | + | Name: fmt.Sprintf("%s (%s)", dp.Name, dp.Type), |
129 | 130 | | Task: fmt.Sprintf("%s (%s)", playbook, constant.StatusEnabled), |
130 | 131 | | ClusterID: cluster.ID, |
131 | 132 | | LastProbeTime: time.Now().Unix(), |
| skipped 67 lines |
199 | 200 | | playbook := c.loadPlayBookName(provisioner, Vars) |
200 | 201 | | task := model.TaskLogDetail{ |
201 | 202 | | ID: fmt.Sprintf("%s (%s)", provisioner.ID, constant.StatusDisabled), |
| 203 | + | Name: fmt.Sprintf("%s (%s)", provisioner.Name, provisioner.Type), |
202 | 204 | | Task: fmt.Sprintf("%s (%s)", playbook, constant.StatusDisabled), |
203 | 205 | | ClusterID: cluster.ID, |
204 | 206 | | LastProbeTime: time.Now().Unix(), |
| skipped 88 lines |
293 | 295 | | } |
294 | 296 | | c.changeStatus(provisioner, constant.StatusRunning, nil) |
295 | 297 | | case "rook-ceph": |
296 | | - | if err := phases.WaitForDeployRunning(provisioner.Namespace, "rook-ceph-operator", client); err != nil { |
| 298 | + | if err := phases.WaitForDeployRunning("rook-ceph", "rook-ceph-operator", client); err != nil { |
297 | 299 | | c.changeStatus(provisioner, constant.StatusFailed, err) |
298 | 300 | | continue |
299 | 301 | | } |
| skipped 91 lines |
391 | 393 | | if err != nil { |
392 | 394 | | return admCluster, writer, err |
393 | 395 | | } |
| 396 | + | admCluster.Kobe.SetVar(facts.ProvisionerNamespaceFactName, provisioner.Namespace) |
394 | 397 | | |
395 | 398 | | switch provisioner.Type { |
396 | 399 | | case "nfs": |
397 | 400 | | admCluster.Kobe.SetVar(facts.EnableNfsFactName, operation) |
398 | | - | case "gfs": |
| 401 | + | case "glusterfs": |
399 | 402 | | admCluster.Kobe.SetVar(facts.EnableGfsFactName, operation) |
400 | 403 | | case "external-ceph-block": |
401 | | - | fmt.Println(facts.EnableCephBlockFactName, operation) |
402 | 404 | | admCluster.Kobe.SetVar(facts.EnableCephBlockFactName, operation) |
403 | 405 | | case "external-cephfs": |
404 | 406 | | admCluster.Kobe.SetVar(facts.EnableCephFsFactName, operation) |
| skipped 12 lines |