Merge pull request #80 from guardian/update-ami-20180122

Update ami 20180122
guardian · Jan 25, 2018 · 9a44e67 · 9a44e67
2 parents b5414d0 + fc5e7b7
commit 9a44e67
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/cloudformation/ELK_Stack_Multi_AZ_in_Private_VPC.yml b/cloudformation/ELK_Stack_Multi_AZ_in_Private_VPC.yml
@@ -115,25 +115,27 @@ Conditions:
 Mappings:
   RegionMap:
     us-east-1:
-      ImageId: ami-6edd3078
+      ImageId: ami-263d0b5c
     us-west-2:
-      ImageId: ami-7c803d1c
+      ImageId: ami-bd8f33c5
     us-west-1:
-      ImageId: ami-539ac933
+      ImageId: ami-8b3a37eb
     eu-west-1:
-      ImageId: ami-d8f4deab
+      ImageId: ami-7a187c03
+    eu-west-2:
+      ImageId: ami-aca2b9c8
     eu-central-1:
-      ImageId: ami-5aee2235
+      ImageId: ami-37940d58
     ap-southeast-1:
-      ImageId: ami-b1943fd2
+      ImageId: ami-da3d45a6
     ap-northeast-1:
-      ImageId: ami-eb49358c
+      ImageId: ami-4b7e1c2d
     ap-southeast-2:
-      ImageId: ami-fe71759d
+      ImageId: ami-d7f30db5
+    ap-northeast-2:
+      ImageId: ami-9cb211f2
     sa-east-1:
-      ImageId: ami-7379e31f
-    cn-north-1:
-      ImageId: ami-b2a97edf
+      ImageId: ami-e024688c
   InstanceMap:
     t2.medium:
       ESHeapSize: 2g

diff --git a/scripts/get_ami_images.sh b/scripts/get_ami_images.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-AMI_IMAGE_NAME="ubuntu/images/hvm-ssd/ubuntu-wily-15.10-amd64-server-20160217.1"
+AMI_IMAGE_NAME="ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20180122"
 
 # http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region
 
-for region in us-east-1 us-west-2 us-west-1 eu-west-1 eu-central-1 ap-southeast-1 ap-northeast-1 ap-southeast-2 ap-northeast-2 sa-east-1
+for region in us-east-1 us-west-2 us-west-1 eu-west-1 eu-west-2 eu-central-1 ap-southeast-1 ap-northeast-1 ap-southeast-2 ap-northeast-2 sa-east-1
 do
-    printf "\"$region\" : {"
-    aws ec2 describe-images --filters Name=name,Values=$AMI_IMAGE_NAME --region $region | grep "ImageId" | sed s/,// | tr -d '\n'
-    printf "},\n"
+    printf "    $region:\n"
+    IMAGE_ID=`aws ec2 describe-images --filters Name=name,Values=$AMI_IMAGE_NAME --region $region | jq .Images[].ImageId`
+    printf "      ImageId: ${IMAGE_ID//\"}\n"
 done