From 0b1a59dd8cc2b402b5a0ad9b02144edd1daf40ca Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Wed, 29 Nov 2023 17:32:14 +0100
Subject: [PATCH] podman: install "rich" dependency

This dependency was added to podman-py in version 4.8.0, but not added
properly to their requirements. Install it explicitly for our tox
and integration testing as a workaround.

[0] https://github.com/containers/podman-py/issues/350

Change-Id: I61a5fdfc4e505f2577185f0c0f1297cf2709be2c
---
 tests/templates/globals-default.j2 | 3 +++
 tox.ini                            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 4ba6877a84..0d7c5af884 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -17,6 +17,9 @@ kolla_container_engine: "{{ container_engine }}"
 {% if container_engine == 'podman' %}
 podman_registry: "primary:4000"
 podman_registry_insecure: "yes"
+podman_sdk_pip_packages:
+  - "podman>=4.7.0"
+  - rich
 {% endif %}
 docker_restart_policy: "no"
 docker_custom_config:
diff --git a/tox.ini b/tox.ini
index f914829a7d..92c0b33fda 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@ deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/up
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        podman>=4.3.0,<5
+       rich
 passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY, \
           OS_STDOUT_CAPTURE,OS_STDERR_CAPTURE,OS_LOG_CAPTURE,OS_TEST_TIMEOUT, \
           PYTHON,OS_TEST_PATH,LISTOPT,IDOPTION