100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
CI/CD: Fix AWS cloud formation template for EC2 host provisioning (#1188)
Rich Turnerf4977b68c448
diff --git a/.ci_cd/aws/cloudformation-create-ec2.yml b/.ci_cd/aws/cloudformation-create-ec2.ymlindex e82c6c621..8e5e18cee 100644--- a/.ci_cd/aws/cloudformation-create-ec2.yml+++ b/.ci_cd/aws/cloudformation-create-ec2.yml@@ -45,8 +45,8 @@ Parameters:Type: StringImageId:Description: AMI ID- Type: String- Default: "ami-062cd09187a31b743"+ Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'+ Default: '/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-arm64'InstanceType:Description: EC2 instance type (don't change it unless you know what you are doing)Type: String@@ -83,7 +83,7 @@ Parameters:DiskSize:Description: Root EBS volume size GBType: Number- Default: 50+ Default: 16HealthChecks:Description: Create health checksType: String@@ -720,13 +720,10 @@ Resources:cron_setup:packages:yum:- yum-cron: []- commands:- 01_configure:- command: chkconfig yum-cron on+ cronie: []services:systemd:- yum-cron:+ crond:enabled: "true"ensureRunning: "true"@@ -771,10 +768,8 @@ Resources:- /etc/cfn/hooks.d/amazon-cloudwatch-agent-auto-reloader.confProperties:- InstanceType:- Ref: InstanceType- KeyName:- "developers"+ InstanceType: !Ref InstanceType+ KeyName: "developers"ImageId: !Ref ImageIdSubnetId: !Ref SubnetIdSecurityGroupIds:@@ -802,8 +797,8 @@ Resources:#sed -i '/download_updates/s/= .*/= yes/' /etc/yum/yum-cron-hourly.conf#sed -i '/download_updates/s/= .*/= no/' /etc/yum/yum-cron.conf- rpm -Uvh https://s3.amazonaws.com/amazoncloudwatch-agent/amazon_linux/arm64/latest/amazon-cloudwatch-agent.rpm- /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -s -c file:/opt/aws/amazon-cloudwatch-agent/var/config.json+ # Install cloudwatch agent+ yum -y install amazon-cloudwatch-agent# Execute required config set/opt/aws/bin/cfn-init -v --stack ${AWS::StackName} --resource EC2Instance --configsets default --region ${AWS::Region}diff --git a/.github/workflows/provision-host.yml b/.github/workflows/provision-host.ymlindex aab3b0e51..b55e224b2 100644--- a/.github/workflows/provision-host.yml+++ b/.github/workflows/provision-host.yml@@ -30,6 +30,7 @@ on:DISK_SIZE:description: 'Override EC2 root EBS volume size to provision (GB)'type: string+ default: '16'required: falseELASTIC_IP:description: 'Create elastic public IP'