diff --git a/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template b/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template index 252fa26b..a435e0ea 100644 --- a/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template +++ b/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template @@ -501,11 +501,11 @@ Resources: # Get original ami name public_ami_filter = [{ 'Name': 'image-id', 'Values': [ source_image_id ] }] - response = ec2_client_ov.describe_images(Filters=public_ami_filter) + response = ec2_client_ov.describe_images(IncludeDeprecated=True, Filters=public_ami_filter) new_ami_name= "[ OpenVidu CE AMI Copy ] - " + response['Images'][0]['Name'] own_ami_filter = [{ 'Name': 'name', 'Values': [new_ami_name] }] - response = ec2_client.describe_images(Filters=own_ami_filter) + response = ec2_client.describe_images(IncludeDeprecated=True, Filters=own_ami_filter) if (len(response['Images']) == 1): # If AMI exists, don't copy new_images.append(response['Images'][0]['ImageId']) diff --git a/openvidu-server/deployments/enterprise/aws/CF-OpenVidu-Enterprise.yaml.template b/openvidu-server/deployments/enterprise/aws/CF-OpenVidu-Enterprise.yaml.template index 374729db..26b14735 100644 --- a/openvidu-server/deployments/enterprise/aws/CF-OpenVidu-Enterprise.yaml.template +++ b/openvidu-server/deployments/enterprise/aws/CF-OpenVidu-Enterprise.yaml.template @@ -1353,7 +1353,7 @@ Resources: def copy_ami_operation(source_image_id, source_region, new_ami_name, ec2_client): own_ami_filter = [{ 'Name': 'name', 'Values': [new_ami_name] }] - amis_response = ec2_client.describe_images(Filters=own_ami_filter) + amis_response = ec2_client.describe_images(IncludeDeprecated=True, Filters=own_ami_filter) if (len(amis_response['Images']) == 1): # If AMI exists, don't copy return amis_response['Images'][0]['ImageId'] @@ -1384,9 +1384,9 @@ Resources: public_ami_master_node_filter = [{ 'Name': 'image-id', 'Values': [ source_image_id_master_node ] }] public_ami_media_node_filter = [{ 'Name': 'image-id', 'Values': [ source_image_id_media_node ] }] - response = ec2_client_ov.describe_images(Filters=public_ami_master_node_filter) + response = ec2_client_ov.describe_images(IncludeDeprecated=True, Filters=public_ami_master_node_filter) new_ami_name_master_node = "[ OpenVidu ENTERPRISE Master Node AMI Copy ] - " + response['Images'][0]['Name'] - response = ec2_client_ov.describe_images(Filters=public_ami_media_node_filter) + response = ec2_client_ov.describe_images(IncludeDeprecated=True, Filters=public_ami_media_node_filter) new_ami_name_media_node = "[ OpenVidu PRO/ENTERPRISE Media Node AMI Copy ] - " + response['Images'][0]['Name'] # Copy master node AMI and media node AMI diff --git a/openvidu-server/deployments/enterprise/aws/dev/CF-OpenVidu-Enterprise-dev-master.yaml b/openvidu-server/deployments/enterprise/aws/dev/CF-OpenVidu-Enterprise-dev-master.yaml index b433085d..929e5208 100644 --- a/openvidu-server/deployments/enterprise/aws/dev/CF-OpenVidu-Enterprise-dev-master.yaml +++ b/openvidu-server/deployments/enterprise/aws/dev/CF-OpenVidu-Enterprise-dev-master.yaml @@ -1298,7 +1298,7 @@ Resources: def copy_ami_operation(source_image_id, source_region, new_ami_name, ec2_client): own_ami_filter = [{ 'Name': 'name', 'Values': [new_ami_name] }] - amis_response = ec2_client.describe_images(Filters=own_ami_filter) + amis_response = ec2_client.describe_images(IncludeDeprecated=True, Filters=own_ami_filter) if (len(amis_response['Images']) == 1): # If AMI exists, don't copy return amis_response['Images'][0]['ImageId'] @@ -1329,9 +1329,9 @@ Resources: public_ami_master_node_filter = [{ 'Name': 'image-id', 'Values': [ source_image_id_master_node ] }] public_ami_media_node_filter = [{ 'Name': 'image-id', 'Values': [ source_image_id_media_node ] }] - response = ec2_client_ov.describe_images(Filters=public_ami_master_node_filter) + response = ec2_client_ov.describe_images(IncludeDeprecated=True, Filters=public_ami_master_node_filter) new_ami_name_master_node = "[ OpenVidu ENTERPRISE Master Node AMI Copy ] - " + response['Images'][0]['Name'] - response = ec2_client_ov.describe_images(Filters=public_ami_media_node_filter) + response = ec2_client_ov.describe_images(IncludeDeprecated=True, Filters=public_ami_media_node_filter) new_ami_name_media_node = "[ OpenVidu PRO/ENTERPRISE Media Node AMI Copy ] - " + response['Images'][0]['Name'] # Copy master node AMI and media node AMI diff --git a/openvidu-server/deployments/external-turn/aws/CF-External-Turn.yml b/openvidu-server/deployments/external-turn/aws/CF-External-Turn.yml index 6e9b423e..0f912d81 100644 --- a/openvidu-server/deployments/external-turn/aws/CF-External-Turn.yml +++ b/openvidu-server/deployments/external-turn/aws/CF-External-Turn.yml @@ -160,7 +160,7 @@ Resources: def handler(event, context): try: - response = boto3.client('ec2').describe_images(Filters=[ + response = boto3.client('ec2').describe_images(IncludeDeprecated=True, Filters=[ {'Name': 'name', 'Values': [event['ResourceProperties']['Name']]}, {'Name': 'owner-alias', 'Values': ['amazon']} ]) diff --git a/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template b/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template index ef226f28..400a5427 100644 --- a/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template +++ b/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template @@ -1028,7 +1028,7 @@ Resources: def copy_ami_operation(source_image_id, source_region, new_ami_name, ec2_client): own_ami_filter = [{ 'Name': 'name', 'Values': [new_ami_name] }] - amis_response = ec2_client.describe_images(Filters=own_ami_filter) + amis_response = ec2_client.describe_images(IncludeDeprecated=True, Filters=own_ami_filter) if (len(amis_response['Images']) == 1): # If AMI exists, don't copy return amis_response['Images'][0]['ImageId'] @@ -1059,9 +1059,9 @@ Resources: public_ami_master_node_filter = [{ 'Name': 'image-id', 'Values': [ source_image_id_master_node ] }] public_ami_media_node_filter = [{ 'Name': 'image-id', 'Values': [ source_image_id_media_node ] }] - response = ec2_client_ov.describe_images(Filters=public_ami_master_node_filter) + response = ec2_client_ov.describe_images(IncludeDeprecated=True, Filters=public_ami_master_node_filter) new_ami_name_master_node = "[ OpenVidu PRO Master Node AMI Copy ] - " + response['Images'][0]['Name'] - response = ec2_client_ov.describe_images(Filters=public_ami_media_node_filter) + response = ec2_client_ov.describe_images(IncludeDeprecated=True, Filters=public_ami_media_node_filter) new_ami_name_media_node = "[ OpenVidu PRO/ENTERPRISE Media Node AMI Copy ] - " + response['Images'][0]['Name'] # Copy master node AMI and media node AMI