From 1ff3a4a50e5f2161cf411b4f39438cebef4f844a Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Mon, 7 Jan 2019 20:29:51 +0100 Subject: [PATCH] adds backend rule --- manifests/server/proxy.pp | 1 - manifests/server/proxy_test.pp | 5 +++-- templates/haproxy_backend_rule.erb | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp index 3f2059e..9d23732 100644 --- a/manifests/server/proxy.pp +++ b/manifests/server/proxy.pp @@ -51,7 +51,6 @@ $backend_name = undef, $backend_order = '030', $fe_maxconn = undef, $be_server_name = undef, -$be_server_value = undef, ) { diff --git a/manifests/server/proxy_test.pp b/manifests/server/proxy_test.pp index b2efe44..ea52bda 100644 --- a/manifests/server/proxy_test.pp +++ b/manifests/server/proxy_test.pp @@ -31,7 +31,8 @@ class cd_haproxy::server::proxy_test ( acl_rule => ['too_fast fe_sess_rate ge 10', 'network_allowed src 0.0.0.0/0'], backend_name => 'test01-backend', - be_server_name => ['web01', 'web02'], - be_server_value => ['web01.confdroid.com:80','web02.confdroid.com:80'], + be_server_name => ['web01 web01.confdroid.com:80 check', + 'web02 web02.confdroid.com:80 check'], + } } diff --git a/templates/haproxy_backend_rule.erb b/templates/haproxy_backend_rule.erb index aa2b7d3..090772e 100644 --- a/templates/haproxy_backend_rule.erb +++ b/templates/haproxy_backend_rule.erb @@ -1,6 +1,5 @@ <% if @fqdn == @haproxy_fqdn -%> backend <%= @backend_name %> <% @be_server_name.each do |be_server| -%> -<% @be_server_value.each do |be_value| -%> -server <%= be_server %> <% be_value %> -<% end end end -%> +server <%= be_server %> +<% end end -%>