From 44c5c6281732cdbcf38b6f06e84f85d9387429ab Mon Sep 17 00:00:00 2001
From: "Ruan G. Ellis" <ruan.ellis@alces-software.com>
Date: Fri, 27 Mar 2020 18:29:04 +0000
Subject: [PATCH 1/2] Added Tags for `name` field.

---
 templates/aws/cluster.yaml | 48 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/templates/aws/cluster.yaml b/templates/aws/cluster.yaml
index 73e4bf7..e72862a 100644
--- a/templates/aws/cluster.yaml
+++ b/templates/aws/cluster.yaml
@@ -331,6 +331,12 @@ Resources:
     Type: AWS::EC2::Instance
     DependsOn: flightcloudclusternode01pubIPassociation
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_node01"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'
@@ -370,6 +376,12 @@ Resources:
     Type: AWS::EC2::Instance
     DependsOn: flightcloudclusternode02pubIPassociation
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_node02"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'
@@ -411,6 +423,12 @@ Resources:
     DependsOn: flightcloudclusternode03pubIPassociation
     Condition: CreateNode03
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_node03"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'
@@ -454,6 +472,12 @@ Resources:
     DependsOn: flightcloudclusternode04pubIPassociation
     Condition: CreateNode04
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_node04"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'
@@ -497,6 +521,12 @@ Resources:
     DependsOn: flightcloudclusternode05pubIPassociation
     Condition: CreateNode05
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_node05"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'
@@ -540,6 +570,12 @@ Resources:
     DependsOn: flightcloudclusternode06pubIPassociation
     Condition: CreateNode06
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_node06"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'
@@ -583,6 +619,12 @@ Resources:
     DependsOn: flightcloudclusternode07pubIPassociation
     Condition: CreateNode07
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_node07"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'
@@ -626,6 +668,12 @@ Resources:
     DependsOn: flightcloudclusternode08pubIPassociation
     Condition: CreateNode08
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_node08"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'

From 4be968e28cd20830ce952f6fcdfd351bbc533792 Mon Sep 17 00:00:00 2001
From: "Ruan G. Ellis" <ruan.ellis@alces-software.com>
Date: Fri, 27 Mar 2020 19:37:10 +0000
Subject: [PATCH 2/2] Add name tag for gateway too!

---
 templates/aws/cluster.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/aws/cluster.yaml b/templates/aws/cluster.yaml
index e72862a..f834535 100644
--- a/templates/aws/cluster.yaml
+++ b/templates/aws/cluster.yaml
@@ -292,6 +292,12 @@ Resources:
     Type: AWS::EC2::Instance
     DependsOn: flightcloudclustergateway1pubIPassociation
     Properties:
+      Tags:
+        -
+          Key: "Name"
+          Value: !Sub
+           - "${cn}_gateway1"
+           - { cn: !Ref clustername }
       AvailabilityZone: !Select
         - 0
         - Fn::GetAZs: !Ref 'AWS::Region'