From 5bcbc4d25040fd6b98120835a175157873efeae7 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Fri, 28 Apr 2023 15:12:18 +0800 Subject: [PATCH] fix: do not init keystone admin user --- pkg/keystone/models/projects.go | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkg/keystone/models/projects.go b/pkg/keystone/models/projects.go index 8a0d8a0468..ae8d7c6286 100644 --- a/pkg/keystone/models/projects.go +++ b/pkg/keystone/models/projects.go @@ -100,10 +100,6 @@ func (manager *SProjectManager) InitializeData() error { if err != nil { return errors.Wrap(err, "initSysProject") } - err = manager.initAdminUsers(ctx) - if err != nil { - return errors.Wrap(err, "initAdminUsers") - } return nil } @@ -138,22 +134,6 @@ func (manager *SProjectManager) initSysProject(ctx context.Context) error { return nil } -func (manager *SProjectManager) initAdminUsers(ctx context.Context) error { - q := manager.Query().IsNullOrEmpty("admin_id") - projects := make([]SProject, 0) - err := db.FetchModelObjects(manager, q, &projects) - if err != nil { - return errors.Wrap(err, "FetchModelObjects") - } - for i := range projects { - err := projects[i].resetAdminUser(ctx, getDefaultAdminCred()) - if err != nil { - return errors.Wrap(err, "projects initAdmin") - } - } - return nil -} - func (project *SProject) resetAdminUser(ctx context.Context, userCred mcclient.TokenCredential) error { role, err := RoleManager.FetchRoleByName(options.Options.ProjectAdminRole, "", "") if err != nil {