From 8ec39a1f4a82c99e24d0131baeb48834eed4c872 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 17 Mar 2014 13:37:37 +0100 Subject: [PATCH 1/2] network: add dhcp_lease_duration param support Allow the end user to choose the lease duration of DHCP for the VMs. Feature #364 Signed-off-by: Emilien Macchi --- manifests/network.pp | 7 ++++++- spec/classes/cloud_network_controller_spec.rb | 4 +++- spec/classes/cloud_network_dhcp_spec.rb | 4 +++- spec/classes/cloud_network_l3_spec.rb | 4 +++- spec/classes/cloud_network_lbaas_spec.rb | 4 +++- spec/classes/cloud_network_metadata_spec.rb | 4 +++- spec/classes/cloud_network_vpn_spec.rb | 4 +++- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/manifests/network.pp b/manifests/network.pp index dc4d8974..a6a81cbd 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -55,6 +55,9 @@ # (optional) Syslog facility to receive log lines # Defaults value in params # +# [*dhcp_lease_duration*] +# (optionnal) DHCP Lease duration (in seconds) +# Defauls to '120' class cloud::network( $verbose = $os_params::verbose, @@ -66,7 +69,8 @@ class cloud::network( $provider_vlan_ranges = $os_params::provider_vlan_ranges, $provider_bridge_mappings = $os_params::provider_bridge_mappings, $use_syslog = $os_params::use_syslog, - $log_facility = $os_params::log_facility + $log_facility = $os_params::log_facility, + $dhcp_lease_duration = '120', ) { # Disable twice logging if syslog is enabled @@ -91,6 +95,7 @@ class cloud::network( core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], log_dir => $log_dir, + dhcp_lease_duration => $dhcp_lease_duration, } class { 'neutron::agents::ovs': diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index e8a0ba9d..aa306081 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::network::controller' do verbose => true, debug => true, use_syslog => true, + dhcp_lease_duration => '120', log_facility => 'LOG_LOCAL0' }" end @@ -60,7 +61,8 @@ describe 'cloud::network::controller' do :bind_host => '10.0.0.1', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], - :log_dir => false + :log_dir => false, + :dhcp_lease_duration => '120' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index 12d4c56a..9b535751 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::network::dhcp' do verbose => true, debug => true, use_syslog => true, + dhcp_lease_duration => '120', log_facility => 'LOG_LOCAL0' }" end @@ -55,7 +56,8 @@ describe 'cloud::network::dhcp' do :bind_host => '10.0.0.1', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], - :log_dir => false + :log_dir => false, + :dhcp_lease_duration => '120' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb index 854bc4b7..4226dd4c 100644 --- a/spec/classes/cloud_network_l3_spec.rb +++ b/spec/classes/cloud_network_l3_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::network::l3' do verbose => true, debug => true, use_syslog => true, + dhcp_lease_duration => '120', log_facility => 'LOG_LOCAL0' }" end @@ -55,7 +56,8 @@ describe 'cloud::network::l3' do :bind_host => '10.0.0.1', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], - :log_dir => false + :log_dir => false, + :dhcp_lease_duration => '120' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb index 527b7d40..a5681ea6 100644 --- a/spec/classes/cloud_network_lbaas_spec.rb +++ b/spec/classes/cloud_network_lbaas_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::network::lbaas' do verbose => true, debug => true, use_syslog => true, + dhcp_lease_duration => '120', log_facility => 'LOG_LOCAL0' }" end @@ -54,7 +55,8 @@ describe 'cloud::network::lbaas' do :bind_host => '10.0.0.1', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], - :log_dir => false + :log_dir => false, + :dhcp_lease_duration => '120' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb index ff95b600..e817991d 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::network::metadata' do verbose => true, debug => true, use_syslog => true, + dhcp_lease_duration => '120', log_facility => 'LOG_LOCAL0' }" end @@ -62,7 +63,8 @@ describe 'cloud::network::metadata' do :bind_host => '10.0.0.1', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], - :log_dir => false + :log_dir => false, + :dhcp_lease_duration => '120' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb index bceee7cb..341d628f 100644 --- a/spec/classes/cloud_network_vpn_spec.rb +++ b/spec/classes/cloud_network_vpn_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::network::vpn' do verbose => true, debug => true, use_syslog => true, + dhcp_lease_duration => '120', log_facility => 'LOG_LOCAL0' }" end @@ -50,7 +51,8 @@ describe 'cloud::network::vpn' do :bind_host => '10.0.0.1', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], - :log_dir => false + :log_dir => false, + :dhcp_lease_duration => '120' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, From 1c2539fdc5d876d9625f293db529f1281be4850e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 18 Mar 2014 18:07:42 +0100 Subject: [PATCH 2/2] network/spec: change dhcp lease default value Bug #364 Signed-off-by: Emilien Macchi --- spec/classes/cloud_network_controller_spec.rb | 4 ++-- spec/classes/cloud_network_dhcp_spec.rb | 4 ++-- spec/classes/cloud_network_l3_spec.rb | 4 ++-- spec/classes/cloud_network_lbaas_spec.rb | 4 ++-- spec/classes/cloud_network_metadata_spec.rb | 4 ++-- spec/classes/cloud_network_vpn_spec.rb | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index aa306081..76bb4d61 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -32,7 +32,7 @@ describe 'cloud::network::controller' do verbose => true, debug => true, use_syslog => true, - dhcp_lease_duration => '120', + dhcp_lease_duration => '10', log_facility => 'LOG_LOCAL0' }" end @@ -62,7 +62,7 @@ describe 'cloud::network::controller' do :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :log_dir => false, - :dhcp_lease_duration => '120' + :dhcp_lease_duration => '10' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index 9b535751..fae78774 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -32,7 +32,7 @@ describe 'cloud::network::dhcp' do verbose => true, debug => true, use_syslog => true, - dhcp_lease_duration => '120', + dhcp_lease_duration => '10', log_facility => 'LOG_LOCAL0' }" end @@ -57,7 +57,7 @@ describe 'cloud::network::dhcp' do :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :log_dir => false, - :dhcp_lease_duration => '120' + :dhcp_lease_duration => '10' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb index 4226dd4c..62539055 100644 --- a/spec/classes/cloud_network_l3_spec.rb +++ b/spec/classes/cloud_network_l3_spec.rb @@ -32,7 +32,7 @@ describe 'cloud::network::l3' do verbose => true, debug => true, use_syslog => true, - dhcp_lease_duration => '120', + dhcp_lease_duration => '10', log_facility => 'LOG_LOCAL0' }" end @@ -57,7 +57,7 @@ describe 'cloud::network::l3' do :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :log_dir => false, - :dhcp_lease_duration => '120' + :dhcp_lease_duration => '10' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb index a5681ea6..3d8dcd24 100644 --- a/spec/classes/cloud_network_lbaas_spec.rb +++ b/spec/classes/cloud_network_lbaas_spec.rb @@ -32,7 +32,7 @@ describe 'cloud::network::lbaas' do verbose => true, debug => true, use_syslog => true, - dhcp_lease_duration => '120', + dhcp_lease_duration => '10', log_facility => 'LOG_LOCAL0' }" end @@ -56,7 +56,7 @@ describe 'cloud::network::lbaas' do :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :log_dir => false, - :dhcp_lease_duration => '120' + :dhcp_lease_duration => '10' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb index e817991d..4a0b68ed 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -32,7 +32,7 @@ describe 'cloud::network::metadata' do verbose => true, debug => true, use_syslog => true, - dhcp_lease_duration => '120', + dhcp_lease_duration => '10', log_facility => 'LOG_LOCAL0' }" end @@ -64,7 +64,7 @@ describe 'cloud::network::metadata' do :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :log_dir => false, - :dhcp_lease_duration => '120' + :dhcp_lease_duration => '10' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb index 341d628f..72c66186 100644 --- a/spec/classes/cloud_network_vpn_spec.rb +++ b/spec/classes/cloud_network_vpn_spec.rb @@ -32,7 +32,7 @@ describe 'cloud::network::vpn' do verbose => true, debug => true, use_syslog => true, - dhcp_lease_duration => '120', + dhcp_lease_duration => '10', log_facility => 'LOG_LOCAL0' }" end @@ -52,7 +52,7 @@ describe 'cloud::network::vpn' do :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :log_dir => false, - :dhcp_lease_duration => '120' + :dhcp_lease_duration => '10' ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true,