stackforge/puppet-openstack-cloud
Code Issues Proposed changes

RHEL: load GRE kernel module

Browse Source 
Install ip_gre module correctly on Red Hat systems.
This commit is contained in:
Emilien Macchi 2014-04-15 15:08:29 +02:00
parent f709c91d1c
commit d313fb1f7c
8 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/network.pp
View File

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

1
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -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

1
spec/classes/cloud_network_controller_spec.rb
View File

@ -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

1
spec/classes/cloud_network_dhcp_spec.rb
View File

@ -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

1
spec/classes/cloud_network_l3_spec.rb
View File

@ -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

1
spec/classes/cloud_network_lbaas_spec.rb
View File

@ -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

1
spec/classes/cloud_network_metadata_spec.rb
View File

@ -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

1
spec/classes/cloud_network_vpn_spec.rb
View File

@ -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