From ed0f3a313cc8f36cdad7032b006c09621a72a70a Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 19 Feb 2014 12:42:44 +0100 Subject: [PATCH 01/17] [network] Fix os_param name (refs: #187) _{use_syslog,log_facility} doesn't exist anymore ! --- manifests/network.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/network.pp b/manifests/network.pp index ef49cc3d..d140a0ce 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -65,8 +65,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 + $use_syslog = $os_params::use_syslog, + $log_facility = $os_params::log_facility ) { class { 'neutron': From 9a00e3dadcbea461c0f33385d9d6bce3bb0f1742 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Thu, 20 Feb 2014 18:42:13 +0100 Subject: [PATCH 02/17] [network] Disable fs logging if syslog is enabled (refs: #187) --- manifests/network.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifests/network.pp b/manifests/network.pp index d140a0ce..96242c2d 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -69,6 +69,13 @@ class cloud::network( $log_facility = $os_params::log_facility ) { + # Disable twice logging if syslog is enabled + if $use_syslog { + $log_dir = false + } else { + $log_dir = '/var/log/neutron' + } + class { 'neutron': allow_overlapping_ips => true, verbose => $verbose, @@ -80,6 +87,7 @@ class cloud::network( bind_host => $api_eth, log_facility => $log_facility, use_syslog => $use_syslog, + log_dir => $log_dir, 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'] From e127151ce377e046977d1779cec3ecc3631d4386 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Thu, 20 Feb 2014 19:20:35 +0100 Subject: [PATCH 03/17] [compute] Disable fs logging if syslog is enabled (refs: #187) --- manifests/compute.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifests/compute.pp b/manifests/compute.pp index 3662247b..62a9a399 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -94,6 +94,13 @@ class cloud::compute( } } + # Disable twice logging if syslog is enabled + if $use_syslog { + $log_dir = false + } else { + $log_dir = '/var/log/nova' + } + $encoded_user = uriescape($nova_db_user) $encoded_password = uriescape($nova_db_password) @@ -106,6 +113,7 @@ class cloud::compute( memcached_servers => $memcache_servers, verbose => $verbose, debug => $debug, + log_dir => $log_dir, log_facility => $log_facility, use_syslog => $use_syslog } From ad282d0b513b6585b210685f6b2c921bea2faec6 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Thu, 20 Feb 2014 19:20:49 +0100 Subject: [PATCH 04/17] [identity] Disable fs logging if syslog is enabled (refs: #187) --- manifests/identity.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifests/identity.pp b/manifests/identity.pp index 75332c8b..7061e4b7 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -400,6 +400,13 @@ class cloud::identity ( $ks_token_expiration = $os_params::ks_token_expiration ){ + # Disable twice logging if syslog is enabled + if $use_syslog { + $log_dir = false + } else { + $log_dir = '/var/log/keystone' + } + $encoded_user = uriescape($keystone_db_user) $encoded_password = uriescape($keystone_db_password) @@ -418,6 +425,7 @@ class cloud::identity ( use_syslog => $use_syslog, verbose => $verbose, bind_host => $api_eth, + log_dir => $log_dir, public_port => $ks_keystone_public_port, admin_port => $ks_keystone_admin_port, token_expiration => $ks_token_expiration From e78b98d14821a6db5c135e46b2b3ca314f7d7778 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Thu, 20 Feb 2014 19:20:58 +0100 Subject: [PATCH 05/17] [image] Disable fs logging if syslog is enabled (refs: #187) --- manifests/image.pp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/manifests/image.pp b/manifests/image.pp index 54568ff8..d7c79b09 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -88,6 +88,17 @@ class cloud::image( $use_syslog = $os_params::use_syslog ) { + # Disable twice logging if syslog is enabled + if $use_syslog { + $log_dir = false + $log_file_api = false + $log_file_registry = false + } else { + $log_dir = '/var/log/glance' + $log_file_api = '/var/log/glance/api.log' + $log_file_registry = '/var/log/glance/registry.log' + } + $encoded_glance_user = uriescape($glance_db_user) $encoded_glance_password = uriescape($glance_db_password) @@ -117,6 +128,8 @@ class cloud::image( keystone_tenant => 'services', keystone_user => 'glance', bind_host => $api_eth, + log_dir => $log_dir, + log_file => $log_file_registry, bind_port => $ks_glance_registry_internal_port, use_syslog => $use_syslog, log_facility => $log_facility, From 54f466555c50d91c0f2d27498d37675aa14b8a7a Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Thu, 20 Feb 2014 19:21:11 +0100 Subject: [PATCH 06/17] [orchestration] Disable fs logging if syslog is enabled (refs: #187) --- manifests/orchestration.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp index 86b7a019..4e30f75b 100644 --- a/manifests/orchestration.pp +++ b/manifests/orchestration.pp @@ -112,6 +112,13 @@ class cloud::orchestration( $log_facility = $os_params::log_facility ) { + # Disable twice logging if syslog is enabled + if $use_syslog { + $log_dir = false + } else { + $log_dir = '/var/log/heat' + } + $encoded_user = uriescape($heat_db_user) $encoded_password = uriescape($heat_db_password) @@ -129,6 +136,7 @@ class cloud::orchestration( debug => $debug, log_facility => $log_facility, use_syslog => $use_syslog, + log_dir => $log_dir, } # Note(EmilienM): From e5f3b8061d50d8bc97169b7b6234ca19eba8212a Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Thu, 20 Feb 2014 19:21:23 +0100 Subject: [PATCH 07/17] [volume] Disable fs logging if syslog is enabled (refs: #187) --- manifests/volume.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifests/volume.pp b/manifests/volume.pp index 817c3b4b..c8b693dd 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -78,6 +78,13 @@ class cloud::volume( $use_syslog = $os_params::use_syslog ) { + # Disable twice logging if syslog is enabled + if $use_syslog { + $log_dir = false + } else { + $log_dir = '/var/log/cinder' + } + $encoded_user = uriescape($cinder_db_user) $encoded_password = uriescape($cinder_db_password) @@ -90,6 +97,7 @@ class cloud::volume( rabbit_virtual_host => '/', verbose => $verbose, debug => $debug, + log_dir => $log_dir, log_facility => $log_facility, use_syslog => $use_syslog } From 83cee98ded11ad05c3ecd4074733dea0bcc8e500 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Tue, 25 Feb 2014 15:42:57 +0100 Subject: [PATCH 08/17] [image] Add missing glance::api log_dir (refs: #187) Refs: #187 Thanks Emilien --- manifests/image.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/image.pp b/manifests/image.pp index d7c79b09..26e29d94 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -113,6 +113,8 @@ class cloud::image( keystone_tenant => 'services', keystone_user => 'glance', show_image_direct_url => true, + log_dir => $log_dir, + log_file => $log_file_api, log_facility => $log_facility, bind_host => $api_eth, bind_port => $ks_glance_api_internal_port, From 99b539988c493aa57b5b9580276ffac786fbd0b0 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 25 Feb 2014 16:31:01 +0100 Subject: [PATCH 09/17] Add unit tests Signed-off-by: Emilien Macchi --- spec/classes/cloud_compute_controller_spec.rb | 3 ++- spec/classes/cloud_compute_hypervisor_spec.rb | 3 ++- spec/classes/cloud_identity_spec.rb | 3 ++- spec/classes/cloud_image_spec.rb | 6 ++++-- spec/classes/cloud_network_controller_spec.rb | 3 ++- spec/classes/cloud_network_dhcp_spec.rb | 3 ++- spec/classes/cloud_network_l3_spec.rb | 3 ++- spec/classes/cloud_network_lbaas_spec.rb | 3 ++- spec/classes/cloud_network_vpn_spec.rb | 3 ++- spec/classes/cloud_orchestration_api_spec.rb | 3 ++- spec/classes/cloud_orchestration_engine_spec.rb | 3 ++- spec/classes/cloud_volume_controller_spec.rb | 3 ++- spec/classes/cloud_volume_storage_spec.rb | 3 ++- 13 files changed, 28 insertions(+), 14 deletions(-) diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb index 9790fd81..476bfc79 100644 --- a/spec/classes/cloud_compute_controller_spec.rb +++ b/spec/classes/cloud_compute_controller_spec.rb @@ -66,7 +66,8 @@ describe 'cloud::compute::controller' do :rabbit_virtual_host => '/', :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', - :glance_api_servers => 'http://10.0.0.1:9292' + :glance_api_servers => 'http://10.0.0.1:9292', + :log_dir => false ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index d9688701..f08a5c2b 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -92,7 +92,8 @@ describe 'cloud::compute::hypervisor' do :rabbit_virtual_host => '/', :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', - :glance_api_servers => 'http://10.0.0.1:9292' + :glance_api_servers => 'http://10.0.0.1:9292', + :log_dir => false ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb index 338c3e56..8868788f 100644 --- a/spec/classes/cloud_identity_spec.rb +++ b/spec/classes/cloud_identity_spec.rb @@ -110,7 +110,8 @@ describe 'cloud::identity' do :bind_host => '10.0.0.1', :public_port => '5000', :admin_port => '35357', - :token_expiration => '3600' + :token_expiration => '3600', + :log_dir => false ) should contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2') end diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index 804bf282..afdc9d5b 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -58,7 +58,7 @@ describe 'cloud::image' do :log_facility => 'LOG_LOCAL0', :bind_host => '10.0.0.1', :bind_port => '9292', - :use_syslog => true + :use_syslog => true, ) end @@ -74,7 +74,9 @@ describe 'cloud::image' do :log_facility => 'LOG_LOCAL0', :bind_host => '10.0.0.1', :bind_port => '9191', - :use_syslog => true + :use_syslog => true, + :log_dir => false, + :log_file => false, ) end diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 9e655d01..44692934 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -59,7 +59,8 @@ describe 'cloud::network::controller' do :rabbit_virtual_host => '/', :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'] + :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], + :log_dir => false ) should contain_class('neutron::agents::ovs').with( diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index 8840da60..f9fc387c 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -54,7 +54,8 @@ describe 'cloud::network::dhcp' do :rabbit_virtual_host => '/', :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'] + :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], + :log_dir => false ) should contain_class('neutron::agents::ovs').with( diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb index 8c90b508..ff7f8391 100644 --- a/spec/classes/cloud_network_l3_spec.rb +++ b/spec/classes/cloud_network_l3_spec.rb @@ -54,7 +54,8 @@ describe 'cloud::network::l3' do :rabbit_virtual_host => '/', :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'] + :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], + :log_dir => false ) should contain_class('neutron::agents::ovs').with( diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb index 6b1e71c7..c09cb4b9 100644 --- a/spec/classes/cloud_network_lbaas_spec.rb +++ b/spec/classes/cloud_network_lbaas_spec.rb @@ -53,7 +53,8 @@ describe 'cloud::network::lbaas' do :rabbit_virtual_host => '/', :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'] + :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], + :log_dir => false ) should contain_class('neutron::agents::ovs').with( diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb index 3d4dbdfa..63fc43a5 100644 --- a/spec/classes/cloud_network_vpn_spec.rb +++ b/spec/classes/cloud_network_vpn_spec.rb @@ -49,7 +49,8 @@ describe 'cloud::network::vpn' do :rabbit_virtual_host => '/', :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'] + :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], + :log_dir => false ) should contain_class('neutron::agents::ovs').with( diff --git a/spec/classes/cloud_orchestration_api_spec.rb b/spec/classes/cloud_orchestration_api_spec.rb index 8049481f..0c4254e7 100644 --- a/spec/classes/cloud_orchestration_api_spec.rb +++ b/spec/classes/cloud_orchestration_api_spec.rb @@ -65,7 +65,8 @@ describe 'cloud::orchestration::api' do :keystone_protocol => 'http', :keystone_password => 'secrete', :auth_uri => 'http://10.0.0.1:5000/v2.0', - :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat' + :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat', + :log_dir => false ) end diff --git a/spec/classes/cloud_orchestration_engine_spec.rb b/spec/classes/cloud_orchestration_engine_spec.rb index 5e6cba4a..79f6ec43 100644 --- a/spec/classes/cloud_orchestration_engine_spec.rb +++ b/spec/classes/cloud_orchestration_engine_spec.rb @@ -68,7 +68,8 @@ describe 'cloud::orchestration::engine' do :keystone_protocol => 'http', :keystone_password => 'secrete', :auth_uri => 'http://10.0.0.1:5000/v2.0', - :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat' + :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat', + :log_dir => false ) end diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb index 6aa4e5ef..bb68b427 100644 --- a/spec/classes/cloud_volume_controller_spec.rb +++ b/spec/classes/cloud_volume_controller_spec.rb @@ -58,7 +58,8 @@ describe 'cloud::volume::controller' do :rabbit_password => 'secrete', :rabbit_virtual_host => '/', :log_facility => 'LOG_LOCAL0', - :use_syslog => true + :use_syslog => true, + :log_dir => false ) should contain_class('cinder::ceilometer') end diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index 23076aeb..f7f41e48 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -53,7 +53,8 @@ describe 'cloud::volume::storage' do :rabbit_password => 'secrete', :rabbit_virtual_host => '/', :log_facility => 'LOG_LOCAL0', - :use_syslog => true + :use_syslog => true, + :log_dir => false ) should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier') From 814222f6b92fe41cb5dc4ca51e3ea852cbdd253c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 25 Feb 2014 16:34:41 +0100 Subject: [PATCH 10/17] avoid double logging for ceilometer Signed-off-by: Emilien Macchi --- manifests/telemetry.pp | 7 +++++++ spec/classes/cloud_telemetry_centralagent_spec.rb | 3 ++- spec/classes/cloud_telemetry_server_spec.rb | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index cbe9cd3f..04fc8f65 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -84,6 +84,13 @@ class cloud::telemetry( $use_syslog = $os_params::use_syslog, ){ + # Disable twice logging if syslog is enabled + if $use_syslog { + $log_dir = false + } else { + $log_dir = '/var/log/ceilometer' + } + class { 'ceilometer': metering_secret => $ceilometer_secret, rabbit_hosts => $rabbit_hosts, diff --git a/spec/classes/cloud_telemetry_centralagent_spec.rb b/spec/classes/cloud_telemetry_centralagent_spec.rb index 7ecf7131..e05b8aea 100644 --- a/spec/classes/cloud_telemetry_centralagent_spec.rb +++ b/spec/classes/cloud_telemetry_centralagent_spec.rb @@ -51,7 +51,8 @@ describe 'cloud::telemetry::centralagent' do :rabbit_password => 'secrete', :metering_secret => 'secrete', :use_syslog => true, - :log_facility => 'LOG_LOCAL0' + :log_facility => 'LOG_LOCAL0', + :log_dir => false ) should contain_class('ceilometer::agent::auth').with( :auth_password => 'secrete', diff --git a/spec/classes/cloud_telemetry_server_spec.rb b/spec/classes/cloud_telemetry_server_spec.rb index 31a3230b..1d8d6873 100644 --- a/spec/classes/cloud_telemetry_server_spec.rb +++ b/spec/classes/cloud_telemetry_server_spec.rb @@ -57,7 +57,8 @@ describe 'cloud::telemetry::server' do :rabbit_password => 'secrete', :metering_secret => 'secrete', :use_syslog => true, - :log_facility => 'LOG_LOCAL0' + :log_facility => 'LOG_LOCAL0', + :log_dir => false ) should contain_class('ceilometer::agent::auth').with( :auth_password => 'secrete', From b6eccd19cdfb95f3ad311bf1a41a12a7e0a672f3 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Tue, 25 Feb 2014 16:40:40 +0100 Subject: [PATCH 11/17] [telemetry] Disable fs logging if syslog is enabled (refs: #187) --- manifests/telemetry.pp | 1 + spec/classes/cloud_image_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index 04fc8f65..ad073b05 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -98,6 +98,7 @@ class cloud::telemetry( rabbit_userid => 'ceilometer', verbose => $verbose, debug => $debug, + log_dir => $log_dir, use_syslog => $use_syslog, log_facility => $log_facility } diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index afdc9d5b..4e9b5b51 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -58,7 +58,7 @@ describe 'cloud::image' do :log_facility => 'LOG_LOCAL0', :bind_host => '10.0.0.1', :bind_port => '9292', - :use_syslog => true, + :use_syslog => true ) end @@ -76,7 +76,7 @@ describe 'cloud::image' do :bind_port => '9191', :use_syslog => true, :log_dir => false, - :log_file => false, + :log_file => false ) end From 602a99aeb2861c4e737e05b0d240f482b41b0fbc Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 25 Feb 2014 16:42:56 +0100 Subject: [PATCH 12/17] image: fix unit tests Signed-off-by: Emilien Macchi --- spec/classes/cloud_image_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index 4e9b5b51..14d01f7b 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -58,7 +58,9 @@ describe 'cloud::image' do :log_facility => 'LOG_LOCAL0', :bind_host => '10.0.0.1', :bind_port => '9292', - :use_syslog => true + :use_syslog => true, + :log_dir => false, + :log_file => false, ) end From 9a74a02a143f5939ed333dd8f3268cf253d45603 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 25 Feb 2014 16:42:56 +0100 Subject: [PATCH 13/17] image: fix unit tests Signed-off-by: Emilien Macchi --- spec/classes/cloud_image_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index 4e9b5b51..14d01f7b 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -58,7 +58,9 @@ describe 'cloud::image' do :log_facility => 'LOG_LOCAL0', :bind_host => '10.0.0.1', :bind_port => '9292', - :use_syslog => true + :use_syslog => true, + :log_dir => false, + :log_file => false, ) end From b387682b03dbadd12cdc05dce61e9850ba2acd1f Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Tue, 25 Feb 2014 16:49:36 +0100 Subject: [PATCH 14/17] [spec] Fix for ruby 1.8 and puppet 2.7 (refs: #187) --- spec/classes/cloud_image_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index 14d01f7b..3aff3a69 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -60,7 +60,7 @@ describe 'cloud::image' do :bind_port => '9292', :use_syslog => true, :log_dir => false, - :log_file => false, + :log_file => false ) end From 9ffc97471360eefdb9b84475af58b32b48181592 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 25 Feb 2014 18:20:52 +0100 Subject: [PATCH 15/17] fix unit tests for compute Signed-off-by: Emilien Macchi --- manifests/network.pp | 4 ++-- manifests/network/controller.pp | 2 +- spec/classes/cloud_compute_hypervisor_spec.rb | 7 ++++--- spec/classes/cloud_network_controller_spec.rb | 4 ++-- spec/classes/cloud_network_dhcp_spec.rb | 1 - spec/classes/cloud_network_l3_spec.rb | 1 - spec/classes/cloud_network_lbaas_spec.rb | 1 - spec/classes/cloud_network_metadata_spec.rb | 4 ++-- spec/classes/cloud_network_vpn_spec.rb | 1 - 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/manifests/network.pp b/manifests/network.pp index 96242c2d..fd570d65 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -87,10 +87,10 @@ class cloud::network( bind_host => $api_eth, log_facility => $log_facility, use_syslog => $use_syslog, - log_dir => $log_dir, 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'] + 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, } class { 'neutron::agents::ovs': diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index a8122657..35a7a6cc 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -39,7 +39,7 @@ class cloud::network::controller( auth_host => $ks_keystone_admin_host, auth_port => $ks_keystone_public_port, database_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8", - api_workers => $::processorcount + api_workers => $::processorcount, } # Note(EmilienM): diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index f08a5c2b..dabdea7e 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -63,6 +63,7 @@ describe 'cloud::compute::hypervisor' do verbose => true, debug => true, use_syslog => true, + log_dir => false, log_facility => 'LOG_LOCAL0' }" end @@ -93,7 +94,7 @@ describe 'cloud::compute::hypervisor' do :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :glance_api_servers => 'http://10.0.0.1:9292', - :log_dir => false + :log_dir => false, ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') @@ -140,8 +141,8 @@ describe 'cloud::compute::hypervisor' do :rabbit_virtual_host => '/', :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'] - + :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], + :log_dir => false ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 44692934..9aac73a7 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -61,7 +61,6 @@ 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 - ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, @@ -85,7 +84,8 @@ describe 'cloud::network::controller' do :auth_host => '10.0.0.1', :auth_port => '5000', :database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8', - :api_workers => '2' + :api_workers => '2', + :log_dir => false, ) end diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index f9fc387c..12d4c56a 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -56,7 +56,6 @@ 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 - ) 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 ff7f8391..854bc4b7 100644 --- a/spec/classes/cloud_network_l3_spec.rb +++ b/spec/classes/cloud_network_l3_spec.rb @@ -56,7 +56,6 @@ 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 - ) 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 c09cb4b9..527b7d40 100644 --- a/spec/classes/cloud_network_lbaas_spec.rb +++ b/spec/classes/cloud_network_lbaas_spec.rb @@ -55,7 +55,6 @@ 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 - ) 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 e173fcde..ff95b600 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -61,8 +61,8 @@ describe 'cloud::network::metadata' do :rabbit_virtual_host => '/', :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'] - + :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], + :log_dir => false ) 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 63fc43a5..bceee7cb 100644 --- a/spec/classes/cloud_network_vpn_spec.rb +++ b/spec/classes/cloud_network_vpn_spec.rb @@ -51,7 +51,6 @@ 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 - ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, From 7f46390915c12294651f04ec74b8cbc351d11d4b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 26 Feb 2014 13:35:10 +0100 Subject: [PATCH 16/17] fix unit tests for log_dir Signed-off-by: Emilien Macchi --- manifests/compute.pp | 2 +- spec/classes/cloud_compute_controller_spec.rb | 2 +- spec/classes/cloud_compute_hypervisor_spec.rb | 3 +-- spec/classes/cloud_network_controller_spec.rb | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index 62a9a399..b5cd399c 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -115,7 +115,7 @@ class cloud::compute( debug => $debug, log_dir => $log_dir, log_facility => $log_facility, - use_syslog => $use_syslog + use_syslog => $use_syslog, } class { 'nova::network::neutron': diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb index 476bfc79..f17b07cf 100644 --- a/spec/classes/cloud_compute_controller_spec.rb +++ b/spec/classes/cloud_compute_controller_spec.rb @@ -67,7 +67,7 @@ describe 'cloud::compute::controller' do :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :glance_api_servers => 'http://10.0.0.1:9292', - :log_dir => false + :log_dir => false, ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index dabdea7e..02b85289 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -63,7 +63,6 @@ describe 'cloud::compute::hypervisor' do verbose => true, debug => true, use_syslog => true, - log_dir => false, log_facility => 'LOG_LOCAL0' }" end @@ -142,7 +141,7 @@ describe 'cloud::compute::hypervisor' 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, ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 9aac73a7..962561ae 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -85,7 +85,6 @@ describe 'cloud::network::controller' do :auth_port => '5000', :database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8', :api_workers => '2', - :log_dir => false, ) end From 1edf8343ac6765bb64f91b024861d034b6d291a8 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 26 Feb 2014 13:49:04 +0100 Subject: [PATCH 17/17] [spec] Fix for ruby 1.8 and puppet 2.7 (refs: #187) --- spec/classes/cloud_compute_controller_spec.rb | 2 +- spec/classes/cloud_compute_hypervisor_spec.rb | 4 ++-- spec/classes/cloud_network_controller_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb index f17b07cf..476bfc79 100644 --- a/spec/classes/cloud_compute_controller_spec.rb +++ b/spec/classes/cloud_compute_controller_spec.rb @@ -67,7 +67,7 @@ describe 'cloud::compute::controller' do :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :glance_api_servers => 'http://10.0.0.1:9292', - :log_dir => false, + :log_dir => false ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index 02b85289..8d8df727 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -93,7 +93,7 @@ describe 'cloud::compute::hypervisor' do :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :glance_api_servers => 'http://10.0.0.1:9292', - :log_dir => false, + :log_dir => false ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') @@ -141,7 +141,7 @@ describe 'cloud::compute::hypervisor' 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 ) should contain_class('neutron::agents::ovs').with( :enable_tunneling => true, diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 962561ae..a8904938 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -84,7 +84,7 @@ describe 'cloud::network::controller' do :auth_host => '10.0.0.1', :auth_port => '5000', :database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8', - :api_workers => '2', + :api_workers => '2' ) end