stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #365 from enovance/feature/364/emilien

Browse Source 
network: add dhcp_lease_duration param support
This commit is contained in:
Sebastien Badia 2014-03-18 18:10:00 +01:00
commit ba31272df0
7 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/network.pp
View File

@ -55,6 +55,9 @@
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults value in params
# #
# [*dhcp_lease_duration*]
# (optionnal) DHCP Lease duration (in seconds)
# Defauls to '120'
class cloud::network( class cloud::network(
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
@ -66,7 +69,8 @@ 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::use_syslog, $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 # Disable twice logging if syslog is enabled
@ -91,6 +95,7 @@ class cloud::network(
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', 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'], 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, log_dir => $log_dir,
dhcp_lease_duration => $dhcp_lease_duration,
} }
class { 'neutron::agents::ovs': class { 'neutron::agents::ovs':

4
spec/classes/cloud_network_controller_spec.rb
View File

@ -32,6 +32,7 @@ describe 'cloud::network::controller' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
dhcp_lease_duration => '10',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end
@ -60,7 +61,8 @@ describe 'cloud::network::controller' do
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :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'], :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 => '10'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

4
spec/classes/cloud_network_dhcp_spec.rb
View File

@ -32,6 +32,7 @@ describe 'cloud::network::dhcp' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
dhcp_lease_duration => '10',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end
@ -55,7 +56,8 @@ describe 'cloud::network::dhcp' do
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :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'], :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 => '10'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

4
spec/classes/cloud_network_l3_spec.rb
View File

@ -32,6 +32,7 @@ describe 'cloud::network::l3' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
dhcp_lease_duration => '10',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end
@ -55,7 +56,8 @@ describe 'cloud::network::l3' do
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :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'], :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 => '10'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

4
spec/classes/cloud_network_lbaas_spec.rb
View File

@ -32,6 +32,7 @@ describe 'cloud::network::lbaas' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
dhcp_lease_duration => '10',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end
@ -54,7 +55,8 @@ describe 'cloud::network::lbaas' do
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :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'], :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 => '10'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

4
spec/classes/cloud_network_metadata_spec.rb
View File

@ -32,6 +32,7 @@ describe 'cloud::network::metadata' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
dhcp_lease_duration => '10',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end
@ -62,7 +63,8 @@ describe 'cloud::network::metadata' do
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :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'], :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 => '10'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

4
spec/classes/cloud_network_vpn_spec.rb
View File

@ -32,6 +32,7 @@ describe 'cloud::network::vpn' do
verbose => true, verbose => true,
debug => true, debug => true,
use_syslog => true, use_syslog => true,
dhcp_lease_duration => '10',
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end
@ -50,7 +51,8 @@ describe 'cloud::network::vpn' do
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :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'], :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 => '10'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,