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.

Sign up for GitHub

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

Support minus in service names #60

Merged
merged 3 commits into from
Nov 18, 2013
Merged

Support minus in service names #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d41684
Change the order concat fragments of listening services are collected.
Jun 3, 2013
3cc389e
Reference release 1.0.0 in fixtures
ymc-dabe Nov 14, 2013
a950577
Update test examples to check for the added '-01'
ymc-dabe Nov 14, 2013
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
4 changes: 3 additions & 1 deletion .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
fixtures:
repositories:
concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
concat:
repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
ref: '1.0.0'
symlinks:
haproxy: "#{source_dir}"
2 changes: 1 addition & 1 deletion manifests/balancermember.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
) {
# Template uses $ipaddresses, $server_name, $ports, $option
concat::fragment { "${listening_service}_balancermember_${name}":
order => "20-${listening_service}-${name}",
order => "20-${listening_service}-01-${name}",
ensure => $ensure,
target => '/etc/haproxy/haproxy.cfg',
content => template('haproxy/haproxy_balancermember.erb'),
Expand Down
12 changes: 6 additions & 6 deletions spec/defines/balancermember_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
end

it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-tyler',
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server dero 1.1.1.1:18140 check\n"
) }
Expand All @@ -37,7 +37,7 @@
end

it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-tyler',
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'ensure' => 'absent',
'content' => " server dero 1.1.1.1:18140 \n"
Expand All @@ -55,7 +55,7 @@
end

it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-tyler',
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server dero 1.1.1.1:18140 check close\n"
) }
Expand All @@ -73,7 +73,7 @@
end

it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-tyler',
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server dero 1.1.1.1:18140 cookie dero check close\n"
) }
Expand All @@ -91,7 +91,7 @@
end

it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-tyler',
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server server01 192.168.56.200:18140 check\n server server02 192.168.56.201:18140 check\n"
) }
Expand All @@ -109,7 +109,7 @@
end

it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-tyler',
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server server01 192.168.56.200:18140,192.168.56.200:18150 check\n server server02 192.168.56.201:18140,192.168.56.201:18150 check\n"
) }
Expand Down