qiwang
/
pcm-openstack
forked from JointCloud/pcm-openstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:Example Modify cluster configuration information

This commit is contained in:
qiwang 2024-02-27 15:41:05 +08:00
parent 137c913ee8
commit 7068da9d73
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/pcmopenstack.yaml
View File

@ -49,7 +49,7 @@ openstackConfig:
OpenstackBareMetalUrl: "" OpenstackBareMetalUrl: ""
Platform: "Nudt" Platform: "Nudt"
Id: "default" Id: "default"
DianKe-T: DianKe_T:
USER: "admin" USER: "admin"
PASSWORD: "28b474f30dc3497d" PASSWORD: "28b474f30dc3497d"
DOMAIN: "Default" DOMAIN: "Default"
@ -64,9 +64,9 @@ openstackConfig:
OpenstackVolumev2Url: "http://10.200.1.82:8776/v2/9f6db6c0f4704390b34991faf60c1822" OpenstackVolumev2Url: "http://10.200.1.82:8776/v2/9f6db6c0f4704390b34991faf60c1822"
OpenstackLimitsUrl: "http://10.200.1.82:8774" OpenstackLimitsUrl: "http://10.200.1.82:8774"
OpenstackBareMetalUrl: "" OpenstackBareMetalUrl: ""
Platform: "DianKe" Platform: "DianKe_T"
Id: "default" Id: "default"
DianKe-R: DianKe_R:
USER: "admin" USER: "admin"
PASSWORD: "nrfD3plQn9ro3WZ3nFmejFA3F7y5VpGwL0KARvlq" PASSWORD: "nrfD3plQn9ro3WZ3nFmejFA3F7y5VpGwL0KARvlq"
DOMAIN: "Default" DOMAIN: "Default"
@ -81,7 +81,7 @@ openstackConfig:
OpenstackVolumev2Url: "http://10.200.15.121:8776/v2/9f6db6c0f4704390b34991faf60c1822" OpenstackVolumev2Url: "http://10.200.15.121:8776/v2/9f6db6c0f4704390b34991faf60c1822"
OpenstackLimitsUrl: "http://10.200.15.121:8774" OpenstackLimitsUrl: "http://10.200.15.121:8774"
OpenstackBareMetalUrl: "" OpenstackBareMetalUrl: ""
Platform: "DianKe" Platform: "DianKe_R"
Id: "default" Id: "default"
# core rpc # core rpc
PcmCoreRpcConf: PcmCoreRpcConf:

30
internal/common/tokenService.go
View File

@ -91,8 +91,10 @@ func GetOpenstackConfWithPlatform(platform string) (*config.Conf, error) {
conf = C.OpenstackConfig.Nudt conf = C.OpenstackConfig.Nudt
case C.OpenstackConfig.ZhiJiang.Platform: case C.OpenstackConfig.ZhiJiang.Platform:
conf = C.OpenstackConfig.ZhiJiang conf = C.OpenstackConfig.ZhiJiang
case C.OpenstackConfig.DianKe.Platform: case C.OpenstackConfig.DianKe_T.Platform:
conf = C.OpenstackConfig.DianKe conf = C.OpenstackConfig.DianKe_T
case C.OpenstackConfig.DianKe_R.Platform:
conf = C.OpenstackConfig.DianKe_R
default: default:
return nil, fmt.Errorf("platform not supported") return nil, fmt.Errorf("platform not supported")
} }
@ -121,14 +123,22 @@ func GetToken(Platform string) (token string) {
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.Nudt.PASSWORD a.Auth.Identity.Password.User.Password = C.OpenstackConfig.Nudt.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.Nudt.DOMAIN a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.Nudt.DOMAIN
TokenUrl = C.OpenstackConfig.Nudt.TokenUrl TokenUrl = C.OpenstackConfig.Nudt.TokenUrl
case C.OpenstackConfig.DianKe.Platform: case C.OpenstackConfig.DianKe_T.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.DianKe.USER a.Auth.Scope.Project.Name = C.OpenstackConfig.DianKe_T.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.DianKe.Id a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.DianKe_T.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.DianKe.AuthMethod) a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.DianKe_T.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.DianKe.USER a.Auth.Identity.Password.User.Name = C.OpenstackConfig.DianKe_T.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.DianKe.PASSWORD a.Auth.Identity.Password.User.Password = C.OpenstackConfig.DianKe_T.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.DianKe.DOMAIN a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.DianKe_T.DOMAIN
TokenUrl = C.OpenstackConfig.DianKe.TokenUrl TokenUrl = C.OpenstackConfig.DianKe_T.TokenUrl
case C.OpenstackConfig.DianKe_R.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.DianKe_R.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.DianKe_R.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.DianKe_R.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.DianKe_R.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.DianKe_R.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.DianKe_R.DOMAIN
TokenUrl = C.OpenstackConfig.DianKe_R.TokenUrl
default: default:
} }

3
internal/config/openstackConfig.go
View File

@ -3,7 +3,8 @@ package config
type OpenstackConfig struct { type OpenstackConfig struct {
ZhiJiang Conf `json:"ZhiJiang"` ZhiJiang Conf `json:"ZhiJiang"`
Nudt Conf `json:"Nudt"` Nudt Conf `json:"Nudt"`
DianKe Conf `json:"DianKe"` DianKe_T Conf `json:"DianKe_T"`
DianKe_R Conf `json:"DianKe_R"`
Status_created int `json:"Status_created"` Status_created int `json:"Status_created"`
TokenHeader string `json:"TokenHeader"` TokenHeader string `json:"TokenHeader"`
} }