openstack/trove
Code Issues Proposed changes

Merge "[CI]: fix trove api started failed"

Browse Source
This commit is contained in:
Zuul 2023-08-18 10:26:11 +00:00 committed by Gerrit Code Review
commit 4288b8f782
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/files/apache-trove-api.template
View File

@ -43,3 +43,5 @@ Listen %TROVE_SERVICE_PORT%
</IfVersion> </IfVersion>
</Directory> </Directory>
</VirtualHost> </VirtualHost>
%WSGIPYTHONHOME%

5
devstack/plugin.sh
View File

@ -172,12 +172,17 @@ function config_trove_apache_wsgi {
sudo cp $TROVE_DIR/trove/cmd/app_wsgi.py $TROVE_WSGI_DIR/app_wsgi.py sudo cp $TROVE_DIR/trove/cmd/app_wsgi.py $TROVE_WSGI_DIR/app_wsgi.py
trove_apache_conf=$(apache_site_config_for trove-api) trove_apache_conf=$(apache_site_config_for trove-api)
sudo cp $TROVE_DEVSTACK_FILES/apache-trove-api.template ${trove_apache_conf} sudo cp $TROVE_DEVSTACK_FILES/apache-trove-api.template ${trove_apache_conf}
local wsgi_venv_config=""
if [[ "$GLOBAL_VENV" == "True" ]] ; then
wsgi_venv_config="WSGIPythonHome $DEVSTACK_VENV"
fi
sudo sed -e " sudo sed -e "
s|%TROVE_SERVICE_PORT%|${TROVE_SERVICE_PORT}|g; s|%TROVE_SERVICE_PORT%|${TROVE_SERVICE_PORT}|g;
s|%TROVE_WSGI_DIR%|${TROVE_WSGI_DIR}|g; s|%TROVE_WSGI_DIR%|${TROVE_WSGI_DIR}|g;
s|%USER%|${STACK_USER}|g; s|%USER%|${STACK_USER}|g;
s|%APACHE_NAME%|${APACHE_NAME}|g; s|%APACHE_NAME%|${APACHE_NAME}|g;
s|%APIWORKERS%|${API_WORKERS}|g; s|%APIWORKERS%|${API_WORKERS}|g;
s|%WSGIPYTHONHOME%|${wsgi_venv_config}|g;
" -i ${trove_apache_conf} " -i ${trove_apache_conf}
enable_apache_site trove-api enable_apache_site trove-api
} }