Skip to content

Reload Consul only if the service is enabled

Stan Hu requested to merge sh-guard-consul-reload into master

What does this MR do?

If for some reason an EE installation with Consul is downgraded to a CE installation, gitlab-ctl reconfigure will fail with an obscure message:

NoMethodError occurred in delayed notification: undefined method `run_action' for "execute[reload consul]":String

In a CE build, the Consul recipes are not loaded so reload consul is not available.

To avoid this error, we can use the Services.enabled? helper, which will verify that Consul is in the list of available services in the first place.

Related issues

#6934 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks
  • trigger-package has a green pipeline running against latest commit

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for the GitLab Chart opened
Edited by Balasankar 'Balu' C

Merge request reports