diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp index c04e740..408ead0 100644 --- a/manifests/server/proxy.pp +++ b/manifests/server/proxy.pp @@ -55,6 +55,7 @@ define cd_haproxy::server::proxy ( $be_balance = '', $be_mode = '', $default_backend = '', + $be_option = '', ) { @@ -70,6 +71,7 @@ define cd_haproxy::server::proxy ( $fe_use_backend_array = split($fe_use_backend,';') $backend_name_array = split($backend_name, ';') $be_server_name_array = split($be_server_name, ';') + $be_option_array = split($be_option, ';') # create frontend section concat::fragment { "frontend_${name}": diff --git a/templates/haproxy_backend_rule.erb b/templates/haproxy_backend_rule.erb index dcd5bc8..0425e65 100644 --- a/templates/haproxy_backend_rule.erb +++ b/templates/haproxy_backend_rule.erb @@ -13,6 +13,11 @@ acl <%= acl_rule %> <% if @be_balance != '' -%> balance <%= @be_balance %> <% end -%> +<% if @be_option_array and !@be_option_array.empty? -%> +<% @be_option_array.each do |be_option| -%> +server <%= be_option %> +<% end -%> +<% end -%> <% if @be_server_name_array and !@be_server_name_array.empty? -%> <% @be_server_name_array.each do |be_server_name| -%> server <%= be_server_name %> diff --git a/templates/haproxy_frontend_rule.erb b/templates/haproxy_frontend_rule.erb index 24b8b80..c4badd7 100644 --- a/templates/haproxy_frontend_rule.erb +++ b/templates/haproxy_frontend_rule.erb @@ -13,7 +13,6 @@ acl <%= acl_rule_front %> <% end -%> <% if @fe_use_backend_array and !@fe_use_backend_array.empty? -%> <% @fe_use_backend_array.each do |fe_use_backend| -%> -## use_backend <%= fe_use_backend %> <% end -%> <% end -%>