add keepalived in fixtures and fix lb tests

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-11 22:48:48 -05:00
parent 85acd41e41
commit bd384ed86b
3 changed files with 2 additions and 8 deletions

View File

@ -13,7 +13,7 @@ fixtures:
'apache': 'git://github.com/puppetlabs/puppetlabs-apache.git'
'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
'haproxy': 'git://github.com/puppetlabs/puppetlabs-haproxy.git'
'keepalived': 'git://github.com/puppetlabs/puppetlabs-keepalived.git'
'keepalived': 'git://github.com/Unyonsys/puppet-module-keepalived.git'
'firewall': 'git://github.com/puppetlabs/puppetlabs-firewall.git'
'mongodb': 'git://github.com/puppetlabs/puppetlabs-mongodb.git'
'mysql':

View File

@ -69,12 +69,6 @@ describe 'privatecloud::loadbalancer' do
should contain_class('keepalived')
end
it 'configure haproxy vrrp script' do
should contain_keepalived_vrrp_script('haproxy').with(
:name_is_process => true
)
end
end
context 'on Debian platforms' do

View File

@ -41,7 +41,7 @@ describe 'privatecloud::network::dhcp' do
:allow_overlapping_ips => true,
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => false,
:debug => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',