From 3f9a58613fd3f7ca3fb4f0777b0de59652b7c179 Mon Sep 17 00:00:00 2001 From: Rahul Roshan Kachchap Date: Tue, 21 Feb 2023 15:02:50 -0500 Subject: [PATCH] Fixed script to pick exact registry name. Updated script by replacing all instances of grep -F ${REGISTRY} with grep -wF ${REGISTRY} PASS: Ran script on subcloud successfully Story: 2010310 Task: 47469 Signed-off-by: Rahul Roshan Kachchap Change-Id: I212ff3f175af06a3cbda1e923aac8125ebad87e8 --- .../platform-util/scripts/update_docker_registry_auth.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/platform-util/scripts/update_docker_registry_auth.sh b/utilities/platform-util/scripts/update_docker_registry_auth.sh index ec2371ec..c597cb43 100755 --- a/utilities/platform-util/scripts/update_docker_registry_auth.sh +++ b/utilities/platform-util/scripts/update_docker_registry_auth.sh @@ -51,7 +51,7 @@ source /etc/platform/openrc for REGISTRY in ${REGISTRY_LIST}; do echo -n "Checking ${REGISTRY} url. " - registry_url=$(system service-parameter-list | grep -F ${REGISTRY} |\ + registry_url=$(system service-parameter-list | grep -wF ${REGISTRY} |\ grep -F url | awk '{print $10}') if [[ -z "${registry_url}" ]] ||\ [[ "${registry_url}" != *"${CENTRAL_REGISTRY_URL}"* ]]; then @@ -61,7 +61,7 @@ for REGISTRY in ${REGISTRY_LIST}; do fi echo -n "Updating ${REGISTRY} credentials ." - SECRET_UUID=$(system service-parameter-list | grep -F ${REGISTRY} |\ + SECRET_UUID=$(system service-parameter-list | grep -wF ${REGISTRY} |\ grep -F auth-secret | awk '{print $10}') if [ -z "${SECRET_UUID}" ]; then echo "No ${REGISTRY} entry in service-parameters" @@ -85,7 +85,7 @@ for REGISTRY in ${REGISTRY_LIST}; do openstack secret store -n ${REGISTRY}-secret -p "${NEW_SECRET_VALUE}" \ >/dev/null echo -n "." - NEW_SECRET_REF=$(openstack secret list | grep -F ${REGISTRY}-secret |\ + NEW_SECRET_REF=$(openstack secret list | grep -wF ${REGISTRY}-secret |\ awk '{print $2}') NEW_SECRET_UUID=$(echo "${NEW_SECRET_REF}" | awk -F/ '{print $6}') system service-parameter-modify docker "${REGISTRY}" \ @@ -94,7 +94,7 @@ for REGISTRY in ${REGISTRY_LIST}; do echo " done." echo -n "Validating ${REGISTRY} credentials updated to: " - SECRET_UUID=$(system service-parameter-list | grep -F ${REGISTRY} |\ + SECRET_UUID=$(system service-parameter-list | grep -wF ${REGISTRY} |\ grep -F auth-secret | awk '{print $10}') if [ -z "${SECRET_UUID}" ]; then continue