stackforge/puppet-openstack-cloud
Code Issues Proposed changes

fix unit tests for log_dir

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-26 13:35:10 +01:00
parent 359693d116
commit f72ca4ca52
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute.pp
View File

@@ -115,7 +115,7 @@ class cloud::compute(
debug => $debug, debug => $debug,
log_dir => $log_dir, log_dir => $log_dir,
log_facility => $log_facility, log_facility => $log_facility,
use_syslog => $use_syslog use_syslog => $use_syslog,
} }
class { 'nova::network::neutron': class { 'nova::network::neutron':

2
spec/classes/cloud_compute_controller_spec.rb
View File

@@ -67,7 +67,7 @@ describe 'cloud::compute::controller' do
:memcached_servers => ['10.0.0.1','10.0.0.2'], :memcached_servers => ['10.0.0.1','10.0.0.2'],
:database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8',
:glance_api_servers => 'http://10.0.0.1:9292', :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/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')

3
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@@ -63,7 +63,6 @@ describe 'cloud::compute::hypervisor' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
log_dir => false,
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end
@@ -142,7 +141,7 @@ describe 'cloud::compute::hypervisor' do
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :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'], :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( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

1
spec/classes/cloud_network_controller_spec.rb
View File

@@ -85,7 +85,6 @@ describe 'cloud::network::controller' do
:auth_port => '5000', :auth_port => '5000',
:database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8', :database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8',
:api_workers => '2', :api_workers => '2',
:log_dir => false,
) )
end end