From b034a7a95d5a737cf872d5eebd4b2f9ce8d4f621 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Mon, 1 Mar 2021 21:28:28 +0800
Subject: [PATCH] fix(keystone): adjust default system policy names

---
 pkg/keystone/locale/genpolicy.go | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkg/keystone/locale/genpolicy.go b/pkg/keystone/locale/genpolicy.go
index b592e21805..a5e4078cf9 100644
--- a/pkg/keystone/locale/genpolicy.go
+++ b/pkg/keystone/locale/genpolicy.go
@@ -15,7 +15,6 @@
 package locale
 
 import (
-	"fmt"
 	"strings"
 
 	"yunion.io/x/jsonutils"
@@ -197,7 +196,20 @@ func generatePolicies(scope rbacutils.TRbacScope, def sPolicyDefinition) []SPoli
 
 	ret := make([]SPolicyData, 0)
 	for _, role := range roleConfs {
-		name := fmt.Sprintf("%s%s%s", level, def.Name, role.name)
+		nameSegs := make([]string, 0)
+		if len(level) > 0 {
+			nameSegs = append(nameSegs, level)
+		}
+		if len(def.Name) > 0 {
+			nameSegs = append(nameSegs, def.Name)
+		}
+		if len(role.name) > 0 {
+			nameSegs = append(nameSegs, role.name)
+		}
+		name := strings.Join(nameSegs, "-")
+		if name == "sys-admin" {
+			name = "sysadmin"
+		}
 		var policy jsonutils.JSONObject
 		if def.Services != nil {
 			policy = role.policyFunc(def.Services)