X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f30e59af90558e47a4156566d0209bc8efacd85a..31a9473bdce412db33a4afa53329701e2cd88e4d:/services/api/config/arvados_config.rb diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb index 8a96c432a8..c0f7ee174f 100644 --- a/services/api/config/arvados_config.rb +++ b/services/api/config/arvados_config.rb @@ -30,6 +30,7 @@ end # Load the defaults, used by config:migrate and fallback loading # legacy application.yml +load_time = Time.now.utc defaultYAML, stderr, status = Open3.capture3("arvados-server", "config-dump", "-config=-", "-skip-legacy", stdin_data: "Clusters: {xxxxx: {}}") if !status.success? puts stderr @@ -39,6 +40,8 @@ confs = YAML.load(defaultYAML, deserialize_symbols: false) clusterID, clusterConfig = confs["Clusters"].first $arvados_config_defaults = clusterConfig $arvados_config_defaults["ClusterID"] = clusterID +$arvados_config_defaults["SourceTimestamp"] = Time.rfc3339(confs["SourceTimestamp"]) +$arvados_config_defaults["SourceSHA256"] = confs["SourceSHA256"] if ENV["ARVADOS_CONFIG"] == "none" # Don't load config. This magic value is set by packaging scripts so @@ -54,6 +57,8 @@ else clusterID, clusterConfig = confs["Clusters"].first $arvados_config_global = clusterConfig $arvados_config_global["ClusterID"] = clusterID + $arvados_config_global["SourceTimestamp"] = Time.rfc3339(confs["SourceTimestamp"]) + $arvados_config_global["SourceSHA256"] = confs["SourceSHA256"] else # config-dump failed, assume we will be loading from legacy # application.yml, initialize with defaults. @@ -64,6 +69,7 @@ end # Now make a copy $arvados_config = $arvados_config_global.deep_dup +$arvados_config["LoadTimestamp"] = load_time def arrayToHash cfg, k, v val = {}