diff --git a/manifests/network.pp b/manifests/network.pp index 8fda75b4..b38bbfcf 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -81,13 +81,11 @@ class cloud::network( } if $::osfamily == 'RedHat' { - $gre_module_name = 'ip_gre' - } else { - $gre_module_name = 'gre' + kmod::install { 'ip_gre': + command => 'install ip_gre /sbin/modprobe ip_gre' + } } - kmod::install { $gre_module_name: } - class { 'neutron': allow_overlapping_ips => true, verbose => $verbose, diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index 1de9901c..a30e4f55 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -157,7 +157,6 @@ describe 'cloud::compute::hypervisor' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - should contain_kmod__install(platform_params[:gre_module_name]) end it 'configure neutron on compute node' do diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 213ccda2..e95a4098 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -78,7 +78,6 @@ describe 'cloud::network::controller' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - 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 c29d5c67..5f863045 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -73,7 +73,6 @@ describe 'cloud::network::dhcp' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - 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 ed38e1e9..69ea1270 100644 --- a/spec/classes/cloud_network_l3_spec.rb +++ b/spec/classes/cloud_network_l3_spec.rb @@ -73,7 +73,6 @@ describe 'cloud::network::l3' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - 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 c19d812e..a83c5747 100644 --- a/spec/classes/cloud_network_lbaas_spec.rb +++ b/spec/classes/cloud_network_lbaas_spec.rb @@ -73,7 +73,6 @@ describe 'cloud::network::lbaas' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - 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 2f159062..d090a2eb 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -80,7 +80,6 @@ describe 'cloud::network::metadata' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - 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 bcaf08c0..cc3362ca 100644 --- a/spec/classes/cloud_network_vpn_spec.rb +++ b/spec/classes/cloud_network_vpn_spec.rb @@ -68,7 +68,6 @@ describe 'cloud::network::vpn' do :network_vlan_ranges => ['physnet1:1000:2999'], :enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' ) - should contain_kmod__install(platform_params[:gre_module_name]) end it 'configure neutron vpnaas' do