stackforge/puppet-openstack-cloud
Code Issues Proposed changes

network: remove veth_param

Browse Source 
I revert a last patch I did about veth_mtu param.
veth_mtu enforces mtu on veths (between br-int and physnets only).

It's not useful in our case, where this is the external network which is
tagged, so we only need to enforce the MTU within the VM, using DHCP
options.

Close bug #270

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-02-18 22:46:21 +01:00
parent e5fa32b1da
commit f1d4ac9e02
7 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/network.pp
View File

@ -55,10 +55,6 @@
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults value in params
# #
# [*veth_mtu*]
# (optional) MTU for VM virtual network cards.
# Defaults value in params
#
class cloud::network( class cloud::network(
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
@ -70,8 +66,7 @@ class cloud::network(
$provider_vlan_ranges = $os_params::provider_vlan_ranges, $provider_vlan_ranges = $os_params::provider_vlan_ranges,
$provider_bridge_mappings = $os_params::provider_bridge_mappings, $provider_bridge_mappings = $os_params::provider_bridge_mappings,
$use_syslog = $os_params::neutron_use_syslog, $use_syslog = $os_params::neutron_use_syslog,
$log_facility = $os_params::neutron_log_facility, $log_facility = $os_params::neutron_log_facility
$veth_mtu = $os_params::veth_mtu
) { ) {
class { 'neutron': class { 'neutron':
@ -114,7 +109,6 @@ class cloud::network(
'agent/tunnel_types': value => ['gre']; 'agent/tunnel_types': value => ['gre'];
'agent/l2_population': value => true; 'agent/l2_population': value => true;
'agent/polling_interval': value => '2'; 'agent/polling_interval': value => '2';
'agent/veth_mtu': value => $veth_mtu;
'OVS/local_ip': value => $tunnel_eth; 'OVS/local_ip': value => $tunnel_eth;
'OVS/enable_tunneling': value => true; 'OVS/enable_tunneling': value => true;
'OVS/integration_bridge': value => 'br-int'; 'OVS/integration_bridge': value => 'br-int';

1
spec/classes/cloud_network_controller_spec.rb
View File

@ -32,7 +32,6 @@ describe 'cloud::network::controller' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
veth_mtu => '1500',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end

1
spec/classes/cloud_network_dhcp_spec.rb
View File

@ -32,7 +32,6 @@ describe 'cloud::network::dhcp' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
veth_mtu => '1500',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end

1
spec/classes/cloud_network_l3_spec.rb
View File

@ -32,7 +32,6 @@ describe 'cloud::network::l3' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
veth_mtu => '1500',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end

1
spec/classes/cloud_network_lbaas_spec.rb
View File

@ -32,7 +32,6 @@ describe 'cloud::network::lbaas' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
veth_mtu => '1500',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end

1
spec/classes/cloud_network_metadata_spec.rb
View File

@ -32,7 +32,6 @@ describe 'cloud::network::metadata' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
veth_mtu => '1500',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end

1
spec/classes/cloud_network_vpn_spec.rb
View File

@ -32,7 +32,6 @@ describe 'cloud::network::vpn' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
veth_mtu => '1500',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end