Merge pull request #498 from MahnoorAsghar/read-htpasswd-m3-main

🌱 Fix error in reading ironic htpasswd from file
metal3-io · Apr 25, 2024 · c0f25a3 · c0f25a3
2 parents cfac9aa + 4a2baed
commit c0f25a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/auth-common.sh b/scripts/auth-common.sh
@@ -14,11 +14,11 @@ fi
 set +x
 IRONIC_HTPASSWD_FILE=/etc/ironic/htpasswd
 if [[ -f "/auth/ironic/username" ]]; then
-    read -r IRONIC_HTPASSWD_USERNAME<"/auth/ironic/username"
+    IRONIC_HTPASSWD_USERNAME=$(</auth/ironic/username)
 fi
 IRONIC_HTPASSWD_USERNAME=${IRONIC_HTPASSWD_USERNAME:-}
 if [[ -f "/auth/ironic/password" ]]; then
-    read -r IRONIC_HTPASSWD_PASSWORD<"/auth/ironic/password"
+    IRONIC_HTPASSWD_PASSWORD=$(</auth/ironic/password)
 fi
 IRONIC_HTPASSWD_PASSWORD=${IRONIC_HTPASSWD_PASSWORD:-}
 if [[ -n "${IRONIC_HTPASSWD_USERNAME}" ]]; then