From c60f3cae7d5159377bc6cd2481beb25dba8f1a82 Mon Sep 17 00:00:00 2001
From: John Tran <jhtran@att.com>
Date: Wed, 13 Mar 2013 03:11:50 +0000
Subject: [PATCH] add_syslog

---
 recipes/ceilometer-common.rb          | 3 +++
 recipes/nova-common.rb                | 3 +++
 templates/default/ceilometer.conf.erb | 3 +++
 templates/default/nova.conf.erb       | 3 +--
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/recipes/ceilometer-common.rb b/recipes/ceilometer-common.rb
index 69a52c6b..ca3160c9 100644
--- a/recipes/ceilometer-common.rb
+++ b/recipes/ceilometer-common.rb
@@ -24,6 +24,9 @@ end
 
 include_recipe "nova::nova-common"
 include_recipe "python::pip"
+if node["ceilometer"]["syslog"]["use"]
+  include_recipe "openstack-common::logging"
+end
 
 ceilometer_conf = node["nova"]["ceilometer"]["conf"]
 
diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb
index 86335bf8..6e083a61 100644
--- a/recipes/nova-common.rb
+++ b/recipes/nova-common.rb
@@ -26,6 +26,9 @@ end
 if platform?(%w(fedora redhat centos)) # :pragma-foodcritic: ~FC024 - won't fix this
   include_recipe "yum::epel"
 end
+if node["nova"]["syslog"]["use"]
+  include_recipe "openstack-common::logging"
+end
 
 platform_options = node["nova"]["platform"]
 
diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb
index c7f73a53..2ec67809 100644
--- a/templates/default/ceilometer.conf.erb
+++ b/templates/default/ceilometer.conf.erb
@@ -14,6 +14,9 @@ rabbit_virtual_host = <%= @rabbit_virtual_host %>
 verbose = True
 notification_topics = notifications,glance_notifications
 rpc_backend = ceilometer.openstack.common.rpc.impl_kombu
+<% if node["ceilometer"]["syslog"]["use"] %>
+log_config = /etc/openstack/logging.conf
+<% end %>
 
 [keystone_authtoken]
 paste.filter_factory = keystone.middleware.auth_token:filter_factory
diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb
index c67fa181..53c0439d 100644
--- a/templates/default/nova.conf.erb
+++ b/templates/default/nova.conf.erb
@@ -9,8 +9,7 @@ dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
 <% if node["nova"]["syslog"]["use"] %>
-use_syslog=<%= node["nova"]["syslog"]["use"] %>
-syslog_log_facility=<%= node["nova"]["syslog"]["facility"] %>
+log_config = /etc/openstack/logging.conf
 <% end %>
 state_path=/var/lib/nova
 lock_path=/var/lock/nova