stackforge/puppet-openstack-cloud
Code Issues Proposed changes

fix unit tests for compute

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-02-25 18:20:52 +01:00
parent b387682b03
commit 9ffc974713
9 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/network.pp
View File

@ -87,10 +87,10 @@ class cloud::network(
bind_host => $api_eth,
log_facility => $log_facility,
use_syslog => $use_syslog,
log_dir => $log_dir,
dhcp_agents_per_network => '2',
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 => $log_dir,
}
class { 'neutron::agents::ovs':

2
manifests/network/controller.pp
View File

@ -39,7 +39,7 @@ class cloud::network::controller(
auth_host => $ks_keystone_admin_host,
auth_port => $ks_keystone_public_port,
database_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8",
api_workers => $::processorcount
api_workers => $::processorcount,
}
# Note(EmilienM):

7
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -63,6 +63,7 @@ describe 'cloud::compute::hypervisor' do
verbose => true,
debug => true,
use_syslog => true,
log_dir => false,
log_facility => 'LOG_LOCAL0' }"
end
@ -93,7 +94,7 @@ describe 'cloud::compute::hypervisor' 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')
@ -140,8 +141,8 @@ describe 'cloud::compute::hypervisor' do
:rabbit_virtual_host => '/',
: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']
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,

4
spec/classes/cloud_network_controller_spec.rb
View File

@ -61,7 +61,6 @@ describe 'cloud::network::controller' do
: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
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,
@ -85,7 +84,8 @@ describe 'cloud::network::controller' do
:auth_host => '10.0.0.1',
:auth_port => '5000',
:database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8',
:api_workers => '2'
:api_workers => '2',
:log_dir => false,
)
end

1
spec/classes/cloud_network_dhcp_spec.rb
View File

@ -56,7 +56,6 @@ describe 'cloud::network::dhcp' do
: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
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,

1
spec/classes/cloud_network_l3_spec.rb
View File

@ -56,7 +56,6 @@ describe 'cloud::network::l3' do
: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
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,

1
spec/classes/cloud_network_lbaas_spec.rb
View File

@ -55,7 +55,6 @@ describe 'cloud::network::lbaas' do
: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
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,

4
spec/classes/cloud_network_metadata_spec.rb
View File

@ -61,8 +61,8 @@ describe 'cloud::network::metadata' do
:rabbit_virtual_host => '/',
: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']
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,

1
spec/classes/cloud_network_vpn_spec.rb
View File

@ -51,7 +51,6 @@ describe 'cloud::network::vpn' do
: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
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,