projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19362: Cleanup/comment locking.
[arvados.git]
/
lib
/
config
/
deprecated_keepstore.go
diff --git
a/lib/config/deprecated_keepstore.go
b/lib/config/deprecated_keepstore.go
index 401764c87add6e1e37dff63052302df34a3f5e54..d9f4815fcfecc6fe8b0a0cb8e7e87e8a59d78c83 100644
(file)
--- a/
lib/config/deprecated_keepstore.go
+++ b/
lib/config/deprecated_keepstore.go
@@
-118,7
+118,7
@@
func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error {
return err
}
return err
}
- myURL := arvados.URL{Scheme: "http"}
+ myURL := arvados.URL{Scheme: "http"
, Path: "/"
}
if oc.TLSCertificateFile != nil && oc.TLSKeyFile != nil {
myURL.Scheme = "https"
}
if oc.TLSCertificateFile != nil && oc.TLSKeyFile != nil {
myURL.Scheme = "https"
}
@@
-137,7
+137,7
@@
func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error {
cluster.TLS.Key = "file://" + *v
}
if v := oc.Listen; v != nil {
cluster.TLS.Key = "file://" + *v
}
if v := oc.Listen; v != nil {
- if _, ok := cluster.Services.Keepstore.InternalURLs[arvados.URL{Scheme: myURL.Scheme, Host: *v}]; ok {
+ if _, ok := cluster.Services.Keepstore.InternalURLs[arvados.URL{Scheme: myURL.Scheme, Host: *v
, Path: "/"
}]; ok {
// already listed
myURL.Host = *v
} else if len(*v) > 1 && (*v)[0] == ':' {
// already listed
myURL.Host = *v
} else if len(*v) > 1 && (*v)[0] == ':' {
@@
-324,8
+324,8
@@
func (ldr *Loader) translateOldKeepstoreVolume(oldvol oldKeepstoreVolume) (arvad
StorageClasses: array2boolmap(oldvol.StorageClasses),
}
params = arvados.S3VolumeDriverParameters{
StorageClasses: array2boolmap(oldvol.StorageClasses),
}
params = arvados.S3VolumeDriverParameters{
- AccessKey
:
string(bytes.TrimSpace(accesskeydata)),
- Secret
Key:
string(bytes.TrimSpace(secretkeydata)),
+ AccessKey
ID:
string(bytes.TrimSpace(accesskeydata)),
+ Secret
AccessKey:
string(bytes.TrimSpace(secretkeydata)),
Endpoint: oldvol.Endpoint,
Region: oldvol.Region,
Bucket: oldvol.Bucket,
Endpoint: oldvol.Endpoint,
Region: oldvol.Region,
Bucket: oldvol.Bucket,
@@
-537,6
+537,7
@@
func keepServiceURL(ks arvados.KeepService) arvados.URL {
url := arvados.URL{
Scheme: "http",
Host: net.JoinHostPort(ks.ServiceHost, strconv.Itoa(ks.ServicePort)),
url := arvados.URL{
Scheme: "http",
Host: net.JoinHostPort(ks.ServiceHost, strconv.Itoa(ks.ServicePort)),
+ Path: "/",
}
if ks.ServiceSSLFlag {
url.Scheme = "https"
}
if ks.ServiceSSLFlag {
url.Scheme = "https"