From bd384ed86baeb6e7ce7988b86f41c1825fadad7e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sat, 11 Jan 2014 22:48:48 -0500 Subject: [PATCH] add keepalived in fixtures and fix lb tests Signed-off-by: Emilien Macchi --- .fixtures.yml | 2 +- spec/classes/privatecloud_loadbalancer_spec.rb | 6 ------ spec/classes/privatecloud_network_dhcp_spec.rb | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 6160d67b..ebc6be12 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -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': diff --git a/spec/classes/privatecloud_loadbalancer_spec.rb b/spec/classes/privatecloud_loadbalancer_spec.rb index 55707ebb..6a2ea106 100644 --- a/spec/classes/privatecloud_loadbalancer_spec.rb +++ b/spec/classes/privatecloud_loadbalancer_spec.rb @@ -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 diff --git a/spec/classes/privatecloud_network_dhcp_spec.rb b/spec/classes/privatecloud_network_dhcp_spec.rb index e8eff992..e7df8f7f 100644 --- a/spec/classes/privatecloud_network_dhcp_spec.rb +++ b/spec/classes/privatecloud_network_dhcp_spec.rb @@ -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',