Merge pull request #92 from rackspace-infrastructure-automation/MPCSU…

…PENG-4592

Adds support for Amazon 2022

main.tf

@@ -221,20 +221,22 @@ locals {
  }
 
  diagnostic_packages = {
- amazon2 = local.defaults["diagnostic_packages"]["amazon"]
- amazoneks = local.defaults["diagnostic_packages"]["amazon"]
- amazonecs = local.defaults["diagnostic_packages"]["amazon"]
- rhel7 = local.defaults["diagnostic_packages"]["rhel"]
- rhel8 = local.defaults["diagnostic_packages"]["rhel"]
- centos7 = local.defaults["diagnostic_packages"]["rhel"]
- ubuntu18 = local.defaults["diagnostic_packages"]["ubuntu"]
- ubuntu20 = local.defaults["diagnostic_packages"]["ubuntu"]
- debian10 = local.defaults["diagnostic_packages"]["debian"]
- debian11 = local.defaults["diagnostic_packages"]["debian"]
+ amazon2 = local.defaults["diagnostic_packages"]["amazon"]
+ amazon2022 = local.defaults["diagnostic_packages"]["amazon"]
+ amazoneks = local.defaults["diagnostic_packages"]["amazon"]
+ amazonecs = local.defaults["diagnostic_packages"]["amazon"]
+ rhel7 = local.defaults["diagnostic_packages"]["rhel"]
+ rhel8 = local.defaults["diagnostic_packages"]["rhel"]
+ centos7 = local.defaults["diagnostic_packages"]["rhel"]
+ ubuntu18 = local.defaults["diagnostic_packages"]["ubuntu"]
+ ubuntu20 = local.defaults["diagnostic_packages"]["ubuntu"]
+ debian10 = local.defaults["diagnostic_packages"]["debian"]
+ debian11 = local.defaults["diagnostic_packages"]["debian"]
  }
 
  ebs_device_map = {
  amazon2 = "/dev/sdf"
+ amazon2022 = "/dev/sdf"
  amazoneks = "/dev/sdf"
  amazonecs = "/dev/xvdcz"
  rhel7 = "/dev/sdf"
@@ -277,6 +279,7 @@ locals {
 
  user_data_map = {
  amazon2 = "amazon_linux_userdata.sh"
+ amazon2022 = "amazon_linux_userdata.sh"
  amazonecs = "amazon_linux_userdata.sh"
  amazoneks = "amazon_linux_userdata.sh"
  rhel7 = "rhel_centos_7_userdata.sh"
@@ -294,6 +297,7 @@ locals {
 
  ami_owner_mapping = {
  amazon2 = "137112412989"
+ amazon2022 = "137112412989"
  amazonecs = "591542846629"
  amazoneks = "602401143452"
  centos7 = "125523088429"
@@ -311,6 +315,7 @@ locals {
 
  ami_name_mapping = {
  amazon2 = "amzn2-ami-hvm-2.0.*-ebs"
+ amazon2022 = "al2022-ami-2022*-kernel-*-x86_64"
  amazonecs = "amzn2-ami-ecs-hvm-2*-x86_64-ebs"
  amazoneks = "amazon-eks-node-*"
  centos7 = "CentOS 7.* x86_64*"
@@ -329,6 +334,7 @@ locals {
  # Any custom AMI filters for a given OS can be added in this mapping
  image_filter = {
  amazon2 = []
+ amazon2022 = []
  amazonecs = []
  amazoneks = []
  centos7 = []