From 9f5e87c493d5efda599916a9dad6cab801d25c48 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Mon, 13 Apr 2015 13:22:05 +0100
Subject: [PATCH] [trivial] make debug and verbose configurable

---
 config.yaml                  | 8 ++++++++
 hooks/nova_compute_utils.py  | 3 ++-
 templates/havana/nova.conf   | 3 ++-
 templates/icehouse/nova.conf | 3 ++-
 templates/juno/nova.conf     | 3 ++-
 templates/kilo/nova.conf     | 3 ++-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/config.yaml b/config.yaml
index 91db1a8a..60f04628 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,4 +1,12 @@
 options:
+  debug:
+    default: False
+    type: boolean
+    description: "Enable debug logging"
+  verbose:
+    default: False
+    type: boolean
+    description: "Enable verbose logging"
   openstack-origin:
     default: distro
     type: string
diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py
index b3dbeb51..e4c0d46e 100644
--- a/hooks/nova_compute_utils.py
+++ b/hooks/nova_compute_utils.py
@@ -104,7 +104,8 @@ BASE_RESOURCE_MAP = {
                      context.ZeroMQContext(),
                      context.NotificationDriverContext(),
                      MetadataServiceContext(),
-                     HostIPContext()],
+                     HostIPContext(),
+                     context.LogLevelContext()],
     },
 }
 
diff --git a/templates/havana/nova.conf b/templates/havana/nova.conf
index e88b92c5..2e0808aa 100644
--- a/templates/havana/nova.conf
+++ b/templates/havana/nova.conf
@@ -7,6 +7,8 @@
 {% endif -%}
 ###############################################################################
 [DEFAULT]
+verbose={{ verbose }}
+debug={{ debug }}
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
@@ -21,7 +23,6 @@ libvirt_disk_prefix=vd
 libvirt_use_virtio_for_bridges=True
 {% endif -%}
 
-verbose=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
diff --git a/templates/icehouse/nova.conf b/templates/icehouse/nova.conf
index ff4c2dd3..0cf8720f 100644
--- a/templates/icehouse/nova.conf
+++ b/templates/icehouse/nova.conf
@@ -7,6 +7,8 @@
 {% endif -%}
 ###############################################################################
 [DEFAULT]
+verbose={{ verbose }}
+debug={{ debug }}
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
@@ -21,7 +23,6 @@ libvirt_disk_prefix=vd
 libvirt_use_virtio_for_bridges=True
 {% endif -%}
 
-verbose=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
diff --git a/templates/juno/nova.conf b/templates/juno/nova.conf
index ee198197..56e056cd 100644
--- a/templates/juno/nova.conf
+++ b/templates/juno/nova.conf
@@ -7,6 +7,8 @@
 {% endif -%}
 ###############################################################################
 [DEFAULT]
+verbose={{ verbose }}
+debug={{ debug }}
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
@@ -21,7 +23,6 @@ libvirt_disk_prefix=vd
 libvirt_use_virtio_for_bridges=True
 {% endif -%}
 
-verbose=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf
index db8abf42..fd756250 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -7,12 +7,13 @@
 {% endif -%}
 ###############################################################################
 [DEFAULT]
+verbose={{ verbose }}
+debug={{ debug }}
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
 state_path=/var/lib/nova
 force_dhcp_release=True
-verbose=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini