alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

Add domain option for openstack (v3 auth)

Browse source
This commit is contained in:
Fabian Ruff 2016-04-21 01:00:49 +02:00 committed by Nick Craig-Wood
parent 8af68e779f
commit 640d7bd365
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/content/swift.md
View file

@ -72,6 +72,8 @@ Choose a number from below, or type in your own value
6 / OVH 6 / OVH
\ "https://auth.cloud.ovh.net/v2.0" \ "https://auth.cloud.ovh.net/v2.0"
auth> 1 auth> 1
User domain - optional (v3 auth)
domain> Default
Tenant name - optional Tenant name - optional
tenant> tenant>
Region name - optional Region name - optional

4
swift/swift.go
View file

@ -61,6 +61,9 @@ func init() {
Help: "OVH", Help: "OVH",
Value: "https://auth.cloud.ovh.net/v2.0", Value: "https://auth.cloud.ovh.net/v2.0",
}}, }},
}, {
Name: "domain",
Help: "User domain - optional (v3 auth)",
}, { }, {
Name: "tenant", Name: "tenant",
Help: "Tenant name - optional", Help: "Tenant name - optional",
@ -155,6 +158,7 @@ func swiftConnection(name string) (*swift.Connection, error) {
UserAgent: fs.UserAgent, UserAgent: fs.UserAgent,
Tenant: fs.ConfigFile.MustValue(name, "tenant"), Tenant: fs.ConfigFile.MustValue(name, "tenant"),
Region: fs.ConfigFile.MustValue(name, "region"), Region: fs.ConfigFile.MustValue(name, "region"),
Domain: fs.ConfigFile.MustValue(name, "domain"),
ConnectTimeout: 10 * fs.Config.ConnectTimeout, // Use the timeouts in the transport ConnectTimeout: 10 * fs.Config.ConnectTimeout, // Use the timeouts in the transport
Timeout: 10 * fs.Config.Timeout, // Use the timeouts in the transport Timeout: 10 * fs.Config.Timeout, // Use the timeouts in the transport
Transport: fs.Config.Transport(), Transport: fs.Config.Transport(),