Merge branch 'remove_reprecated_es_configuration' into 'master'

Remove unused Elasticsearch settings

Closes gitlab-ee#1581

See merge request !1242

CHANGELOG.md

@@ -3,6 +3,10 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+8.17.0
+
+- Remove deprecated Elasticsearch configuration options
+
 8.16.1
 
 - No changes

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

@@ -1196,14 +1196,6 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['update_all_mirrors_worker_cron'] = "0 * * * *"
 # gitlab_rails['historical_data_worker_cron'] = "0 12 * * *"
 
-################################################################################
-## ElasticSearch (EE Only)
-##! Docs: http://docs.gitlab.com/ee/integration/elasticsearch.html
-################################################################################
-# gitlab_rails['elasticsearch_enabled'] = false
-# gitlab_rails['elasticsearch_host'] = "localhost"
-# gitlab_rails['elasticsearch_port'] = 9200
-
 ################################################################################
 ## GitLab Pages (EE Only)
 ##! Docs: https://docs.gitlab.com/ee/pages/administration.html

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

@@ -122,9 +122,6 @@ default['gitlab']['gitlab-rails']['artifacts_enabled'] = true
 default['gitlab']['gitlab-rails']['artifacts_path'] = nil
 default['gitlab']['gitlab-rails']['lfs_enabled'] = nil
 default['gitlab']['gitlab-rails']['lfs_storage_path'] = nil
-default['gitlab']['gitlab-rails']['elasticsearch_enabled'] = false
-default['gitlab']['gitlab-rails']['elasticsearch_host'] = nil
-default['gitlab']['gitlab-rails']['elasticsearch_port'] = nil
 default['gitlab']['gitlab-rails']['ldap_enabled'] = false
 default['gitlab']['gitlab-rails']['ldap_servers'] = []
 default['gitlab']['gitlab-rails']['pages_enabled'] = false

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

@@ -152,14 +152,6 @@ production: &base
     external_http: <%= @pages_external_http %>
     external_https: <%= @pages_external_https %>
 
-  ## Elasticsearch (EE only)
-  # Enable it if you are going to use elasticsearch instead of
-  # regular database search
-  elasticsearch:
-    enabled: <%= @elasticsearch_enabled %>
-    host: <%= @elasticsearch_host %>
-    port: <%= @elasticsearch_port %>
-
   ## Gravatar
   ## For Libravatar see: https://docs.gitlab.com/ce/customization/libravatar.html
   gravatar: