Summary of changes:
services/api/config/arvados_config.rb | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
via 196f347cec70768d45167fd1319e8c6c1cd31b2f (commit)
from 3d878236c48e4856b5f58fdc2e6d35f8193e6150 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 196f347cec70768d45167fd1319e8c6c1cd31b2f
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Fri Apr 19 14:48:23 2019 -0400
Merge, don't replace RemoteClusters refs #13996
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index f57073dfc..cde8acf23 100644
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -147,15 +147,21 @@ arvcfg.declare_config "Services.WebDAV.ExternalURL", URI, :keep_web_service_url
arvcfg.declare_config "Services.GitHTTP.ExternalURL", URI, :git_repo_https_base
arvcfg.declare_config "Services.GitSSH.ExternalURL", URI, :git_repo_ssh_base, ->(cfg, k, v) { ConfigLoader.set_cfg cfg, "Services.GitSSH.ExternalURL", "ssh://#{v}" }
arvcfg.declare_config "RemoteClusters", Hash, :remote_hosts, ->(cfg, k, v) {
- h = {}
+ h = if cfg["RemoteClusters"] then
+ cfg["RemoteClusters"].deep_dup
+ else
+ {}
+ end
v.each do |clusterid, host|
- h[clusterid] = {
- "Host" => host,
- "Proxy" => true,
- "Scheme" => "https",
- "Insecure" => false,
- "ActivateUsers" => false
- }
+ if h[clusterid].nil?
+ h[clusterid] = {
+ "Host" => host,
+ "Proxy" => true,
+ "Scheme" => "https",
+ "Insecure" => false,
+ "ActivateUsers" => false
+ }
+ end
end
ConfigLoader.set_cfg cfg, "RemoteClusters", h
}
-----------------------------------------------------------------------
hooks/post-receive
--