Merge pull request #264 from SeanHai/auth

fix generate target.json when curvefs
opencurve · Jul 6, 2023 · 60cee71 · 60cee71
2 parents d750c94 + 8c55ada
commit 60cee71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cli/command/client/map.go b/cli/command/client/map.go
@@ -174,6 +174,9 @@ func genMapPlaybook(curveadm *cli.CurveAdm,
 	steps := MAP_PLAYBOOK_STEPS
 	pb := playbook.NewPlaybook(curveadm)
 	for _, step := range steps {
+		if step == playbook.CREATE_VOLUME && !options.create {
+			continue
+		}
 		pb.AddStep(&playbook.PlaybookStep{
 			Type:    step,
 			Configs: ccs,

diff --git a/internal/configure/monitor.go b/internal/configure/monitor.go
@@ -208,7 +208,8 @@ func parsePrometheusTarget(dcs []*topology.DeployConfig) (string, error) {
 		case topology.ROLE_ETCD:
 			item = fmt.Sprintf("%s:%d", ip, dc.GetListenClientPort())
 		case topology.ROLE_MDS,
-			topology.ROLE_CHUNKSERVER:
+			topology.ROLE_CHUNKSERVER,
+			topology.ROLE_METASERVER:
 			item = fmt.Sprintf("%s:%d", ip, dc.GetListenPort())
 		case topology.ROLE_SNAPSHOTCLONE:
 			item = fmt.Sprintf("%s:%d", ip, dc.GetListenDummyPort())

diff --git a/internal/task/task/monitor/sync_config.go b/internal/task/task/monitor/sync_config.go
@@ -86,7 +86,7 @@ func NewSyncConfigTask(curveadm *cli.CurveAdm, cfg *configure.MonitorConfig) (*t
 		Lambda: common.CheckContainerExist(cfg.GetHost(), cfg.GetRole(), containerId, &out),
 	})
 	if role == ROLE_PROMETHEUS {
-		t.AddStep(&step.CreateAndUploadDir{ // prepare prometheus conf upath
+		t.AddStep(&step.CreateAndUploadDir{ // prepare prometheus conf path
 			HostDirName:       "prometheus",
 			ContainerDestId:   &containerId,
 			ContainerDestPath: "/etc",