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,