From 57557202f5ccd16ccd276ce3997a3f8d370e8c60 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Fri, 12 Oct 2012 15:08:10 -0700 Subject: No need to manually set ordering --- spec/defines/balancermember_spec.rb | 8 ++++---- spec/defines/listen_spec.rb | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'spec') diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb index 1a37673..74bc7a8 100644 --- a/spec/defines/balancermember_spec.rb +++ b/spec/defines/balancermember_spec.rb @@ -20,7 +20,7 @@ describe 'haproxy::balancermember' do end it { should contain_concat__fragment('croy_balancermember_tyler').with( - 'order' => '20', + 'order' => '20-croy-tyler', 'target' => '/etc/haproxy/haproxy.cfg', 'content' => " server dero 1.1.1.1:18140 check\n\n" ) } @@ -37,7 +37,7 @@ describe 'haproxy::balancermember' do end it { should contain_concat__fragment('croy_balancermember_tyler').with( - 'order' => '20', + 'order' => '20-croy-tyler', 'target' => '/etc/haproxy/haproxy.cfg', 'content' => " server dero 1.1.1.1:18140 check close\n\n" ) } @@ -56,7 +56,7 @@ describe 'haproxy::balancermember' do end it { should contain_concat__fragment('croy_balancermember_tyler').with( - 'order' => '20', + 'order' => '20-croy-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\n" ) } @@ -74,7 +74,7 @@ describe 'haproxy::balancermember' do end it { should contain_concat__fragment('croy_balancermember_tyler').with( - 'order' => '20', + 'order' => '20-croy-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\n" ) } diff --git a/spec/defines/listen_spec.rb b/spec/defines/listen_spec.rb index 16a0cfa..fa54409 100644 --- a/spec/defines/listen_spec.rb +++ b/spec/defines/listen_spec.rb @@ -12,7 +12,7 @@ describe 'haproxy::listen' do end it { should contain_concat__fragment('croy_listen_block').with( - 'order' => '20', + 'order' => '20-croy', 'target' => '/etc/haproxy/haproxy.cfg', 'content' => "\nlisten croy 1.1.1.1:18140\n balance roundrobin\n option tcplog\n option ssl-hello-chk\n" ) } @@ -30,7 +30,7 @@ describe 'haproxy::listen' do end it { should contain_concat__fragment('apache_listen_block').with( - 'order' => '20', + 'order' => '20-apache', 'target' => '/etc/haproxy/haproxy.cfg', 'content' => "\nlisten apache 23.23.23.23:80,23.23.23.23:443\n balance roundrobin\n option tcplog\n option ssl-hello-chk\n" ) } @@ -45,7 +45,7 @@ describe 'haproxy::listen' do end it { should contain_concat__fragment('apache_listen_block').with( - 'order' => '20', + 'order' => '20-apache', 'target' => '/etc/haproxy/haproxy.cfg', 'content' => "\nlisten apache 23.23.23.23:80,23.23.23.23:443\n balance roundrobin\n option tcplog\n option ssl-hello-chk\n" ) } -- cgit v1.2.3