Update Gitaly and Praefect configurations in chef roles/cookbooks to conform to new format
Gitaly configurations keys have been updated in Omnibus via this MR, by introducing a the submap Gitlab['gitaly']['configuration']
which gets directly serialized as TOML config for Gitaly server.
Right now this is not impacting current servers on gitlab.com because a compatibility code was added to migrate configurations to new location. However, this will be marked as deprecated in future releases and removed ultimately. Therefore, we should migrate gitaly configurations for gitlab.com to use new method.
Useful links
pre
grep '"gitaly"' -l | grep '^pre'
-
roles/pre-base.json -
roles/pre-base-be-gitaly.json
grep '"praefect"' -l | grep '^pre'
-
roles/pre-base-deploy-node.json -
roles/pre-base-be-praefect.json -
roles/pre-base.json
gstg
grep '"gitaly"' -l | grep '^gstg'
-
roles/gstg-base-stor-gitaly-hdd.json -
roles/gstg-base.json -
roles/gstg-base-stor.json -
roles/gstg-base-stor-gitaly-cny.json -
roles/gstg-base-stor-gitaly.json -
roles/gstg-infra-geo-secondary.json
grep '"praefect"' -l | grep '^gstg'
-
roles/gstg-base-stor-praefect-cny.json -
roles/gstg-base-stor-praefect.json -
roles/gstg-base-deploy-node.json -
roles/gstg-base-deploy-node-cny.json -
roles/gstg-base.json
gprd
👉 production#9541 (closed)
rg '"praefect"' -l | rg 'gprd'
-
roles/gprd-base-deploy-node.json -
roles/gprd-base-stor-praefect.json -
roles/gprd-base-stor-gitaly-praefect.json -
roles/gprd-base.json
rg '"gitaly"' -l | rg 'gprd'
-
roles/gprd-base-stor-gitaly-cny.json -
roles/gprd-base-stor-gitaly.json -
roles/gprd-base-stor-gitaly-hdd.json -
roles/gprd-base-stor-gitaly-common.json -
roles/gprd-base-stor.json -
roles/gprd-base-stor-gitaly-praefect.json -
roles/gprd-base.json
dev
rg '"gitaly"' -l | rg 'dev'
-
roles/dev-gitlab-org.json 👉 https://gitlab.com/gitlab-com/gl-infra/chef-repo/-/merge_requests/3338
ops
rg '"gitaly"' -l | rg 'ops'
-
roles/ops-base-console-node.json not needed since it's just dislabeding it -
roles/ops-infra-gitlab.json 👉 production#9618 (closed)
release
-
roles/release-gitlab.json 👉 production#9619 (closed)
testbed
-
roles/testbed-base.json 👉 https://gitlab.com/gitlab-com/gl-infra/chef-repo/-/merge_requests/3356
Deprecations/Removed configuration warnings
-
ruby_num_worker
👉 https://gitlab.com/gitlab-com/gl-infra/reliability/-/issues/19359#note_1370557656 -
gstg prometheus_listen_addr
👉 https://gitlab.com/gitlab-com/gl-infra/reliability/-/issues/19359#note_1370557656👉 https://gitlab.com/gitlab-com/gl-infra/chef-repo/-/merge_requests/3323/diffs -
svlogd_prefix
👉 https://gitlab.com/gitlab-com/gl-infra/chef-repo/-/merge_requests/3344 -
postgres_queue_enabled
👉 https://gitlab.com/gitlab-com/gl-infra/chef-repo/-/merge_requests/3344 -
ruby_sentry_dsn
👉 https://gitlab.com/gitlab-com/gl-infra/chef-repo/-/merge_requests/3344
Configuration Refactors we need to do
-
Make it clear the virtual_storage
is inside of the secret not the chef role -
Extract gitaly
configuration out ofgprd-base
andgprd-base-stor
Edited by Steve Xuereb