From 60560d144b7abf7ff98eb12ca3a591211df19ce9 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 28 May 2019 13:53:47 -0400 Subject: [PATCH] 15003: Ignore SAMPLE entries in default config file. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/api/config/arvados_config.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb index 9ea36315f4..22a8fed58e 100644 --- a/services/api/config/arvados_config.rb +++ b/services/api/config/arvados_config.rb @@ -48,6 +48,13 @@ if $arvados_config_defaults.empty? raise "Missing #{::Rails.root.to_s}/config/config.default.yml" end +def remove_sample_entries(h) + return unless h.is_a? Hash + h.delete("SAMPLE") + h.each { |k, v| remove_sample_entries(v) } +end +remove_sample_entries($arvados_config_defaults) + clusterID, clusterConfig = $arvados_config_defaults["Clusters"].first $arvados_config_defaults = clusterConfig $arvados_config_defaults["ClusterID"] = clusterID -- 2.30.2