Commit 7490cd7f authored by Robert Speicher's avatar Robert Speicher

Merge branch 'sh-fix-praefect-config-toml' into 'master'

Fix test Praefect config file

See merge request gitlab-org/gitlab!30787
parents 81d8c0ff aae2f573
...@@ -96,7 +96,8 @@ module Gitlab ...@@ -96,7 +96,8 @@ module Gitlab
class << self class << self
def configuration_toml(gitaly_dir, storage_paths) def configuration_toml(gitaly_dir, storage_paths)
nodes = [{ storage: 'default', address: "unix:#{gitaly_dir}/gitaly.socket", primary: true, token: 'secret' }] nodes = [{ storage: 'default', address: "unix:#{gitaly_dir}/gitaly.socket", primary: true, token: 'secret' }]
config = { socket_path: "#{gitaly_dir}/praefect.socket", virtual_storage_name: 'default', token: 'secret', node: nodes } storages = [{ name: 'default', node: nodes }]
config = { socket_path: "#{gitaly_dir}/praefect.socket", virtual_storage: storages }
config[:token] = 'secret' if Rails.env.test? config[:token] = 'secret' if Rails.env.test?
TomlRB.dump(config) TomlRB.dump(config)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment