diff --git a/files/gitlab-cookbooks/gitlab/libraries/redis_helper.rb b/files/gitlab-cookbooks/gitlab/libraries/redis_helper.rb index 685c66a6692b006b17ce6ab8b7d59e29b6ece590_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL3JlZGlzX2hlbHBlci5yYg==..b32b96eecaaed4d3a6a5c7c8aa6be6921a7086da_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL3JlZGlzX2hlbHBlci5yYg== 100644 --- a/files/gitlab-cookbooks/gitlab/libraries/redis_helper.rb +++ b/files/gitlab-cookbooks/gitlab/libraries/redis_helper.rb @@ -70,7 +70,7 @@ password: redis_params.last, sentinels: redis_sentinel_urls('redis_sentinels'), sentinelMaster: redis['master_name'], - sentinelPassword: redis['master_password'] + sentinelPassword: gitlab_rails['redis_sentinels_password'] } end end diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-workhorse.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-workhorse.rb index 685c66a6692b006b17ce6ab8b7d59e29b6ece590_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy9naXRsYWItd29ya2hvcnNlLnJi..b32b96eecaaed4d3a6a5c7c8aa6be6921a7086da_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy9naXRsYWItd29ya2hvcnNlLnJi 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-workhorse.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-workhorse.rb @@ -108,7 +108,7 @@ password: redis_params[:password], sentinels: redis_params[:sentinels], sentinel_master: redis_params[:sentinelMaster], - master_password: redis_params[:sentinelPassword], + sentinel_password: redis_params[:sentinelPassword], shutdown_timeout: shutdown_timeout, image_scaler_max_procs: image_scaler_max_procs, image_scaler_max_filesize: image_scaler_max_filesize, diff --git a/files/gitlab-cookbooks/gitlab/templates/default/workhorse-config.toml.erb b/files/gitlab-cookbooks/gitlab/templates/default/workhorse-config.toml.erb index 685c66a6692b006b17ce6ab8b7d59e29b6ece590_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvd29ya2hvcnNlLWNvbmZpZy50b21sLmVyYg==..b32b96eecaaed4d3a6a5c7c8aa6be6921a7086da_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvd29ya2hvcnNlLWNvbmZpZy50b21sLmVyYg== 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/workhorse-config.toml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/workhorse-config.toml.erb @@ -13,5 +13,6 @@ <% if @workhorse_keywatcher %> [redis] +Password = "<%= @password %>" <% if @sentinels.empty? %> URL = "<%= @redis_url %>" @@ -16,6 +17,5 @@ <% if @sentinels.empty? %> URL = "<%= @redis_url %>" -Password = "<%= @password %>" <% else %> Sentinel = <%= @sentinels.to_json %> SentinelMaster = "<%= @sentinel_master %>" @@ -19,7 +19,7 @@ <% else %> Sentinel = <%= @sentinels.to_json %> SentinelMaster = "<%= @sentinel_master %>" -Password = "<%= @master_password %>" +SentinelPassword = "<%= @sentinel_password %>" <% end %> <% end %> diff --git a/spec/chef/cookbooks/gitlab/libraries/redis_helper_spec.rb b/spec/chef/cookbooks/gitlab/libraries/redis_helper_spec.rb index 685c66a6692b006b17ce6ab8b7d59e29b6ece590_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL3JlZGlzX2hlbHBlcl9zcGVjLnJi..b32b96eecaaed4d3a6a5c7c8aa6be6921a7086da_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL3JlZGlzX2hlbHBlcl9zcGVjLnJi 100644 --- a/spec/chef/cookbooks/gitlab/libraries/redis_helper_spec.rb +++ b/spec/chef/cookbooks/gitlab/libraries/redis_helper_spec.rb @@ -186,7 +186,7 @@ expect(params[:password]).to eq('password_from.redis.master_password') expect(params[:sentinels].map(&:to_s)).to eq(%w[redis://sentinel1.example.com:12345 redis://sentinel2.example.com:12345]) expect(params[:sentinelMaster]).to eq('master_from.redis.master_name') - expect(params[:sentinelPassword]).to eq('password_from.redis.master_password') + expect(params[:sentinelPassword]).to be_nil expect(params[:url].to_s).to eq("redis://:password_from.redis.master_password@master_from.redis.master_name/") end end diff --git a/spec/chef/cookbooks/gitlab/recipes/gitlab-workhorse_spec.rb b/spec/chef/cookbooks/gitlab/recipes/gitlab-workhorse_spec.rb index 685c66a6692b006b17ce6ab8b7d59e29b6ece590_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWIvcmVjaXBlcy9naXRsYWItd29ya2hvcnNlX3NwZWMucmI=..b32b96eecaaed4d3a6a5c7c8aa6be6921a7086da_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWIvcmVjaXBlcy9naXRsYWItd29ya2hvcnNlX3NwZWMucmI= 100644 --- a/spec/chef/cookbooks/gitlab/recipes/gitlab-workhorse_spec.rb +++ b/spec/chef/cookbooks/gitlab/recipes/gitlab-workhorse_spec.rb @@ -610,6 +610,7 @@ it 'should generate config file with the specified values' do content = 'Sentinel = ["redis://:some+pass@127.0.0.1:26379","redis://:some+pass@127.0.8.1:12345"]' content_sentinel_master = 'SentinelMaster = "examplemaster"' - content_sentinel_password = 'Password = "examplepassword"' + content_password = 'Password = "examplepassword"' + content_sentinel_password = 'SentinelPassword = "some pass"' content_url = 'URL =' expect(chef_run).to render_file("/var/opt/gitlab/gitlab-workhorse/config.toml").with_content(content) @@ -614,5 +615,6 @@ content_url = 'URL =' expect(chef_run).to render_file("/var/opt/gitlab/gitlab-workhorse/config.toml").with_content(content) + expect(chef_run).to render_file("/var/opt/gitlab/gitlab-workhorse/config.toml").with_content(content_password) expect(chef_run).to render_file("/var/opt/gitlab/gitlab-workhorse/config.toml").with_content(content_sentinel_master) expect(chef_run).to render_file("/var/opt/gitlab/gitlab-workhorse/config.toml").with_content(content_sentinel_password) expect(chef_run).not_to render_file("/var/opt/gitlab/gitlab-workhorse/config.toml").with_content(content_url)