Merge branch '2786-pg-ha-setup-trying-to-connect-to-db-as-gitlab-consul-user' into 'master'

Resolve "PG HA setup trying to connect to db as gitlab-consul user"

Closes #2786

See merge request !1939

CHANGELOG.md

@@ -24,9 +24,7 @@ omnibus-gitlab repository.
 - Add omniauth sync_profile_from_provider and sync_profile_attributes configuration
 - Upgrade ruby version to 2.3.5
 - Upgrade libyaml version to 0.1.7
-- Only generate a private SSH key on Geo secondaries c2f2dcba
-- Add omniauth sync_profile_from_provider and sync_profile_attributes configuration
-- Support LFS object storage options for GitLab EEP
+- Update failover_pgbouncer script to use the pgbouncer user for the database configuration
 9.5.5

files/gitlab-cookbooks/consul/templates/default/watcher_scripts/failover_pgbouncer.erb

@@ -72,4 +72,4 @@ end
 @log.info("Found master: #{newhost}")
-Kernel.exit run_command("gitlab-ctl pgb-notify --newhost #{newhost} --user gitlab-consul --hostuser gitlab-consul")
+Kernel.exit run_command("gitlab-ctl pgb-notify --newhost #{newhost} --user pgbouncer --hostuser gitlab-consul")