X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/17028c6f18a3e83b39de1655b6bfeafe2938220d..f98a4eb7fcd4f762c8dc707ec1661ca5a5802f6e:/services/api/app/controllers/arvados/v1/schema_controller.rb diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb index 222b106a97..d67568d43e 100644 --- a/services/api/app/controllers/arvados/v1/schema_controller.rb +++ b/services/api/app/controllers/arvados/v1/schema_controller.rb @@ -25,6 +25,8 @@ class Arvados::V1::SchemaController < ApplicationController def discovery_doc Rails.cache.fetch 'arvados_v1_rest_discovery' do Rails.application.eager_load! + remoteHosts = {} + Rails.configuration.RemoteClusters.each {|k,v| if k != "*" then remoteHosts[k] = v["Host"] end } discovery = { kind: "discovery#restDescription", discoveryVersion: "v1", @@ -61,7 +63,7 @@ class Arvados::V1::SchemaController < ApplicationController crunchLogPartialLineThrottlePeriod: Rails.configuration.Containers["Logging"]["LogPartialLineThrottlePeriod"], crunchLogUpdatePeriod: Rails.configuration.Containers["Logging"]["LogUpdatePeriod"], crunchLogUpdateSize: Rails.configuration.Containers["Logging"]["LogUpdateSize"], - remoteHosts: Rails.configuration.RemoteClusters.map {|k,v| v["Host"]}, + remoteHosts: remoteHosts, remoteHostsViaDNS: Rails.configuration.RemoteClusters["*"]["Proxy"], websocketUrl: Rails.configuration.Services["Websocket"]["ExternalURL"].to_s, workbenchUrl: Rails.configuration.Services["Workbench1"]["ExternalURL"].to_s,