X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/94972ae20fa5d9dde7dc814695a970e9d5bad4a7..0020a0bc96ee13203fbdc2af28ffa077799213d0:/apps/workbench/config/arvados_config.rb diff --git a/apps/workbench/config/arvados_config.rb b/apps/workbench/config/arvados_config.rb index c0ecfde25f..c1340b4ff5 100644 --- a/apps/workbench/config/arvados_config.rb +++ b/apps/workbench/config/arvados_config.rb @@ -21,7 +21,7 @@ require 'open3' # Load the defaults, used by config:migrate and fallback loading # legacy application.yml -Open3.popen2("arvados-server", "config-dump", "-config=-") do |stdin, stdout, status_thread| +Open3.popen2("arvados-server", "config-dump", "-config=-", "-skip-legacy") do |stdin, stdout, status_thread| stdin.write("Clusters: {xxxxx: {}}") stdin.close confs = YAML.load(stdout, deserialize_symbols: false) @@ -31,7 +31,7 @@ Open3.popen2("arvados-server", "config-dump", "-config=-") do |stdin, stdout, st end # Load the global config file -Open3.popen2("arvados-server", "config-dump") do |stdin, stdout, status_thread| +Open3.popen2("arvados-server", "config-dump", "-skip-legacy") do |stdin, stdout, status_thread| confs = YAML.load(stdout, deserialize_symbols: false) if confs && !confs.empty? # config-dump merges defaults with user configuration, so every