Merge pull request #441 from ZettaIO/v3-auth

Identity v3 support for Swift
This commit is contained in:
Andrey Smirnov
2016-11-11 00:19:06 +03:00
committed by GitHub
6 changed files with 37 additions and 13 deletions
+11 -7
View File
@@ -46,13 +46,17 @@ type S3PublishRoot struct {
// SwiftPublishRoot describes single OpenStack Swift publishing entry point
type SwiftPublishRoot struct {
UserName string `json:"osname"`
Password string `json:"password"`
AuthURL string `json:"authurl"`
Tenant string `json:"tenant"`
TenantID string `json:"tenantid"`
Prefix string `json:"prefix"`
Container string `json:"container"`
UserName string `json:"osname"`
Password string `json:"password"`
AuthURL string `json:"authurl"`
Tenant string `json:"tenant"`
TenantID string `json:"tenantid"`
Domain string `json:"domain"`
DomainID string `json:"domainid"`
TenantDomain string `json:"tenantdomain"`
TenantDomainID string `json:"tenantdomainid"`
Prefix string `json:"prefix"`
Container string `json:"container"`
}
// Config is configuration for aptly, shared by all modules
+4
View File
@@ -88,6 +88,10 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
" \"authurl\": \"\",\n"+
" \"tenant\": \"\",\n"+
" \"tenantid\": \"\",\n"+
" \"domain\": \"\",\n"+
" \"domainid\": \"\",\n"+
" \"tenantdomain\": \"\",\n"+
" \"tenantdomainid\": \"\",\n"+
" \"prefix\": \"\",\n"+
" \"container\": \"repo\"\n"+
" }\n"+