From 6cd1aabb217f6b8b346c102d14889716ea97d15f Mon Sep 17 00:00:00 2001
From: Oliver Walsh <owalsh@redhat.com>
Date: Wed, 19 Aug 2020 15:05:47 +0100
Subject: [PATCH] Include virt-admin in the nova_libvirt container

This is required to alter the libvirt logging level at runtime.

Change-Id: I9c9351d5f86c7f4eac4e5042dae82c10a7011e96
(cherry picked from commit 1c0af4466f5d59dbf99b46359f2bb9ff854a9b4e)
---
 .../tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml      | 1 +
 container-images/tripleo_kolla_template_overrides.j2           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml b/container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml
index 94c3a6a09..8d2b44cac 100644
--- a/container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml
+++ b/container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml
@@ -9,6 +9,7 @@ tcib_packages:
   - libcgroup-tools
   - libguestfs
   - libseccomp
+  - libvirt-admin
   - libvirt-client
   - libvirt-daemon
   - libvirt-daemon-config-nwfilter
diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index 006d22641..190a58952 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -331,7 +331,8 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
     'libseccomp',
     'openssl-perl',
     'openstack-nova-migration',
-    'podman'
+    'podman',
+    'libvirt-admin'
 ] %}
 {% if distro_python_version.startswith('2') %}
 {% set nova_libvirt_packages_append = nova_libvirt_packages_append + ['docker'] %}