From e87b2b30e1fc06b9956419b662d9cf5402815296 Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Tue, 21 Jul 2020 16:28:57 +0200
Subject: [PATCH] CI: Fix deployment scripts for new jobs

---
 .../deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template   | 9 +++++----
 openvidu-server/deployments/ce/aws/createAMI.sh          | 6 ++++++
 openvidu-server/deployments/ce/aws/replicate_amis.sh     | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template b/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template
index 68659ad6..c1a951f9 100644
--- a/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template
+++ b/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template
@@ -38,7 +38,7 @@ Resources:
               content: |
                 #!/bin/bash
                 set -eu -o pipefail
-                
+
                 # Install Docker
                 apt-get update && apt-get install -y \
                     apt-transport-https \
@@ -70,7 +70,7 @@ Resources:
               content: !Sub |
                 #!/bin/bash
                 set -eu -o pipefail
-                
+
                 # Install openvidu-ce
                 cd /opt
                 curl https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_OPENVIDU_VERSION.sh | bash
@@ -90,7 +90,7 @@ Resources:
               content: !Sub |
                 #!/bin/bash
                 set -eu -o pipefail
-                
+
                 # Openvidu recording
                 docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG
 
@@ -106,6 +106,7 @@ Resources:
       Tags:
         - Key: Name
           Value: !Ref AWS::StackName
+      KeyName: AWS_KEY_NAME
       UserData:
         "Fn::Base64":
           !Sub |
@@ -115,7 +116,7 @@ Resources:
                 python-pip \
                 ec2-instance-connect
             pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz
-            
+
             cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerCE
 
             /usr/local/bin/installDockerAndDockerCompose.sh || { echo "[Openvidu] error installing docker and compose"; exit 1; }
diff --git a/openvidu-server/deployments/ce/aws/createAMI.sh b/openvidu-server/deployments/ce/aws/createAMI.sh
index 5384f4ea..db24939c 100755
--- a/openvidu-server/deployments/ce/aws/createAMI.sh
+++ b/openvidu-server/deployments/ce/aws/createAMI.sh
@@ -35,6 +35,12 @@ AMIUSEAST1=$(getUbuntuAmiId 'us-east-1')
 cp cfn-mkt-ov-ce-ami.yaml.template cfn-mkt-ov-ce-ami.yaml
 
 ## Setting Openvidu Version and Ubuntu Latest AMIs
+if [[ ! -z ${AWS_KEY_NAME} ]]; then
+  sed -i "s/      KeyName: AWS_KEY_NAME/      KeyName: ${AWS_KEY_NAME}/g" cfn-mkt-ov-ce-ami.yaml
+else
+  sed -i '/      KeyName: AWS_KEY_NAME/d' cfn-mkt-ov-ce-ami.yaml
+fi
+sed -i "s/AWS_KEY_NAME/${AWS_KEY_NAME}/g" cfn-mkt-ov-ce-ami.yaml
 sed -i "s/OPENVIDU_VERSION/${OPENVIDU_VERSION}/g" cfn-mkt-ov-ce-ami.yaml
 sed -i "s/OPENVIDU_RECORDING_DOCKER_TAG/${OPENVIDU_RECORDING_DOCKER_TAG}/g" cfn-mkt-ov-ce-ami.yaml
 sed -i "s/AMIEUWEST1/${AMIEUWEST1}/g" cfn-mkt-ov-ce-ami.yaml
diff --git a/openvidu-server/deployments/ce/aws/replicate_amis.sh b/openvidu-server/deployments/ce/aws/replicate_amis.sh
index 0bf802b0..838da435 100755
--- a/openvidu-server/deployments/ce/aws/replicate_amis.sh
+++ b/openvidu-server/deployments/ce/aws/replicate_amis.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 set -eu -o pipefail
 
 # Replicate AMIs in all regions