Match Gitaly configuration format in Omnibus
The configuration formats of Gitaly and Omnibus deviate from each other creating a few problems: 1. Configuration keys for the same option differ between the context of Omnibus and Gitaly creating confusion for the user. 2. Each new key added requires duplicate work to map the different keys into Omnibus. This change introduces gitaly['configuration'] matching configuration in Omnibus with Gitaly's own format. The previous configuration keys are remapped into this new format to assist administrators during the transition period. The configuration values are now serialized directly into TOML instead of using a template. Removes unneeded values allowing Gitaly's own source to be the single source of truth for configuration. Updates tests because the new serialization method does not output empty config sections. Guards are included to prevent errors with latency configurations that must be arrays where the previous configuration expected a string until such time as Gitaly's own validation subroutines are implemented. Changelog: changed
parent
2ba2d18b947d
No related branches found
No related tags found
Showing
- Gemfile 1 addition, 0 deletionsGemfile
- Gemfile.lock 2 additions, 0 deletionsGemfile.lock
- config/patches/tomlib/license/add-license-file.patch 27 additions, 0 deletionsconfig/patches/tomlib/license/add-license-file.patch
- config/software/gitaly.rb 1 addition, 0 deletionsconfig/software/gitaly.rb
- config/software/tomlib.rb 36 additions, 0 deletionsconfig/software/tomlib.rb
- files/gitlab-cookbooks/gitaly/attributes/default.rb 14 additions, 43 deletionsfiles/gitlab-cookbooks/gitaly/attributes/default.rb
- files/gitlab-cookbooks/gitaly/libraries/gitaly.rb 177 additions, 4 deletionsfiles/gitlab-cookbooks/gitaly/libraries/gitaly.rb
- files/gitlab-cookbooks/gitaly/recipes/enable.rb 41 additions, 11 deletionsfiles/gitlab-cookbooks/gitaly/recipes/enable.rb
- files/gitlab-cookbooks/gitaly/templates/default/gitaly-config.toml.erb 1 addition, 208 deletions...cookbooks/gitaly/templates/default/gitaly-config.toml.erb
- files/gitlab-cookbooks/monitoring/libraries/prometheus.rb 2 additions, 2 deletionsfiles/gitlab-cookbooks/monitoring/libraries/prometheus.rb
- spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb 191 additions, 17 deletionsspec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb
Loading
Please register or sign in to comment