Merge pull request #423 from enovance/fix-modprobe

network: load GRE kernel module

manifests/network.pp

@@ -86,11 +86,7 @@ class cloud::network(
     $gre_module_name = 'gre'
   }
 
-  kmod::generic {'install_gre':
+  kmod::install { $gre_module_name: }
-    type   => 'install',
-    module => $gre_module_name,
-    file   => '/etc/modprobe.d/neutron.conf'
-  }
 
   class { 'neutron':
     allow_overlapping_ips   => true,

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

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(
+      should contain_kmod__install(platform_params[:gre_module_name])
-        :type   => 'install',
-        :module => platform_params[:gre_module_name],
-        :file   => '/etc/modprobe.d/neutron.conf'
-      )
     end
 
     it 'configure neutron server' do

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(
+      should contain_kmod__install(platform_params[:gre_module_name])
-        :type   => 'install',
-        :module => platform_params[:gre_module_name],
-        :file   => '/etc/modprobe.d/neutron.conf'
-      )
     end
 
     it 'configure neutron dhcp' do

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(
+      should contain_kmod__install(platform_params[:gre_module_name])
-        :type   => 'install',
-        :module => platform_params[:gre_module_name],
-        :file   => '/etc/modprobe.d/neutron.conf'
-      )
     end
 
     it 'configure neutron l3' do

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(
+      should contain_kmod__install(platform_params[:gre_module_name])
-        :type   => 'install',
-        :module => platform_params[:gre_module_name],
-        :file   => '/etc/modprobe.d/neutron.conf'
-      )
     end
 
     it 'configure neutron lbaas' do

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(
+      should contain_kmod__install(platform_params[:gre_module_name])
-        :type   => 'install',
-        :module => platform_params[:gre_module_name],
-        :file   => '/etc/modprobe.d/neutron.conf'
-      )
     end
 
     it 'configure neutron metadata' do

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(
+      should contain_kmod__install(platform_params[:gre_module_name])
-        :type   => 'install',
-        :module => platform_params[:gre_module_name],
-        :file   => '/etc/modprobe.d/neutron.conf'
-      )
     end
 
     it 'configure neutron vpnaas' do