projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20475-dump-busy-queue'
[arvados.git]
/
lib
/
config
/
load.go
diff --git
a/lib/config/load.go
b/lib/config/load.go
index acc54cf92df10d3a16c2e8e811f6b46e1f4670ac..9269ddf27f59011b5dad2855edde8fb9b676ed41 100644
(file)
--- a/
lib/config/load.go
+++ b/
lib/config/load.go
@@
-367,7
+367,7
@@
func (ldr *Loader) checkClusterID(label, clusterID string, emptyStringOk bool) e
if emptyStringOk && clusterID == "" {
return nil
} else if !acceptableClusterIDRe.MatchString(clusterID) {
if emptyStringOk && clusterID == "" {
return nil
} else if !acceptableClusterIDRe.MatchString(clusterID) {
- return fmt.Errorf("%s: cluster ID should be 5 alphanumeric characters", label)
+ return fmt.Errorf("%s: cluster ID should be 5
lowercase
alphanumeric characters", label)
}
return nil
}
}
return nil
}
@@
-448,6
+448,7
@@
func (ldr *Loader) setLoopbackInstanceType(cfg *arvados.Config) error {
RAM: hostram,
Scratch: scratch,
IncludedScratch: scratch,
RAM: hostram,
Scratch: scratch,
IncludedScratch: scratch,
+ Price: 1.0,
}}
cfg.Clusters[id] = cc
}
}}
cfg.Clusters[id] = cc
}