opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: converted host configuration always use http as keystone protocol

Browse Source
This commit is contained in:
Qiu Jian
2019-02-15 23:05:30 +08:00
parent 713fa7d7bb
commit 6de65ba419
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/hostdrivers/kvm.go
+14
View File
@@ -310,9 +310,23 @@ func (self *SKVMHostDriver) PrepareConvert(host *models.SHost, image, raid strin
if err != nil {
return nil, err
}
portStr := authLoc.Port()
useSsl := ""
if authLoc.Scheme == "https" {
useSsl = "yes"
if len(portStr) == 0 {
portStr = "443"
}
} else {
if len(portStr) == 0 {
portStr = "80"
}
}
authInfo := fmt.Sprintf("YUNION_REGION=%s\n", options.Options.Region)
authInfo += fmt.Sprintf("YUNION_KEYSTONE=%s\n", options.Options.AuthURL)
authInfo += fmt.Sprintf("YUNION_KEYSTONE_HOST=%s\n", authLoc.Hostname())
authInfo += fmt.Sprintf("YUNION_KEYSTONE_PORT=%s\n", portStr)
authInfo += fmt.Sprintf("YUNION_KEYSTONE_USE_SSL=%s\n", useSsl)
authInfo += fmt.Sprintf("YUNION_HOST_NAME=%s\n", host.GetName())
authInfo += fmt.Sprintf("YUNION_HOST_ADMIN=%s\n", options.Options.AdminUser)
authInfo += fmt.Sprintf("YUNION_HOST_PASSWORD=%s\n", options.Options.AdminPassword)