diff --git a/releasenotes/notes/user_rc-9d530bd4b31cebaa.yaml b/releasenotes/notes/user_rc-9d530bd4b31cebaa.yaml new file mode 100644 index 0000000000..9f8e6ea6c9 --- /dev/null +++ b/releasenotes/notes/user_rc-9d530bd4b31cebaa.yaml @@ -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``. diff --git a/scripts/openstack-ansible.sh b/scripts/openstack-ansible.sh index ede218d30a..7d6fa2e2fb 100644 --- a/scripts/openstack-ansible.sh +++ b/scripts/openstack-ansible.sh @@ -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