openstack/cloudkitty
Code Issues Proposed changes

Use DevStack VENV path

Browse Source 
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
This commit is contained in:
Rafael Weingärtner 2023-08-23 13:27:35 -03:00
parent b460fd937f
commit 94630b97cd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/apache-cloudkitty.template
View File

@ -1,7 +1,7 @@
Listen %PORT% Listen %PORT%
<VirtualHost *:%PORT%> <VirtualHost *:%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 WSGIProcessGroup cloudkitty-api
WSGIScriptAlias / %WSGIAPP% WSGIScriptAlias / %WSGIAPP%
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}

2
devstack/plugin.sh
View File

@ -116,7 +116,7 @@ function _cloudkitty_config_apache_wsgi {
s|%APACHE_NAME%|$APACHE_NAME|g; s|%APACHE_NAME%|$APACHE_NAME|g;
s|%WSGIAPP%|$CLOUDKITTY_WSGI_DIR/app.wsgi|g; s|%WSGIAPP%|$CLOUDKITTY_WSGI_DIR/app.wsgi|g;
s|%USER%|$STACK_USER|g; s|%USER%|$STACK_USER|g;
s|%VIRTUALENV%|$venv_path|g s|%VIRTUALENV%|$DEVSTACK_VENV|g
" -i $cloudkitty_apache_conf " -i $cloudkitty_apache_conf
} }