From 72a1c0be93ffa0f63f075971f8bd869bee72e9c8 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Wed, 13 Mar 2019 15:21:55 +0000
Subject: [PATCH] Support oslo_messaging logger debug

Pike onwards defaults to setting oslo_messaging logger
to INFO and we have no way to set it to DEBUG currently.
This patch will set it to DEBUG when debug is enabled.

Also sets glance.debug=True if debug enabled

Change-Id: Id76302b5368606401e4102e6beb4fae61df668ad
Closes-Bug: #1817290
---
 templates/ocata/nova.conf | 4 ++++
 templates/pike/nova.conf  | 4 ++++
 templates/rocky/nova.conf | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/templates/ocata/nova.conf b/templates/ocata/nova.conf
index 54fc7321..5b6ed3b2 100644
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -26,6 +26,10 @@ force_raw_images = {{ force_raw_images }}
 transport_url = {{ transport_url }}
 {% endif %}
 
+{% if debug -%}
+glance.debug = True
+{% endif -%}
+
 {% if arch == 'aarch64' -%}
 libvirt_use_virtio_for_bridges=False
 libvirt_disk_prefix=vd
diff --git a/templates/pike/nova.conf b/templates/pike/nova.conf
index ee83b882..90d827f7 100644
--- a/templates/pike/nova.conf
+++ b/templates/pike/nova.conf
@@ -22,6 +22,10 @@ auth_strategy=keystone
 my_ip = {{ host_ip }}
 force_raw_images = {{ force_raw_images }}
 
+{% if debug -%}
+default_log_levels = "amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, oslo_messaging=DEBUG, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO"
+{% endif -%}
+
 {% if transport_url %}
 transport_url = {{ transport_url }}
 {% endif %}
diff --git a/templates/rocky/nova.conf b/templates/rocky/nova.conf
index 7fd66eb5..06cb837b 100644
--- a/templates/rocky/nova.conf
+++ b/templates/rocky/nova.conf
@@ -22,6 +22,10 @@ auth_strategy=keystone
 my_ip = {{ host_ip }}
 force_raw_images = {{ force_raw_images }}
 
+{% if debug -%}
+default_log_levels = "amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, oslo_messaging=DEBUG, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO, glanceclient=WARN, oslo.privsep.daemon=INFO"
+{% endif -%}
+
 {% if transport_url %}
 transport_url = {{ transport_url }}
 {% endif %}