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')