Merge branch 'master' of https://github.com/aws-quickstart/quickstart…

…-examples
aws-quickstart · Jul 31, 2020 · a319277 · a319277
2 parents 568525e + 7b45904
commit a319277
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/templates/workload-json-master.template b/templates/workload-json-master.template
@@ -123,12 +123,12 @@
         },
         "BastionAMIOS": {
             "AllowedValues": [
-                "Amazon-Linux-HVM",
+                "Amazon-Linux2-HVM",
                 "CentOS-7-HVM",
-                "Ubuntu-Server-14.04-LTS-HVM",
-                "Ubuntu-Server-16.04-LTS-HVM"
+                "Ubuntu-Server-20.04-LTS-HVM",
+                "SUSE-SLES-15-HVM"
             ],
-            "Default": "Amazon-Linux-HVM",
+            "Default": "Amazon-Linux2-HVM",
             "Description": "Linux distribution for the AMI to be used for the bastion instances.",
             "Type": "String"
         },
@@ -527,4 +527,4 @@
             }
         }
     }
-}
+}
diff --git a/templates/workload-yaml-master.template.yaml b/templates/workload-yaml-master.template.yaml
@@ -88,11 +88,11 @@ Parameters:
     Type: List<AWS::EC2::AvailabilityZone::Name>
   BastionAMIOS:
     AllowedValues:
-    - Amazon-Linux-HVM
-    - CentOS-7-HVM
-    - Ubuntu-Server-14.04-LTS-HVM
-    - Ubuntu-Server-16.04-LTS-HVM
-    Default: Amazon-Linux-HVM
+      - Amazon-Linux2-HVM
+      - CentOS-7-HVM
+      - Ubuntu-Server-20.04-LTS-HVM
+      - SUSE-SLES-15-HVM
+    Default: Amazon-Linux2-HVM
     Description: Linux distribution for the AMI to be used for the bastion instances.
     Type: String
   BastionInstanceType: