From a0dc770619a16f093b07537e46a7d8a940324a84 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 22 Jul 2025 20:52:41 +0200 Subject: [PATCH] Respect OSA_USER_RC for add-compute.sh Operator may expect that documented OSA_USER_RC file is also respected for add-compute.sh script, so can be leveraged for this operation as well, instead of adjusting deploy host ENV and keeping changes out of tree. Change-Id: I858969382c6c20b1d971fa7b48cfd9a577a63220 Signed-off-by: Dmitriy Rabotyagov --- scripts/add-compute.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/add-compute.sh b/scripts/add-compute.sh index 3f4aab36c4..d4826ebb09 100755 --- a/scripts/add-compute.sh +++ b/scripts/add-compute.sh @@ -15,8 +15,15 @@ # limitations under the License. export OSA_REPO_PATH=${OSA_REPO_PATH:-"/opt/openstack-ansible"} +export OSA_CONFIG_DIR=${OSA_CONFIG_DIR:-"/etc/openstack_deploy"} export HOSTS=${1:-""} +export OSA_USER_RC=${OSA_USER_RC:-${OSA_CONFIG_DIR}/user.rc} + +if [[ -f ${OSA_USER_RC} ]]; then + . ${OSA_USER_RC} +fi + function define_tasks { if [[ ! -z ${PRE_OSA_TASKS} ]]; then