Parameterize haproxy's http check timeout

Author: daaang

Diff for: manifests/haproxy/service.pp

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 The Regents of the University of Michigan.
+# Copyright (c) 2019, 2024 The Regents of the University of Michigan.
 # All Rights Reserved. Licensed according to the terms of the Revised
 # BSD License. See LICENSE.txt for details.
 
@@ -45,6 +45,9 @@
 # @param dynamic_weight_smoothing This value is added to the weight for each
 # backend server regardless of server load to help "smooth" the effect of the weighting
 #
+# @param check_timeout_milliseconds How long to wait for http status
+# checks; defaults to 5 seconds
+#
 # @example
 #   nebula::haproxy::service { 'www-whatever':
 #     floating_ip          => '1.2.3.4'
@@ -70,7 +73,8 @@
   Hash             $whitelists = {},
   Boolean          $custom_503 = false,
   Boolean          $dynamic_weighting = false,
-  Integer          $dynamic_weight_smoothing = 2
+  Integer          $dynamic_weight_smoothing = 2,
+  Optional[Integer] $check_timeout_milliseconds = undef
 ) {
 
   include nebula::profile::haproxy::prereqs
@@ -144,6 +148,14 @@
         content => "option httpchk GET /monitor/monitor.pl\nhttp-check expect status 200\n",
         order   => '02'
       }
+
+      if $check_timeout_milliseconds != undef {
+        concat_fragment { "${service_prefix} check_timeout":
+          target  => $service_cfg,
+          content => "timeout connect ${check_timeout_milliseconds}\n",
+          order   => '02'
+        }
+      }
     }
 
     if($custom_503) {

Diff for: spec/defines/haproxy_service_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018 The Regents of the University of Michigan.
+# Copyright (c) 2018, 2024 The Regents of the University of Michigan.
 # All Rights Reserved. Licensed according to the terms of the Revised
 # BSD License. See LICENSE.txt for details.
 require 'spec_helper'
@@ -253,6 +253,20 @@
               .with_environment(['HAPROXY_SMOOTHING_FACTOR=2'])
           end
         end
+
+        it { is_expected.not_to contain_concat_fragment('svc1-dc1-https check_timeout') }
+
+        context 'with check_timeout_milliseconds set to 15000' do
+          let(:params) do
+            super().merge(check_timeout_milliseconds: 15000)
+          end
+
+          it do
+            is_expected.to contain_concat_fragment('svc1-dc1-https check_timeout')
+              .with_target(service_config)
+              .with_content("timeout connect 15000\n")
+          end
+        end
       end
 
       describe 'http service config' do