diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 46986fc..4e20734 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,43 +2,43 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.66.0" + version = "5.82.0" constraints = ">= 4.20.1" hashes = [ - "h1:RHs4rOiKrKJqr8UhVW7yqfoMVwaofQ+9ChP41rAzc1A=", - "zh:071c908eb18627f4becdaf0a9fe95d7a61f69be365080aba2ef5e24f6314392b", - "zh:3dea2a474c6ad4be5b508de4e90064ec485e3fbcebb264cb6c4dec660e3ea8b5", - "zh:56c0b81e3bbf4e9ccb2efb984f8758e2bc563ce179ff3aecc1145df268b046d1", - "zh:5f34b75a9ef69cad8c79115ecc0697427d7f673143b81a28c3cf8d5decfd7f93", - "zh:65632bc2c408775ee44cb32a72e7c48376001a9a7b3adbc2c9b4d088a7d58650", - "zh:6d0550459941dfb39582fadd20bfad8816255a827bfaafb932d51d66030fcdd5", - "zh:7f1811ef179e507fdcc9776eb8dc3d650339f8b84dd084642cf7314c5ca26745", - "zh:8a793d816d7ef57e71758fe95bf830cfca70d121df70778b65cc11065ad004fd", - "zh:8c7cda08adba01b5ae8cc4e5fbf16761451f0fab01327e5f44fc47b7248ba653", - "zh:96d855f1771342771855c0fb2d47ff6a731e8f2fa5d242b18037c751fd63e6c3", + "h1:1YPccTelkL+60ZVCngHNQj+zKcGmH7gEBugaiwSWyZs=", + "zh:03cb6e584a7ba787ba0f0d16275f7bff085ab2b450a4041b6a70c28659d1123c", + "zh:0f0b02f33b921ad295ad47a453afa9ef93b5d7c83badb590d49891fdc9b1d290", + "zh:1f598d39d75d07b18ad6e68d0ca42b5d1f2c5836320b293235c02cfa1f3e3c3b", + "zh:35207b6f3f11c216ce601127a779afc1d588ea3865203fe117e3cc18d88d0c51", + "zh:4a6fba8483fc6f9a4634c629488dde00ded41cc58fa59ac02a136d116e96e202", + "zh:7361d1e2742268743562c2bedac533ea30434e2b675ca3efeb8aff61a54f9e50", + "zh:863ee4c73854133d660e536ff6920d1748e903b0d72ba4ccbc2068159f587153", + "zh:9a20f970251136ddfef9cc2680e41232562a0db424f30f527ed01110255fa7cb", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b2a62669b72c2471820410b58d764102b11c24e326831ddcfae85c7d20795acf", - "zh:b4a6b251ac24c8f5522581f8d55238d249d0008d36f64475beefc3791f229e1d", - "zh:ca519fa7ee1cac30439c7e2d311a0ecea6a5dae2d175fe8440f30133688b6272", - "zh:fbcd54e7d65806b0038fc8a0fbdc717e1284298ff66e22aac39dcc5a22cc99e5", + "zh:aafda33f6bee3385f954a9a57f58a37ae9743d96259ded4ce034e23edd4af90e", + "zh:b40684da92ee6f51cab4dec75665ef373a93221f4047fa6799c89514237c8f14", + "zh:ca8e9b583806e22ec788d3f6f7b0def24a13abccf6d21227f742b49d7e02d1ac", + "zh:cb49f9971ad40c2677ade35e5aa2ec0a64ed21a131b63e1af0c109dd8a0f24f4", + "zh:d224b387322f49c8ae9998c7f770e2ed3f5d07bed70413b68d403e989e6a8fb1", + "zh:fe81b0a197f2011ed5ef972f6ea443ac6d1021aa994b972f8c9e28d791bf3192", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.6.2" + version = "3.6.3" hashes = [ - "h1:wmG0QFjQ2OfyPy6BB7mQ57WtoZZGGV07uAPQeDmIrAE=", - "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", - "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", - "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", - "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", - "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", - "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", - "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=", + "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", + "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", + "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", + "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", + "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", + "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", - "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", - "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", - "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", + "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", + "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", + "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", + "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", ] } diff --git a/base_images.tf b/base_images.tf index ba6a94c..6f06ddd 100644 --- a/base_images.tf +++ b/base_images.tf @@ -1,4 +1,4 @@ -data aws_ssm_parameter "rhel9_ami" { +data "aws_ssm_parameter" "rhel9_ami" { count = var.use_rhel9_ami ? 1 : 0 - name = "/enterprise/ami/rhel9" + name = "/enterprise/ami/rhel9" } \ No newline at end of file diff --git a/morpheus.tf b/morpheus.tf index cbfe304..4a909a6 100644 --- a/morpheus.tf +++ b/morpheus.tf @@ -23,7 +23,7 @@ module "morpheus" { name = aws_s3_bucket.assets_bucket.bucket key = "linux-image-pipeline.zip" } - packer_config = "morpheus-build.pkr.hcl" + packer_config = "morpheus-build.pkr.hcl" ansible_source_type = "S3" ansible_bucket = { name = aws_s3_bucket.assets_bucket.bucket @@ -40,6 +40,6 @@ module "morpheus" { vpc_config = local.vpc_config ami = { source_ami = var.use_rhel9_ami ? one(data.aws_ssm_parameter.rhel9_ami).value : local.morpheus_ami - instance_type = "t3.micro" # x86_64 compatible instance type + instance_type = "t3.micro" # x86_64 compatible instance type } } diff --git a/variables.tf b/variables.tf index 884103b..f88b4f3 100644 --- a/variables.tf +++ b/variables.tf @@ -1,4 +1,4 @@ -variable use_rhel9_ami { +variable "use_rhel9_ami" { description = "Use RHEL 9 AMI" type = bool default = false diff --git a/vpc_endpoint.tf b/vpc_endpoint.tf index bb23256..adf4ce6 100644 --- a/vpc_endpoint.tf +++ b/vpc_endpoint.tf @@ -15,5 +15,5 @@ resource "aws_vpc_endpoint" "endpoint" { vpc_endpoint_type = "Interface" security_group_ids = local.vpc_config.security_group_ids - subnet_ids = local.vpc_config.subnets -} + subnet_ids = local.vpc_config.subnets +} \ No newline at end of file