opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(keystone): add options to set admin and domain admin role to notify

Browse Source
This commit is contained in:
rainzm
2021-01-17 19:41:09 +08:00
parent c31368c41b
commit 349db2dce8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/driver/sql/sql.go
+2 -2
View File
@@ -131,7 +131,7 @@ func fetchRoleId(name string) (string, error) {
}
func getAdminUserIds() ([]string, error) {
return getUserIdsWithRole("admin", "")
return getUserIdsWithRole(o.Options.AdminRoleToNotify, "")
}
func getUserIdsWithRole(roleName string, domainId string) ([]string, error) {
@@ -152,7 +152,7 @@ func getUserIdsWithRole(roleName string, domainId string) ([]string, error) {
}
func getDomainAdminUserIds(domainId string) ([]string, error) {
return getUserIdsWithRole("domainadmin", domainId)
return getUserIdsWithRole(o.Options.DomainAdminRoleToNotify, domainId)
}
func (sql *SSQLDriver) Sync(ctx context.Context) error {
pkg/keystone/options/options.go
+3
View File
@@ -56,6 +56,9 @@ type SKeystoneOptions struct {
AllowJoinProjectsAcrossDomains bool `help:"allow users/groups to join projects across domains" default:"false"`
DefaultUserLanguage string `help:"default user language, default to zh-CN" default:"zh-CN"`
DomainAdminRoleToNotify string `help:"domain admin role to notify" default:"domainadmin"`
AdminRoleToNotify string `help:"admin role to notify" default:"admin"`
}
var (