diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp index adf99c0..5ada7fd 100644 --- a/manifests/server/proxy.pp +++ b/manifests/server/proxy.pp @@ -27,7 +27,7 @@ define cd_haproxy::server::proxy ( $frontend_name = undef, $frontend_mode = undef, -$fe_use_backend = undef, +$fe_use_backend = '', $frontend_order = '010', $acl_rule = undef, $acl_order = '020', diff --git a/manifests/server/proxy_test.pp b/manifests/server/proxy_test.pp index e4b2c7e..2b4fc66 100644 --- a/manifests/server/proxy_test.pp +++ b/manifests/server/proxy_test.pp @@ -27,7 +27,6 @@ class cd_haproxy::server::proxy_test ( cd_haproxy::server::proxy { 'testing': frontend_name => 'test01-frontend', frontend_mode => 'http', - fe_use_backend => "${backend_name}", acl_rule => 'test01-acl', backend_name => 'test01-backend', } diff --git a/templates/haproxy_frontend_rule.erb b/templates/haproxy_frontend_rule.erb index 09cc00c..a0bfc71 100644 --- a/templates/haproxy_frontend_rule.erb +++ b/templates/haproxy_frontend_rule.erb @@ -1,5 +1,8 @@ frontend <%= @frontend_name %> mode <%= @frontend_mode %> - +<% if @fe_use_backend != '' -%> use_backend <%= @fe_use_backend %> +<% else -%> +use_backend <%= @backend_name %> +<% end -%>