openstack/fuel-library
Code Issues Proposed changes

Fixing haproxy tests

Browse Source 
This change adjusts the haproxy test to pass and enables them as part of
the unit tests for fuel-library.

Change-Id: Ic007e511176d3229b80e825f34824a8c525cebfe
Related-Bug: #1507751
This commit is contained in:
Alex Schultz 2015-10-19 21:07:38 -05:00
parent 790fa9354d
commit 197176f2fd
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment/puppet/haproxy/spec/defines/balancermember_spec.rb
View File

@ -25,7 +25,7 @@ describe 'haproxy::balancermember' do
it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server dero 1.1.1.1:18140 check\n"
'content' => " server dero 1.1.1.1:18140 check\n"
) }
end
@ -43,7 +43,7 @@ describe 'haproxy::balancermember' do
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'ensure' => 'absent',
'content' => " server dero 1.1.1.1:18140 \n"
'content' => " server dero 1.1.1.1:18140 \n"
) }
end
@ -60,7 +60,7 @@ describe 'haproxy::balancermember' do
it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server dero 1.1.1.1:18140 check close\n"
'content' => " server dero 1.1.1.1:18140 check close\n"
) }
end
@ -78,7 +78,7 @@ describe 'haproxy::balancermember' do
it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server dero 1.1.1.1:18140 cookie dero check close\n"
'content' => " server dero 1.1.1.1:18140 cookie dero check close\n"
) }
end
context 'with multiple servers' do
@ -96,7 +96,7 @@ describe 'haproxy::balancermember' do
it { should contain_concat__fragment('croy_balancermember_tyler').with(
'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"
'content' => " server server01 192.168.56.200:18140 check\n server server02 192.168.56.201:18140 check\n"
) }
end
context 'with multiple servers and multiple ports' do
@ -114,7 +114,7 @@ describe 'haproxy::balancermember' do
it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server server01 192.168.56.200:18140 check\n server server01 192.168.56.200:18150 check\n server server02 192.168.56.201:18140 check\n server server02 192.168.56.201:18150 check\n"
'content' => " server server01 192.168.56.200:18140 check\n server server01 192.168.56.200:18150 check\n server server02 192.168.56.201:18140 check\n server server02 192.168.56.201:18150 check\n"
) }
end
context 'with multiple servers and no port' do
@ -131,7 +131,7 @@ describe 'haproxy::balancermember' do
it { should contain_concat__fragment('croy_balancermember_tyler').with(
'order' => '20-croy-01-tyler',
'target' => '/etc/haproxy/haproxy.cfg',
'content' => " server server01 192.168.56.200 check\n server server02 192.168.56.201 check\n"
'content' => " server server01 192.168.56.200 check\n server server02 192.168.56.201 check\n"
) }
end
end

20
deployment/puppet/haproxy/spec/defines/listen_spec.rb
View File

@ -21,7 +21,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('croy_listen_block').with(
'order' => '20-croy-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten croy\n bind 1.1.1.1:18140 \n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -40,7 +40,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n bind 23.23.23.23:80 \n bind 23.23.23.23:443 \n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -56,7 +56,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n bind 23.23.23.23:80 \n bind 23.23.23.23:443 \n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -72,7 +72,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -116,7 +116,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n bind some-hostname:80 \n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -131,7 +131,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n bind *:80 \n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -146,7 +146,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n bind 10.0.0.1:333 ssl crt public.puppetlabs.com\n bind 192.168.122.1:8082 \n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -203,7 +203,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n bind 1.1.1.1:80 the options go here\n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -217,7 +217,7 @@ describe 'haproxy::listen' do
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n bind 1.1.1.1:80 \n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end
@ -237,7 +237,7 @@ describe 'haproxy::listen' do
end
it { should contain_concat__fragment('apache_listen_block').with(
'order' => '20-apache-00',
'target' => '/etc/haproxy/haproxy.cfg',
'target' => '/etc/haproxy/haproxy.conf',
'content' => "\nlisten apache\n bind /var/run/ssl-frontend.sock user root mode 600 accept-proxy\n bind 1.1.1.1:80 \n bind 2.2.2.2:8000-8010 ssl crt public.puppetlabs.com\n bind :443,:8443 ssl crt public.puppetlabs.com no-sslv3\n bind fd@${FD_APP1} \n balance roundrobin\n option tcplog\n option ssl-hello-chk\n"
) }
end

1
utils/jenkins/modules.disable_rspec
View File

@ -10,7 +10,6 @@ docker
erlang
firewall
glance
haproxy
heat
heat_ha
horizon