From c9235e64cf04b7b96123eae4fd85fc8a6666c2fe Mon Sep 17 00:00:00 2001 From: cruizba Date: Wed, 4 Nov 2020 22:42:04 +0100 Subject: [PATCH] openvidu-deployment: Don't rely on aws http endpoint to update KMS AMI --- .../openvidu-server-pro/install_openvidu_pro.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh index 232ca29e..3f6b61ac 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh @@ -315,16 +315,15 @@ upgrade_ov() { [ ! -z "${OLD_MODE}" ] && sed -i -r "s/Installation Mode:.+/Installation Mode: ${OLD_MODE}/" "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" # In Aws, update AMI ID - CHECK_AWS=$(curl -s -o /dev/null -w "%{http_code}" http://169.254.169.254) - if [[ ${CHECK_AWS} == "200" ]]; then - AWS_REGION=$(grep -E "AWS_DEFAULT_REGION=.*$" "${OPENVIDU_PREVIOUS_FOLDER}/.env" | cut -d'=' -f2) - [[ -z ${AWS_REGION} ]] && fatal_error "Error while getting AWS_REGION" + AWS_REGION=$(grep -E "AWS_DEFAULT_REGION=.*$" "${OPENVIDU_PREVIOUS_FOLDER}/.env" | cut -d'=' -f2) + if [[ ! -z ${AWS_REGION} ]]; then NEW_AMI_ID=$(curl https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/CF-OpenVidu-Pro-${OPENVIDU_VERSION//v}.yaml --silent | sed -n -e '/KMSAMIMAP:/,/Metadata:/ p' | grep -A 1 ${AWS_REGION} | grep AMI | tr -d " " | cut -d":" -f2) [[ -z ${NEW_AMI_ID} ]] && fatal_error "Error while getting new AWS_IMAGE_ID for Media Nodes" sed -i "s/.*AWS_IMAGE_ID=.*/AWS_IMAGE_ID=${NEW_AMI_ID}/" "${OPENVIDU_PREVIOUS_FOLDER}/.env" || fatal_error "Error while updating new AWS_IMAGE_ID for Media Nodes" fi + # Ready to use printf '\n'