Rollback on patroni's own replication user

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

@@ -15,7 +15,6 @@ default['patroni']['max_timelines_history'] = 0
 default['patroni']['master_start_timeout'] = 300
 default['patroni']['use_pg_rewind'] = false
 default['patroni']['use_slots'] = true
-default['patroni']['replication_user'] = node['postgresql']['sql_replication_user']
 default['patroni']['replication_password'] = nil
 default['patroni']['replication_slots'] = {}

files/gitlab-cookbooks/patroni/recipes/enable.rb

@@ -14,9 +14,6 @@
 # limitations under the License.
 #
-# Re-define default values to recover any custom configuration provided by the user
-node.default['patroni']['replication_user'] = node['postgresql']['sql_replication_user']
-
 patroni_config_file = "#{node['patroni']['dir']}/patroni.yaml"
 dcs_config_file = "#{node['patroni']['dir']}/dcs.yaml"

files/gitlab-cookbooks/patroni/templates/default/patroni.yaml.erb

@@ -19,7 +19,7 @@ postgresql:
     superuser:
       username: <%= account_helper.postgresql_user %>
     replication:
-      username: <%= @replication_user %>
+      username: <%= @postgresql_defaults['sql_replication_user'] %>
 <% if @replication_password %>
       password: <%= "#{@replication_password}" %>
 <% end %>