Merge "Allow customise log_facility in storage server configuration"

manifests/storage/all.pp

@@ -24,7 +24,8 @@ class swift::storage::all(
   $object_pipeline    = undef,
   $container_pipeline = undef,
   $mount_check        = false,
-  $account_pipeline   = undef
+  $account_pipeline   = undef,
+  $log_facility        = 'LOG_LOCAL2'
 ) {
 
   class { 'swift::storage':
@@ -41,17 +42,20 @@ class swift::storage::all(
     type             => 'account',
     config_file_path => 'account-server.conf',
     pipeline         => $account_pipeline,
+    log_facility     => $log_facility,
   }
 
   swift::storage::server { $container_port:
     type             => 'container',
     config_file_path => 'container-server.conf',
     pipeline         => $container_pipeline,
+    log_facility     => $log_facility,
   }
 
   swift::storage::server { $object_port:
     type             => 'object',
     config_file_path => 'object-server.conf',
     pipeline         => $object_pipeline,
+    log_facility     => $log_facility,
   }
 }

manifests/storage/server.pp

@@ -17,6 +17,7 @@ define swift::storage::server(
   $replicator_concurrency = $::processorcount,
   $updater_concurrency    = $::processorcount,
   $reaper_concurrency     = $::processorcount,
+  $log_facility           = "LOG_LOCAL2",
   # this parameters needs to be specified after type and name
   $config_file_path       = "${type}-server/${name}.conf"
 ) {

spec/classes/swift_storage_all_spec.rb

@@ -23,7 +23,8 @@ describe 'swift::storage::all' do
       :devices => '/srv/node',
       :object_port => '6000',
       :container_port => '6001',
-      :account_port => '6002'
+      :account_port => '6002',
+      :log_facility => 'LOG_LOCAL2'
     }
   end
 
@@ -43,6 +44,7 @@ describe 'swift::storage::all' do
       :object_pipeline => ["1", "2"],
       :container_pipeline => ["3", "4"],
       :account_pipeline => ["5", "6"],
+      :log_facility => ['LOG_LOCAL2', 'LOG_LOCAL3'],
     }
   ].each do |param_set|
 
@@ -79,7 +81,8 @@ describe 'swift::storage::all' do
 
       let :storage_server_defaults do
         {:devices              => param_hash[:devices],
-         :storage_local_net_ip => param_hash[:storage_local_net_ip]
+         :storage_local_net_ip => param_hash[:storage_local_net_ip],
+         :log_facility         => param_hash[:log_facility]
         }
       end
 

templates/account-server.conf.erb

@@ -4,7 +4,7 @@ bind_ip = <%= storage_local_net_ip %>
 bind_port = <%= bind_port %>
 mount_check = <%= mount_check %>
 user = <%= user %>
-log_facility = LOG_LOCAL2
+log_facility = <%= log_facility %>
 workers = <%= workers %>
 
 [pipeline:main]

templates/container-server.conf.erb

@@ -4,7 +4,7 @@ bind_ip = <%= storage_local_net_ip %>
 bind_port = <%= bind_port %>
 mount_check = <%= mount_check %>
 user = <%= user %>
-log_facility = LOG_LOCAL2
+log_facility = <%= log_facility %>
 workers = <%= workers %>
 
 [pipeline:main]

templates/object-server.conf.erb

@@ -4,7 +4,7 @@ bind_ip = <%= storage_local_net_ip %>
 bind_port = <%= bind_port %>
 mount_check = <%= mount_check %>
 user = <%= user %>
-log_facility = LOG_LOCAL2
+log_facility = <%= log_facility %>
 workers = <%= workers %>
 
 [pipeline:main]