Merge branch 'rs-geo_bulk_notify_worker_cron' into 'master'

Add geo_bulk_notify_worker_cron values for gitlab-rails



See merge request !729

files/gitlab-config-template/gitlab.rb.template

@@ -40,6 +40,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['historical_data_worker_cron'] = "0 12 * * *"
 # gitlab_rails['update_all_mirrors_worker_cron'] = "0 * * * *"
 # gitlab_rails['ldap_sync_worker_cron'] = "30 1 * * *"
+# gitlab_rails['geo_bulk_notify_worker_cron'] = "*/10 * * * * *"
 # gitlab_rails['webhook_timeout'] = 10
 
 ## Reply by email

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -92,6 +92,7 @@ default['gitlab']['gitlab-rails']['stuck_ci_builds_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['historical_data_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['update_all_mirrors_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['ldap_sync_worker_cron'] = nil
+default['gitlab']['gitlab-rails']['geo_bulk_notify_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_enabled'] = false
 default['gitlab']['gitlab-rails']['incoming_email_address'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_host'] = nil

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -166,6 +166,11 @@ production: &base
     ldap_sync_worker:
       cron: <%= @ldap_sync_worker_cron %>
 
+    # Gitlab Geo nodes notification worker
+    # NOTE: This will only take effect if Geo is enabled
+    geo_bulk_notify_worker:
+      cron: <%= @geo_bulk_notify_worker_cron %>
+
   #
   # 2. GitLab CI settings
   # ==========================