stackforge/puppet-openstack-cloud
Code Issues Proposed changes

[spec] Fix for ruby 1.8 and puppet 2.7 (refs: #187)

Browse Source
This commit is contained in:
Sebastien Badia 2014-02-26 13:49:04 +01:00
parent 7f46390915
commit 1edf8343ac
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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')

4
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -93,7 +93,7 @@ describe 'cloud::compute::hypervisor' 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')
@ -141,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,

2
spec/classes/cloud_network_controller_spec.rb
View File

@ -84,7 +84,7 @@ describe 'cloud::network::controller' do
:auth_host => '10.0.0.1', :auth_host => '10.0.0.1',
: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'
) )
end end