Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apache::balancer: Add a target parameter to write to a custom path #1386

Merged
merged 1 commit into from
Mar 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions manifests/balancer.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
# Hash, default empty. If given, each key-value pair will be used as a ProxySet
# line in the configuration.
#
# [*target*]
# String, default undef. If given, path to the file the balancer definition will
# be written.
#
# [*collect_exported*]
# Boolean, default 'true'. True means 'collect exported @@balancermember
# resources' (for the case when every balancermember node exports itself),
Expand All @@ -41,21 +45,27 @@
define apache::balancer (
$proxy_set = {},
$collect_exported = true,
$target = undef,
) {
include ::apache::mod::proxy_balancer

$target = "${::apache::params::confd_dir}/balancer_${name}.conf"
if $target {
$_target = $target
} else {
$_target = "${::apache::params::confd_dir}/balancer_${name}.conf"
}

concat { $target:
concat { "apache_balancer_${name}":
owner => '0',
group => '0',
path => $_target,
mode => $::apache::file_mode,
notify => Class['Apache::Service'],
}

concat::fragment { "00-${name}-header":
ensure => present,
target => $target,
target => "apache_balancer_${name}",
order => '01',
content => "<Proxy balancer://${name}>\n",
}
Expand All @@ -68,14 +78,14 @@

concat::fragment { "01-${name}-proxyset":
ensure => present,
target => $target,
target => "apache_balancer_${name}",
order => '19',
content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"),
}

concat::fragment { "01-${name}-footer":
ensure => present,
target => $target,
target => "apache_balancer_${name}",
order => '20',
content => "</Proxy>\n",
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/balancermember.pp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

concat::fragment { "BalancerMember ${name}":
ensure => present,
target => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
target => "apache_balancer_${balancer_cluster}",
content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
}
}
33 changes: 33 additions & 0 deletions spec/defines/balancer_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
require 'spec_helper'

describe 'apache::balancer', :type => :define do
let :pre_condition do
'include apache'
end
let :facts do
{
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => '6',
:lsbdistcodename => 'squeeze',
:id => 'root',
:concat_basedir => '/dne',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:kernel => 'Linux',
:is_pe => false,
}
end
describe "accept a target parameter and use it" do
let :title do
'myapp'
end
let :params do
{
:target => '/tmp/myapp.conf'
}
end
it { should contain_concat('apache_balancer_myapp').with({
:path => "/tmp/myapp.conf",
})}
end
end
52 changes: 37 additions & 15 deletions spec/defines/balancermember_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,7 @@

describe 'apache::balancermember', :type => :define do
let :pre_condition do
'include apache
apache::balancer {"balancer":}
apache::balancer {"balancer-external":}
apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancer-external"}
'
end
let :title do
'http://127.0.0.1:8080/'
end
let :params do
{
:options => [],
:url => 'http://127.0.0.1:8080/',
:balancer_cluster => 'balancer-internal'
}
'include apache'
end
let :facts do
{
Expand All @@ -32,6 +18,42 @@
}
end
describe "allows multiple balancermembers with the same url" do
let :pre_condition do
'apache::balancer {"balancer":}
apache::balancer {"balancer-external":}
apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancer-external"}
'
end
let :title do
'http://127.0.0.1:8080/'
end
let :params do
{
:options => [],
:url => 'http://127.0.0.1:8080/',
:balancer_cluster => 'balancer-internal'
}
end
it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/') }
end
describe "allows balancermember with a different target" do
let :pre_condition do
'apache::balancer {"balancername": target => "/etc/apache/balancer.conf"}
apache::balancermember {"http://127.0.0.1:8080-external": url => "http://127.0.0.1:8080/", balancer_cluster => "balancername"}
'
end
let :title do
'http://127.0.0.1:8080/'
end
let :params do
{
:options => [],
:url => 'http://127.0.0.1:8080/',
:balancer_cluster => 'balancername'
}
end
it { should contain_concat__fragment('BalancerMember http://127.0.0.1:8080/').with({
:target => "apache_balancer_balancername",
})}
end
end