From f8f036d7b192ae635129916ce373eb26f9de8d77 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 17 Jun 2014 10:06:48 +0100
Subject: [PATCH] Add syslog,verbose and debug logging options

---
 config.yaml                     | 13 +++++++++++++
 templates/icehouse/neutron.conf |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/config.yaml b/config.yaml
index 1dc2ea02..3af2efcd 100644
--- a/config.yaml
+++ b/config.yaml
@@ -81,3 +81,16 @@ options:
     description: |
        Default multicast port number that will be used to communicate between
        HA Cluster nodes.
+  use-syslog:
+    type: boolean
+    default: False
+    description: |
+      If set to True, supporting services will log to syslog.
+  debug:
+    default: False
+    type: boolean
+    description: Enable debug logging
+  verbose:
+    default: False
+    type: boolean
+    description: Enable verbose logging
diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf
index 2d4c4a02..9a47965c 100644
--- a/templates/icehouse/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -3,6 +3,9 @@
 # Configuration file maintained by Juju. Local changes may be overwritten.
 ###############################################################################
 [DEFAULT]
+verbose = {{ verbose }}
+debug = {{ debug }}
+use_syslog = {{ use_syslog }}
 state_path = /var/lib/neutron
 lock_path = $state_path/lock
 bind_host = 0.0.0.0
@@ -68,4 +71,4 @@ admin_password = {{ admin_password }}
 [service_providers]
 service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
 service_provider=VPN:openswan:neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
-service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default
\ No newline at end of file
+service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default