From 315a39197894e9801ea9b99b35f1f7e7d13c1d5a Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 15 Apr 2014 12:51:27 +0200 Subject: [PATCH] network: load GRE module using kmod puppet module Signed-off-by: Emilien Macchi --- manifests/network.pp | 6 +----- spec/classes/cloud_compute_hypervisor_spec.rb | 8 ++++++++ spec/classes/cloud_network_controller_spec.rb | 6 +----- spec/classes/cloud_network_dhcp_spec.rb | 6 +----- spec/classes/cloud_network_l3_spec.rb | 6 +----- spec/classes/cloud_network_lbaas_spec.rb | 6 +----- spec/classes/cloud_network_metadata_spec.rb | 6 +----- spec/classes/cloud_network_vpn_spec.rb | 6 +----- 8 files changed, 15 insertions(+), 35 deletions(-) diff --git a/manifests/network.pp b/manifests/network.pp index 174bf757..8fda75b4 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -86,11 +86,7 @@ class cloud::network( $gre_module_name = 'gre' } - kmod::generic {'install_gre': - type => 'install', - module => $gre_module_name, - file => '/etc/modprobe.d/neutron.conf' - } + kmod::install { $gre_module_name: } class { 'neutron': allow_overlapping_ips => true, diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index d7effc22..4b16865f 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -206,6 +206,14 @@ describe 'cloud::compute::hypervisor' do ) end + it 'should create neutron modprobe configuration file' do + should contain_file('/etc/modprobe.d/neutron.conf').with( + :owner => 'root', + :group => 'root', + :mode => '0644' + ) + end + it 'configure spice console' do should contain_class('nova::compute::spice').with( :server_listen => '0.0.0.0', diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 714f9b98..213ccda2 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -78,11 +78,7 @@ describe 'cloud::network::controller' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - should contain_kmod__generic('install_gre').with( - :type => 'install', - :module => platform_params[:gre_module_name], - :file => '/etc/modprobe.d/neutron.conf' - ) + should contain_kmod__install(platform_params[:gre_module_name]) end it 'configure neutron server' do diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index a640fe77..c29d5c67 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -73,11 +73,7 @@ describe 'cloud::network::dhcp' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - should contain_kmod__generic('install_gre').with( - :type => 'install', - :module => platform_params[:gre_module_name], - :file => '/etc/modprobe.d/neutron.conf' - ) + should contain_kmod__install(platform_params[:gre_module_name]) end it 'configure neutron dhcp' do diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb index 98510ebd..ed38e1e9 100644 --- a/spec/classes/cloud_network_l3_spec.rb +++ b/spec/classes/cloud_network_l3_spec.rb @@ -73,11 +73,7 @@ describe 'cloud::network::l3' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - should contain_kmod__generic('install_gre').with( - :type => 'install', - :module => platform_params[:gre_module_name], - :file => '/etc/modprobe.d/neutron.conf' - ) + should contain_kmod__install(platform_params[:gre_module_name]) end it 'configure neutron l3' do diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb index 96b0af96..c19d812e 100644 --- a/spec/classes/cloud_network_lbaas_spec.rb +++ b/spec/classes/cloud_network_lbaas_spec.rb @@ -73,11 +73,7 @@ describe 'cloud::network::lbaas' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - should contain_kmod__generic('install_gre').with( - :type => 'install', - :module => platform_params[:gre_module_name], - :file => '/etc/modprobe.d/neutron.conf' - ) + should contain_kmod__install(platform_params[:gre_module_name]) end it 'configure neutron lbaas' do diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb index f1fe7124..2f159062 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -80,11 +80,7 @@ describe 'cloud::network::metadata' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - should contain_kmod__generic('install_gre').with( - :type => 'install', - :module => platform_params[:gre_module_name], - :file => '/etc/modprobe.d/neutron.conf' - ) + should contain_kmod__install(platform_params[:gre_module_name]) end it 'configure neutron metadata' do diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb index 5c013d62..bcaf08c0 100644 --- a/spec/classes/cloud_network_vpn_spec.rb +++ b/spec/classes/cloud_network_vpn_spec.rb @@ -68,11 +68,7 @@ describe 'cloud::network::vpn' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - should contain_kmod__generic('install_gre').with( - :type => 'install', - :module => platform_params[:gre_module_name], - :file => '/etc/modprobe.d/neutron.conf' - ) + should contain_kmod__install(platform_params[:gre_module_name]) end it 'configure neutron vpnaas' do