diff --git a/manifests/network.pp b/manifests/network.pp index 918caeb3..a1066f73 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -47,7 +47,14 @@ # (optionnal) Bridge mapping for provider networks # 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( $verbose = $os_params::verbose, $debug = $os_params::debug, @@ -57,6 +64,8 @@ class cloud::network( $api_eth = $os_params::api_eth, $provider_vlan_ranges = $os_params::provider_vlan_ranges, $provider_bridge_mappings = $os_params::provider_bridge_mappings + $use_syslog = $os_params::neutron_use_syslog, + $log_facility = $os_params::neutron_log_facility ) { class { 'neutron': @@ -68,6 +77,8 @@ class cloud::network( rabbit_password => $rabbit_password, rabbit_virtual_host => '/', bind_host => $api_eth, + log_facility => $log_facility, + use_syslog => $use_syslog, dhcp_agents_per_network => '2', 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'] diff --git a/spec/classes/cloud_network_compute_spec.rb b/spec/classes/cloud_network_compute_spec.rb index 3455d549..0d4d2eb9 100644 --- a/spec/classes/cloud_network_compute_spec.rb +++ b/spec/classes/cloud_network_compute_spec.rb @@ -15,7 +15,6 @@ # # Unit tests for cloud::network::compute class # - require 'spec_helper' describe 'cloud::network::compute' do @@ -31,7 +30,9 @@ describe 'cloud::network::compute' do provider_vlan_ranges => ['physnet1:1000:2999'], provider_bridge_mappings => ['physnet1:br-eth1'], verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end let :params do @@ -47,6 +48,8 @@ describe 'cloud::network::compute' do :dhcp_agents_per_network => '2', :verbose => true, :debug => true, + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, :rabbit_user => 'neutron', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 32ee1d16..26c5cb06 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -15,7 +15,6 @@ # # Unit tests for cloud::network::controller class # - require 'spec_helper' describe 'cloud::network::controller' do @@ -31,7 +30,9 @@ describe 'cloud::network::controller' do provider_vlan_ranges => ['physnet1:1000:2999'], provider_bridge_mappings => ['physnet1:br-eth1'], verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end let :params do @@ -50,6 +51,8 @@ describe 'cloud::network::controller' do :dhcp_agents_per_network => '2', :verbose => true, :debug => true, + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, :rabbit_user => 'neutron', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index ff01877f..8d8dd6e6 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -15,7 +15,6 @@ # # Unit tests for cloud::network::dhcp class # - require 'spec_helper' describe 'cloud::network::dhcp' do @@ -31,7 +30,9 @@ describe 'cloud::network::dhcp' do provider_vlan_ranges => ['physnet1:1000:2999'], provider_bridge_mappings => ['physnet1:br-eth1'], verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end let :params do @@ -44,6 +45,8 @@ describe 'cloud::network::dhcp' do :dhcp_agents_per_network => '2', :verbose => true, :debug => true, + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, :rabbit_user => 'neutron', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb index edb383b7..d0b0bec9 100644 --- a/spec/classes/cloud_network_l3_spec.rb +++ b/spec/classes/cloud_network_l3_spec.rb @@ -15,7 +15,6 @@ # # Unit tests for cloud::network::l3 class # - require 'spec_helper' describe 'cloud::network::l3' do @@ -31,7 +30,9 @@ describe 'cloud::network::l3' do provider_vlan_ranges => ['physnet1:1000:2999'], provider_bridge_mappings => ['physnet1:br-eth1'], verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end let :params do @@ -45,6 +46,8 @@ describe 'cloud::network::l3' do :dhcp_agents_per_network => '2', :verbose => true, :debug => true, + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, :rabbit_user => 'neutron', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb index 1fc3b8a6..6b1e71c7 100644 --- a/spec/classes/cloud_network_lbaas_spec.rb +++ b/spec/classes/cloud_network_lbaas_spec.rb @@ -15,7 +15,6 @@ # # Unit tests for cloud::network::lbaas class # - require 'spec_helper' describe 'cloud::network::lbaas' do @@ -31,7 +30,9 @@ describe 'cloud::network::lbaas' do provider_vlan_ranges => ['physnet1:1000:2999'], provider_bridge_mappings => ['physnet1:br-eth1'], verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end let :params do @@ -44,6 +45,8 @@ describe 'cloud::network::lbaas' do :dhcp_agents_per_network => '2', :verbose => true, :debug => true, + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, :rabbit_user => 'neutron', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb index 8a5e4505..dcd80274 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -15,7 +15,6 @@ # # Unit tests for cloud::network::metadata class # - require 'spec_helper' describe 'cloud::network::metadata' do @@ -31,7 +30,9 @@ describe 'cloud::network::metadata' do provider_vlan_ranges => ['physnet1:1000:2999'], provider_bridge_mappings => ['physnet1:br-eth1'], verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end let :params do @@ -51,6 +52,8 @@ describe 'cloud::network::metadata' do :dhcp_agents_per_network => '2', :verbose => true, :debug => true, + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, :rabbit_user => 'neutron', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb index 2c9fb1bc..3d4dbdfa 100644 --- a/spec/classes/cloud_network_vpn_spec.rb +++ b/spec/classes/cloud_network_vpn_spec.rb @@ -15,7 +15,6 @@ # # Unit tests for cloud::network::vpnaas class # - require 'spec_helper' describe 'cloud::network::vpn' do @@ -31,7 +30,9 @@ describe 'cloud::network::vpn' do provider_vlan_ranges => ['physnet1:1000:2999'], provider_bridge_mappings => ['physnet1:br-eth1'], verbose => true, - debug => true }" + debug => true, + use_syslog => true, + log_facility => 'LOG_LOCAL0' }" end it 'configure neutron common' do @@ -40,6 +41,8 @@ describe 'cloud::network::vpn' do :dhcp_agents_per_network => '2', :verbose => true, :debug => true, + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, :rabbit_user => 'neutron', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete',