From eabdf1e9f959c274e827e8c24a6ea63709c1033c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= <mnasiadka@gmail.com>
Date: Mon, 8 Mar 2021 13:18:17 +0100
Subject: [PATCH] Introduce nova_libvirt_logging_debug

In order to disable libvirt debug in CI (which takes vast amount of storage)
this change introduces nova_libvirt_logging_debug and disables that in CI.

Change-Id: I90bfd1b300ad3202ea4d139fda6d6beb44c5820f
---
 ansible/roles/nova-cell/defaults/main.yml          | 1 +
 ansible/roles/nova-cell/templates/libvirtd.conf.j2 | 2 +-
 tests/templates/globals-default.j2                 | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml
index 0385ea2017..6c252ecf35 100644
--- a/ansible/roles/nova-cell/defaults/main.yml
+++ b/ansible/roles/nova-cell/defaults/main.yml
@@ -415,6 +415,7 @@ haproxy_nova_serialconsole_proxy_tunnel_timeout: "10m"
 ####################
 
 nova_logging_debug: "{{ openstack_logging_debug }}"
+nova_libvirt_logging_debug: "{{ nova_logging_debug }}"
 
 openstack_nova_auth: "{{ openstack_auth }}"
 
diff --git a/ansible/roles/nova-cell/templates/libvirtd.conf.j2 b/ansible/roles/nova-cell/templates/libvirtd.conf.j2
index 7da2e07875..6023456269 100644
--- a/ansible/roles/nova-cell/templates/libvirtd.conf.j2
+++ b/ansible/roles/nova-cell/templates/libvirtd.conf.j2
@@ -12,7 +12,7 @@ auth_tcp = "none"
 tcp_port = "{{ nova_libvirt_port }}"
 ca_file = ""
 {% endif %}
-{% if nova_logging_debug | bool %}
+{% if nova_libvirt_logging_debug | bool %}
 log_level = 1
 log_outputs = "1:file:/var/log/kolla/libvirt/libvirtd.log"
 {% else %}
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index b78bec2f9f..7298c462f6 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -37,6 +37,7 @@ enable_heat: "{{ openstack_core_tested }}"
 kolla_internal_vip_address: "{{ kolla_internal_vip_address }}"
 neutron_external_interface: "{{ neutron_external_interface_name }}"
 openstack_logging_debug: "True"
+nova_libvirt_logging_debug: "False"
 openstack_service_workers: "1"
 {% endif %}