Skip to content
Snippets Groups Projects
Commit 446964f1a4e7 authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'ensure-ee-services-are-added-always' into 'master'

Ensure EE services are added when gitlab-ee::config recipe is included

See merge request gitlab-org/omnibus-gitlab!5861
No related branches found
No related tags found
2 merge requests!65heptapod#658: intermediate release to test the shift,!64GitLab 14.8
......@@ -15,5 +15,10 @@
# limitations under the License.
#
# Add the EE specific services. Useful when `gitlab-ee::config` is called
# directly, like via `GitlabCtl::Util.chef_run` calls. For regular reconfigure
# runs, this is already done in `gitlab-ee::default` recipe.
Services.add_services('gitlab-ee', Services::EEServices.list)
# Use the gitlab cookbook config
include_recipe 'gitlab::config'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment