stackforge/puppet-openstack-cloud
Code Issues Proposed changes

[network] Add syslog mgmt and facility through params

Browse Source 
Refs: GH-78
This commit is contained in:
Sebastien Badia 2014-01-29 10:18:23 +01:00
parent 60c540d716
commit eb5e9dfc8c
8 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/network.pp
View File

@ -47,7 +47,14 @@
# (optionnal) Bridge mapping for provider networks # (optionnal) Bridge mapping for provider networks
# Default value in params # Default value in params
# #
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults value in params
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults value in params
#
class cloud::network( class cloud::network(
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
$debug = $os_params::debug, $debug = $os_params::debug,
@ -57,6 +64,8 @@ class cloud::network(
$api_eth = $os_params::api_eth, $api_eth = $os_params::api_eth,
$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,
$log_facility = $os_params::neutron_log_facility
) { ) {
class { 'neutron': class { 'neutron':
@ -68,6 +77,8 @@ class cloud::network(
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
rabbit_virtual_host => '/', rabbit_virtual_host => '/',
bind_host => $api_eth, bind_host => $api_eth,
log_facility => $log_facility,
use_syslog => $use_syslog,
dhcp_agents_per_network => '2', dhcp_agents_per_network => '2',
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']

7
spec/classes/cloud_network_compute_spec.rb
View File

@ -15,7 +15,6 @@
# #
# Unit tests for cloud::network::compute class # Unit tests for cloud::network::compute class
# #
require 'spec_helper' require 'spec_helper'
describe 'cloud::network::compute' do describe 'cloud::network::compute' do
@ -31,7 +30,9 @@ describe 'cloud::network::compute' do
provider_vlan_ranges => ['physnet1:1000:2999'], provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'], provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
let :params do let :params do
@ -47,6 +48,8 @@ describe 'cloud::network::compute' do
:dhcp_agents_per_network => '2', :dhcp_agents_per_network => '2',
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron', :rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',

7
spec/classes/cloud_network_controller_spec.rb
View File

@ -15,7 +15,6 @@
# #
# Unit tests for cloud::network::controller class # Unit tests for cloud::network::controller class
# #
require 'spec_helper' require 'spec_helper'
describe 'cloud::network::controller' do describe 'cloud::network::controller' do
@ -31,7 +30,9 @@ describe 'cloud::network::controller' do
provider_vlan_ranges => ['physnet1:1000:2999'], provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'], provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
let :params do let :params do
@ -50,6 +51,8 @@ describe 'cloud::network::controller' do
:dhcp_agents_per_network => '2', :dhcp_agents_per_network => '2',
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron', :rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',

7
spec/classes/cloud_network_dhcp_spec.rb
View File

@ -15,7 +15,6 @@
# #
# Unit tests for cloud::network::dhcp class # Unit tests for cloud::network::dhcp class
# #
require 'spec_helper' require 'spec_helper'
describe 'cloud::network::dhcp' do describe 'cloud::network::dhcp' do
@ -31,7 +30,9 @@ describe 'cloud::network::dhcp' do
provider_vlan_ranges => ['physnet1:1000:2999'], provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'], provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
let :params do let :params do
@ -44,6 +45,8 @@ describe 'cloud::network::dhcp' do
:dhcp_agents_per_network => '2', :dhcp_agents_per_network => '2',
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron', :rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',

7
spec/classes/cloud_network_l3_spec.rb
View File

@ -15,7 +15,6 @@
# #
# Unit tests for cloud::network::l3 class # Unit tests for cloud::network::l3 class
# #
require 'spec_helper' require 'spec_helper'
describe 'cloud::network::l3' do describe 'cloud::network::l3' do
@ -31,7 +30,9 @@ describe 'cloud::network::l3' do
provider_vlan_ranges => ['physnet1:1000:2999'], provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'], provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
let :params do let :params do
@ -45,6 +46,8 @@ describe 'cloud::network::l3' do
:dhcp_agents_per_network => '2', :dhcp_agents_per_network => '2',
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron', :rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',

7
spec/classes/cloud_network_lbaas_spec.rb
View File

@ -15,7 +15,6 @@
# #
# Unit tests for cloud::network::lbaas class # Unit tests for cloud::network::lbaas class
# #
require 'spec_helper' require 'spec_helper'
describe 'cloud::network::lbaas' do describe 'cloud::network::lbaas' do
@ -31,7 +30,9 @@ describe 'cloud::network::lbaas' do
provider_vlan_ranges => ['physnet1:1000:2999'], provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'], provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
let :params do let :params do
@ -44,6 +45,8 @@ describe 'cloud::network::lbaas' do
:dhcp_agents_per_network => '2', :dhcp_agents_per_network => '2',
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron', :rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',

7
spec/classes/cloud_network_metadata_spec.rb
View File

@ -15,7 +15,6 @@
# #
# Unit tests for cloud::network::metadata class # Unit tests for cloud::network::metadata class
# #
require 'spec_helper' require 'spec_helper'
describe 'cloud::network::metadata' do describe 'cloud::network::metadata' do
@ -31,7 +30,9 @@ describe 'cloud::network::metadata' do
provider_vlan_ranges => ['physnet1:1000:2999'], provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'], provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
let :params do let :params do
@ -51,6 +52,8 @@ describe 'cloud::network::metadata' do
:dhcp_agents_per_network => '2', :dhcp_agents_per_network => '2',
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron', :rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',

7
spec/classes/cloud_network_vpn_spec.rb
View File

@ -15,7 +15,6 @@
# #
# Unit tests for cloud::network::vpnaas class # Unit tests for cloud::network::vpnaas class
# #
require 'spec_helper' require 'spec_helper'
describe 'cloud::network::vpn' do describe 'cloud::network::vpn' do
@ -31,7 +30,9 @@ describe 'cloud::network::vpn' do
provider_vlan_ranges => ['physnet1:1000:2999'], provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'], provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true, verbose => true,
debug => true }" debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end end
it 'configure neutron common' do it 'configure neutron common' do
@ -40,6 +41,8 @@ describe 'cloud::network::vpn' do
:dhcp_agents_per_network => '2', :dhcp_agents_per_network => '2',
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron', :rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',