openstack/openstack-ansible
Code Issues Proposed changes

Allow to define user.rc file for OSA

Browse Source 
At the moment there is no handy functionality to override ENV variables
and store them in git near OSA config. As while we take into account
that ENV vars can already exist and we should use them, these VARs must
be defined in /etc/environement or bashrc files.

This patch aims to look for user.rc file inside OSA_CONFIG_DIR.
If it's present - it will be sourced with all it's content. This way
deployers can store environemnt variables overrides in git and they will
be loaded during on openstack-ansible startup.

Change-Id: Ie24ada54a0e0dc064be028929b416d983fdb5b49
This commit is contained in:
Dmitriy Rabotyagov 2022-11-28 16:38:54 +01:00
parent 2fc8351c89
commit e315e2e327
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
releasenotes/notes/user_rc-9d530bd4b31cebaa.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
Added possibility to source environment variables from a user file that
will have prescedence over all environemnt variables loaded after
openstack-ansible.rc and have prescedence over all variables defined there
By default path to the user file is ``/etc/openstack_deploy/user.rc``.

6
scripts/openstack-ansible.sh
View File

@ -55,6 +55,12 @@ if [[ "${PWD}" == *"${OSA_CLONE_ROOT}"* ]] || [ "${RUN_CMD}" == "openstack-ansib
fi
fi
OSA_USER_RC="${OSA_USER_RC:-${OSA_CONFIG_DIR}/user.rc}"
if [[ -f ${OSA_USER_RC} ]]; then
source ${OSA_USER_RC}
fi
# Check whether there are any user configuration files
if ls -1 ${OSA_CONFIG_DIR}/user_*.yml &> /dev/null; then