From f72ca4ca52636a1f52ddc768680468f2e622120c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 26 Feb 2014 13:35:10 +0100 Subject: [PATCH] fix unit tests for log_dir Signed-off-by: Emilien Macchi --- manifests/compute.pp | 2 +- spec/classes/cloud_compute_controller_spec.rb | 2 +- spec/classes/cloud_compute_hypervisor_spec.rb | 3 +-- spec/classes/cloud_network_controller_spec.rb | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index 62a9a399..b5cd399c 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -115,7 +115,7 @@ class cloud::compute( debug => $debug, log_dir => $log_dir, log_facility => $log_facility, - use_syslog => $use_syslog + use_syslog => $use_syslog, } class { 'nova::network::neutron': diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb index 476bfc79..f17b07cf 100644 --- a/spec/classes/cloud_compute_controller_spec.rb +++ b/spec/classes/cloud_compute_controller_spec.rb @@ -67,7 +67,7 @@ describe 'cloud::compute::controller' do :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :glance_api_servers => 'http://10.0.0.1:9292', - :log_dir => false + :log_dir => false, ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index dabdea7e..02b85289 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -63,7 +63,6 @@ describe 'cloud::compute::hypervisor' do verbose => true, debug => true, use_syslog => true, - log_dir => false, log_facility => 'LOG_LOCAL0' }" end @@ -142,7 +141,7 @@ describe 'cloud::compute::hypervisor' do :bind_host => '10.0.0.1', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], - :log_dir => false + :log_dir => false, ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 9aac73a7..962561ae 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -85,7 +85,6 @@ describe 'cloud::network::controller' do :auth_port => '5000', :database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8', :api_workers => '2', - :log_dir => false, ) end