From 94630b97cd1fb4bdd9a638070ffbbe3625de8aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Wed, 23 Aug 2023 13:27:35 -0300 Subject: [PATCH] Use DevStack VENV path DevStack is moving to adopt VENV to manage its python versions. However, CloudKittty DevStack integration was not using the DevStack VENV variable. This, in turn, causes issues with tempest tests, as they are based on a DevStack deployment. We need to merge this patch to fix the tempest tests. Change-Id: I17de617557fb86c002814941325d71e3c08e0e72 --- devstack/apache-cloudkitty.template | 2 +- devstack/plugin.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/apache-cloudkitty.template b/devstack/apache-cloudkitty.template index 2046ab39..31a7221a 100644 --- a/devstack/apache-cloudkitty.template +++ b/devstack/apache-cloudkitty.template @@ -1,7 +1,7 @@ Listen %PORT% - WSGIDaemonProcess cloudkitty-api processes=2 threads=10 user=%USER% display-name=%{GROUP} %VIRTUALENV% + WSGIDaemonProcess cloudkitty-api processes=2 threads=10 user=%USER% display-name=%{GROUP} python-home=%VIRTUALENV% WSGIProcessGroup cloudkitty-api WSGIScriptAlias / %WSGIAPP% WSGIApplicationGroup %{GLOBAL} diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f9a03c0b..8a4a4054 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -116,7 +116,7 @@ function _cloudkitty_config_apache_wsgi { s|%APACHE_NAME%|$APACHE_NAME|g; s|%WSGIAPP%|$CLOUDKITTY_WSGI_DIR/app.wsgi|g; s|%USER%|$STACK_USER|g; - s|%VIRTUALENV%|$venv_path|g + s|%VIRTUALENV%|$DEVSTACK_VENV|g " -i $cloudkitty_apache_conf }