openstack/devstack
Code Issues Proposed changes

Merge "Add SYSTEMD_ENV_VARS dictionary"

Browse Source
This commit is contained in:
Zuul
2025-07-30 18:26:20 +00:00
committed by Gerrit Code Review
parent bfa9e547a9 0e8042deff
commit 94d036ff80
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
functions-common
View File

@@ -43,6 +43,9 @@ declare -A -g GITREPO
declare -A -g GITBRANCH declare -A -g GITBRANCH
declare -A -g GITDIR declare -A -g GITDIR
# Systemd service file environment variables per service
declare -A -g SYSTEMD_ENV_VARS
KILL_PATH="$(which kill)" KILL_PATH="$(which kill)"
# Save these variables to .stackenv # Save these variables to .stackenv
@@ -1642,6 +1645,9 @@ function _run_under_systemd {
user=$STACK_USER user=$STACK_USER
fi fi
local env_vars="$5" local env_vars="$5"
if [[ -v SYSTEMD_ENV_VARS[$service] ]]; then
env_vars="${SYSTEMD_ENV_VARS[$service]} $env_vars"
fi
if [[ "$command" =~ "uwsgi" ]] ; then if [[ "$command" =~ "uwsgi" ]] ; then
if [[ "$GLOBAL_VENV" == "True" ]] ; then if [[ "$GLOBAL_VENV" == "True" ]] ; then
cmd="$cmd --venv $DEVSTACK_VENV" cmd="$cmd --venv $DEVSTACK_VENV"